Brightskins support

git-svn-id: https://svn.eduke32.com/eduke32@28 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-16 00:39:49 +00:00
parent 7050179804
commit e3d40c7b51
7 changed files with 23 additions and 4 deletions

View file

@ -205,7 +205,7 @@ void CONFIG_SetDefaults( void )
MixRate = 22050; MixRate = 22050;
SoundToggle = 1; SoundToggle = 1;
MusicToggle = 1; MusicToggle = 1;
VoiceToggle = 1; VoiceToggle = 2;
AmbienceToggle = 1; AmbienceToggle = 1;
FXVolume = 220; FXVolume = 220;
MusicVolume = 200; MusicVolume = 200;
@ -229,6 +229,7 @@ void CONFIG_SetDefaults( void )
ud.m_ffire = 1; ud.m_ffire = 1;
ud.levelstats = 0; ud.levelstats = 0;
ud.drawweapon = 1; ud.drawweapon = 1;
ud.brightskins = 0;
ShowOpponentWeapons = 0; ShowOpponentWeapons = 0;
Bstrcpy(ud.rtsname, "DUKE.RTS"); Bstrcpy(ud.rtsname, "DUKE.RTS");
Bstrcpy(myname, "Duke"); Bstrcpy(myname, "Duke");
@ -583,6 +584,7 @@ void CONFIG_ReadSetup( void )
SCRIPT_GetNumber( scripthandle, "Misc", "ShowLevelStats",&ud.levelstats); SCRIPT_GetNumber( scripthandle, "Misc", "ShowLevelStats",&ud.levelstats);
SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",&ShowOpponentWeapons); SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",&ShowOpponentWeapons);
SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon); SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon);
SCRIPT_GetNumber( scripthandle, "Misc", "BrightSkins",&ud.brightskins);
SCRIPT_GetNumber( scripthandle, "Misc", "ShowFPS",&ud.tickrate); SCRIPT_GetNumber( scripthandle, "Misc", "ShowFPS",&ud.tickrate);
dummy = useprecache; SCRIPT_GetNumber( scripthandle, "Misc", "UsePrecache",&dummy); useprecache = dummy != 0; dummy = useprecache; SCRIPT_GetNumber( scripthandle, "Misc", "UsePrecache",&dummy); useprecache = dummy != 0;
if(ud.wchoice[0][0] == 0 && ud.wchoice[0][1] == 0) if(ud.wchoice[0][0] == 0 && ud.wchoice[0][1] == 0)
@ -710,6 +712,7 @@ void CONFIG_WriteSetup( void )
SCRIPT_PutNumber( scripthandle, "Misc", "ShowOpponentWeapons",ShowOpponentWeapons,false,false); SCRIPT_PutNumber( scripthandle, "Misc", "ShowOpponentWeapons",ShowOpponentWeapons,false,false);
SCRIPT_PutNumber( scripthandle, "Misc", "UsePrecache",useprecache,false,false); SCRIPT_PutNumber( scripthandle, "Misc", "UsePrecache",useprecache,false,false);
SCRIPT_PutNumber( scripthandle, "Misc", "ShowViewWeapon",ud.drawweapon,false,false); SCRIPT_PutNumber( scripthandle, "Misc", "ShowViewWeapon",ud.drawweapon,false,false);
SCRIPT_PutNumber( scripthandle, "Misc", "BrightSkins",ud.brightskins,false,false);
SCRIPT_PutNumber( scripthandle, "Misc", "ShowFPS",ud.tickrate,false,false); SCRIPT_PutNumber( scripthandle, "Misc", "ShowFPS",ud.tickrate,false,false);
SCRIPT_PutNumber( scripthandle, "Controls", "MouseAimingFlipped",ud.mouseflip,false,false); SCRIPT_PutNumber( scripthandle, "Controls", "MouseAimingFlipped",ud.mouseflip,false,false);
SCRIPT_PutNumber( scripthandle, "Controls","MouseAiming",ud.mouseaiming,false,false); SCRIPT_PutNumber( scripthandle, "Controls","MouseAiming",ud.mouseaiming,false,false);

View file

@ -336,6 +336,7 @@ struct user_defs {
long reccnt; long reccnt;
int32 runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon; // JBF 20031125 int32 runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon; // JBF 20031125
int32 brightskins;
int32 entered_name,screen_tilting,shadows,fta_on,executions,auto_run; int32 entered_name,screen_tilting,shadows,fta_on,executions,auto_run;
int32 coords,tickrate,levelstats,m_coop,coop,screen_size,lockout,crosshair; int32 coords,tickrate,levelstats,m_coop,coop,screen_size,lockout,crosshair;

View file

@ -5852,6 +5852,9 @@ PALONLY:
if( t->z > hittype[i].floorz && t->xrepeat < 32 ) if( t->z > hittype[i].floorz && t->xrepeat < 32 )
t->z = hittype[i].floorz; t->z = hittype[i].floorz;
if(ud.brightskins)
t->shade -= 15;
break; break;
case JIBS1__STATIC: case JIBS1__STATIC:

View file

@ -797,6 +797,7 @@ LABELS userdefslabels[]= {
{ "drawweapon", USERDEFS_DRAWWEAPON, 0, 0 }, { "drawweapon", USERDEFS_DRAWWEAPON, 0, 0 },
{ "mouseaiming", USERDEFS_MOUSEAIMING, 0, 0 }, { "mouseaiming", USERDEFS_MOUSEAIMING, 0, 0 },
{ "weaponswitch", USERDEFS_WEAPONSWITCH, 0, 0 }, { "weaponswitch", USERDEFS_WEAPONSWITCH, 0, 0 },
{ "brightskins", USERDEFS_BRIGHTSKINS, 0, 0 },
{ "", -1, 0, 0 } // END OF LIST { "", -1, 0, 0 } // END OF LIST
}; };

View file

@ -282,7 +282,8 @@ enum userdefslabels {
USERDEFS_STATUSBARSCALE, USERDEFS_STATUSBARSCALE,
USERDEFS_DRAWWEAPON, USERDEFS_DRAWWEAPON,
USERDEFS_MOUSEAIMING, USERDEFS_MOUSEAIMING,
USERDEFS_WEAPONSWITCH USERDEFS_WEAPONSWITCH,
USERDEFS_BRIGHTSKINS
}; };
enum sectorlabels { enum sectorlabels {

View file

@ -588,6 +588,13 @@ void DoUserDef(char bSet, long lVar1, long lLabelID, long lVar2, short sActor, s
SetGameVarID((int)lVar2, ud.weaponswitch, sActor, sPlayer); SetGameVarID((int)lVar2, ud.weaponswitch, sActor, sPlayer);
break; break;
case USERDEFS_BRIGHTSKINS:
if(bSet)
ud.brightskins = lValue;
else
SetGameVarID((int)lVar2, ud.brightskins, sActor, sPlayer);
break;
default: default:
break; break;
} }

View file

@ -2147,7 +2147,7 @@ cheat_for_port_credits:
"HUD weapon", "HUD weapon",
"FPS counter", "FPS counter",
"-", "-",
"-", "Bright players",
"-", "-",
"-", "-",
"-", "-",
@ -2201,7 +2201,10 @@ cheat_for_port_credits:
case 1: if (x==io) ud.tickrate = 1-ud.tickrate; case 1: if (x==io) ud.tickrate = 1-ud.tickrate;
modval(0,1,(int *)&ud.tickrate,1,probey==1); modval(0,1,(int *)&ud.tickrate,1,probey==1);
gametextpal(d,yy, ud.tickrate ? "On" : "Off", 0, 0); break; gametextpal(d,yy, ud.tickrate ? "On" : "Off", 0, 0); break;
case 2: if (x==io) cmenu(200); break; case 2: if (x==io) ud.brightskins = 1-ud.brightskins;
modval(0,1,(int *)&ud.brightskins,1,probey==1);
gametextpal(d,yy, ud.brightskins ? "On" : "Off", 0, 0); break;
case 3: if (x==io) cmenu(200); break;
default: break; default: break;
} }
gametextpal(c,yy, opts[ii], enabled?5:15, 2); gametextpal(c,yy, opts[ii], enabled?5:15, 2);