mirror of https://github.com/ZDoom/raze-gles.git
Remove the "brightskins" option because it kind of sucked.
git-svn-id: https://svn.eduke32.com/eduke32@154 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
9122c35836
commit
d42b0019e0
|
|
@ -229,7 +229,6 @@ void CONFIG_SetDefaults( void )
|
|||
ud.m_ffire = 1;
|
||||
ud.levelstats = 0;
|
||||
ud.drawweapon = 1;
|
||||
ud.brightskins = 0;
|
||||
ud.democams = 1;
|
||||
ud.color = 0;
|
||||
ud.msgdisptime = 640;
|
||||
|
|
@ -614,7 +613,6 @@ void CONFIG_ReadSetup( void )
|
|||
SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",&ShowOpponentWeapons);
|
||||
ud.showweapons = ShowOpponentWeapons;
|
||||
SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon);
|
||||
SCRIPT_GetNumber( scripthandle, "Misc", "BrightSkins",&ud.brightskins);
|
||||
SCRIPT_GetNumber( scripthandle, "Misc", "DemoCams",&ud.democams);
|
||||
SCRIPT_GetNumber( scripthandle, "Misc", "ShowFPS",&ud.tickrate);
|
||||
SCRIPT_GetNumber( scripthandle, "Misc", "Color",&ud.color);
|
||||
|
|
@ -717,7 +715,6 @@ void CONFIG_WriteSetup( void )
|
|||
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "AutoMsg",ud.automsg,false,false);
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "AutoVote",ud.autovote,false,false);
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "BrightSkins",ud.brightskins,false,false);
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "Color",ud.color,false,false);
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "Crosshairs",ud.crosshair,false,false);
|
||||
SCRIPT_PutNumber( scripthandle, "Misc", "DemoCams",ud.democams,false,false);
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ struct user_defs {
|
|||
long reccnt;
|
||||
|
||||
int32 runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon; // JBF 20031125
|
||||
int32 brightskins,democams,color,pcolor[MAXPLAYERS],msgdisptime,statusbarmode;
|
||||
int32 democams,color,pcolor[MAXPLAYERS],msgdisptime,statusbarmode;
|
||||
int32 m_noexits,noexits,autovote,automsg,idplayers;
|
||||
|
||||
int32 entered_name,screen_tilting,shadows,fta_on,executions,auto_run;
|
||||
|
|
|
|||
|
|
@ -6012,7 +6012,7 @@ void animatesprites(long x,long y,short a,long smoothratio)
|
|||
tsprite[spritesortcnt].yrepeat = ( t->yrepeat>>3 );
|
||||
if(t->yrepeat < 4) t->yrepeat = 4;
|
||||
|
||||
tsprite[spritesortcnt].shade = ud.brightskins?-32:t->shade;
|
||||
tsprite[spritesortcnt].shade = t->shade;
|
||||
tsprite[spritesortcnt].cstat = 0;
|
||||
|
||||
tsprite[spritesortcnt].picnum = (ps[p].curr_weapon==GROW_WEAPON?GROWSPRITEICON:weapon_sprites[ps[p].curr_weapon]);
|
||||
|
|
@ -6087,9 +6087,6 @@ PALONLY:
|
|||
if( sector[sect].floorpal && sector[sect].floorpal < numl)
|
||||
t->pal = sector[sect].floorpal;
|
||||
|
||||
if(ud.brightskins)
|
||||
t->shade = -32; // yes? no?
|
||||
|
||||
if(s->owner == -1) continue;
|
||||
|
||||
if( t->z > hittype[i].floorz && t->xrepeat < 32 )
|
||||
|
|
@ -8548,7 +8545,7 @@ void Startup(void)
|
|||
|
||||
for(i=0;i<MAXPLAYERS;i++) playerreadyflag[i] = 0;
|
||||
|
||||
if(rancid_ip_strings[MAXPLAYERS])
|
||||
if(Bstrlen(rancid_ip_strings[MAXPLAYERS]))
|
||||
initprintf("net: Using %s as sort IP\n",rancid_ip_strings[MAXPLAYERS]);
|
||||
|
||||
//initmultiplayers(netparamcount,netparam, 0,0,0);
|
||||
|
|
@ -8562,6 +8559,7 @@ void Startup(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (netparam) Bfree(netparam);
|
||||
netparam = NULL; netparamcount = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -798,7 +798,6 @@ LABELS userdefslabels[]= {
|
|||
{ "drawweapon", USERDEFS_DRAWWEAPON, 0, 0 },
|
||||
{ "mouseaiming", USERDEFS_MOUSEAIMING, 0, 0 },
|
||||
{ "weaponswitch", USERDEFS_WEAPONSWITCH, 0, 0 },
|
||||
{ "brightskins", USERDEFS_BRIGHTSKINS, 0, 0 },
|
||||
{ "democams", USERDEFS_DEMOCAMS, 0, 0 },
|
||||
{ "color", USERDEFS_COLOR, 0, 0 },
|
||||
{ "msgdisptime", USERDEFS_MSGDISPTIME, 0, 0 },
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ enum playerlabels {
|
|||
PLAYER_AUTO_AIM,
|
||||
PLAYER_MOVEMENT_LOCK,
|
||||
PLAYER_SOUND_PITCH,
|
||||
PLAYER_WEAPONSWITCH
|
||||
PLAYER_WEAPONSWITCH
|
||||
};
|
||||
|
||||
enum userdefslabels {
|
||||
|
|
@ -279,9 +279,8 @@ enum userdefslabels {
|
|||
USERDEFS_MOUSEFLIP,
|
||||
USERDEFS_STATUSBARSCALE,
|
||||
USERDEFS_DRAWWEAPON,
|
||||
USERDEFS_MOUSEAIMING,
|
||||
USERDEFS_WEAPONSWITCH,
|
||||
USERDEFS_BRIGHTSKINS,
|
||||
USERDEFS_MOUSEAIMING,
|
||||
USERDEFS_WEAPONSWITCH,
|
||||
USERDEFS_DEMOCAMS,
|
||||
USERDEFS_COLOR,
|
||||
USERDEFS_MSGDISPTIME,
|
||||
|
|
@ -718,7 +717,7 @@ enum keywords {
|
|||
CON_DYNAMICREMAP, // 285
|
||||
CON_SETINPUT, // 286
|
||||
CON_GETINPUT, // 287
|
||||
CON_SAVE, // 288
|
||||
CON_SAVE, // 288
|
||||
CON_CANSEE, // 289
|
||||
CON_CANSEESPR, // 290
|
||||
END
|
||||
|
|
|
|||
|
|
@ -589,13 +589,6 @@ void DoUserDef(char bSet, long lLabelID, long lVar2, short sActor, short sPlayer
|
|||
SetGameVarID((int)lVar2, ud.weaponswitch, sActor, sPlayer);
|
||||
break;
|
||||
|
||||
case USERDEFS_BRIGHTSKINS:
|
||||
if(bSet)
|
||||
ud.brightskins = lValue;
|
||||
else
|
||||
SetGameVarID((int)lVar2, ud.brightskins, sActor, sPlayer);
|
||||
break;
|
||||
|
||||
case USERDEFS_DEMOCAMS:
|
||||
if(bSet)
|
||||
ud.democams = lValue;
|
||||
|
|
|
|||
|
|
@ -2212,10 +2212,11 @@ cheat_for_port_credits:
|
|||
"Screen tilting",
|
||||
"-",
|
||||
"Show opponent weapon",
|
||||
"Bright players",
|
||||
"Demo playback cameras",
|
||||
"Record demo",
|
||||
"-",
|
||||
"-",
|
||||
"-",
|
||||
"More...",
|
||||
NULL
|
||||
};
|
||||
|
|
@ -2281,13 +2282,10 @@ cheat_for_port_credits:
|
|||
modval(0,1,(int *)&ud.showweapons,1,probey==io);
|
||||
ShowOpponentWeapons = ud.showweapons;
|
||||
gametextpal(d,yy, ShowOpponentWeapons ? "On" : "Off", MENUHIGHLIGHT(io), 0); break;
|
||||
case 9: if (x==io) ud.brightskins = 1-ud.brightskins;
|
||||
modval(0,1,(int *)&ud.brightskins,1,probey==io);
|
||||
gametextpal(d,yy, ud.brightskins ? "On" : "Off", MENUHIGHLIGHT(io), 0); break;
|
||||
case 10: if (x==io) ud.democams = 1-ud.democams;
|
||||
case 9: if (x==io) ud.democams = 1-ud.democams;
|
||||
modval(0,1,(int *)&ud.democams,1,probey==io);
|
||||
gametextpal(d,yy, ud.democams ? "On" : "Off", MENUHIGHLIGHT(io), 0); break;
|
||||
case 11: if (x==io) {
|
||||
case 10: if (x==io) {
|
||||
enabled = !((ps[myconnectindex].gm&MODE_GAME) && ud.m_recstat != 1);
|
||||
if( (ps[myconnectindex].gm&MODE_GAME) ) closedemowrite();
|
||||
else ud.m_recstat = !ud.m_recstat;
|
||||
|
|
@ -2295,7 +2293,7 @@ cheat_for_port_credits:
|
|||
if( (ps[myconnectindex].gm&MODE_GAME) && ud.m_recstat != 1 )
|
||||
enabled = 0;
|
||||
gametextpal(d,yy,ud.m_recstat?((ud.m_recstat && enabled && ps[myconnectindex].gm&MODE_GAME)?"Recording":"On"):"Off",enabled?MENUHIGHLIGHT(io):15,enabled?0:1); break;
|
||||
case 12: if (x==io) cmenu(201); break;
|
||||
case 11: if (x==io) cmenu(201); break;
|
||||
default: break;
|
||||
}
|
||||
gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):15, 2);
|
||||
|
|
@ -2338,7 +2336,6 @@ cheat_for_port_credits:
|
|||
"-",
|
||||
"-",
|
||||
"-",
|
||||
"-",
|
||||
"Previous page",
|
||||
NULL
|
||||
};
|
||||
|
|
@ -2355,7 +2352,7 @@ cheat_for_port_credits:
|
|||
|
||||
x = probesm(c,yy+5,0,io);
|
||||
|
||||
if (x == -1) { cmenu(200); probey = 12; break; }
|
||||
if (x == -1) { cmenu(200); probey = 11; break; }
|
||||
|
||||
yy = 37;
|
||||
for (ii=io=0; opts[ii]; ii++) {
|
||||
|
|
|
|||
|
|
@ -453,7 +453,6 @@ struct cvarmappings {
|
|||
|
||||
{ "cl_weaponswitch", "cl_weaponswitch: enable/disable auto weapon switching", (void*)&ud.weaponswitch, CVAR_INT|256, 0, 0, 3 },
|
||||
|
||||
{ "r_brightskins", "r_brightskins: enable/disable bright players", (void*)&ud.brightskins, CVAR_BOOL, 0, 0, 1 },
|
||||
{ "r_precache", "r_precache: enable/disable the pre-level caching routine", (void*)&useprecache, CVAR_BOOL, 0, 0, 1 }
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue