zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enumify the definition of g_gametypeFlags.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6481 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-10-15 23:10:18 +00:00
parent 04d1f0eb29
commit 6aaddf3fa2
3 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
source/duke3d/src/global.cpp
View file

@ -48,11 +48,46 @@ int32_t g_volumeFlags[MAXVOLUMES];
int32_t g_gametypeFlags[MAXGAMETYPES] = int32_t g_gametypeFlags[MAXGAMETYPES] =
{ {
/*4+*/8+16+1024+2048+16384, // GAMETYPE_FRAGBAR |
1+2+32+64+128+256+512+4096+8192+32768, GAMETYPE_SCORESHEET |
2+/*4+*/8+16+16384, GAMETYPE_DMSWITCHES |
/*4+*/8+16+1024+2048+16384+65536+131072, GAMETYPE_ITEMRESPAWN |
2+/*4+*/8+16+16384+65536+131072 GAMETYPE_MARKEROPTION |
GAMETYPE_ACCESSATSTART,
GAMETYPE_COOP |
GAMETYPE_WEAPSTAY |
GAMETYPE_COOPSPAWN |
GAMETYPE_ACCESSCARDSPRITES |
GAMETYPE_COOPVIEW |
GAMETYPE_COOPSOUND |
GAMETYPE_OTHERPLAYERSINMAP |
GAMETYPE_PLAYERSFRIENDLY |
GAMETYPE_FIXEDRESPAWN |
GAMETYPE_PRESERVEINVENTORYDEATH,
GAMETYPE_WEAPSTAY |
// GAMETYPE_FRAGBAR |
GAMETYPE_SCORESHEET |
GAMETYPE_DMSWITCHES |
GAMETYPE_ACCESSATSTART,
// GAMETYPE_FRAGBAR |
GAMETYPE_SCORESHEET |
GAMETYPE_DMSWITCHES |
GAMETYPE_ITEMRESPAWN |
GAMETYPE_MARKEROPTION |
GAMETYPE_ACCESSATSTART |
GAMETYPE_TDM |
GAMETYPE_TDMSPAWN,
GAMETYPE_WEAPSTAY |
// GAMETYPE_FRAGBAR |
GAMETYPE_SCORESHEET |
GAMETYPE_DMSWITCHES |
GAMETYPE_ACCESSATSTART |
GAMETYPE_TDM |
GAMETYPE_TDMSPAWN,
}; };
int32_t g_actorRespawnTime = 768; int32_t g_actorRespawnTime = 768;

4
source/duke3d/src/osdcmds.cpp
View file

@ -120,7 +120,7 @@ static int32_t osdcmd_changelevel(osdfuncparm_t const * const parm)
enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE));
} }
if ((GametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(GametypeFlags[ud.m_coop] & GAMETYPE_TDM)) if ((g_gametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(g_gametypeFlags[ud.m_coop] & GAMETYPE_TDM))
ud.m_noexits = 0; ud.m_noexits = 0;
M_OpenMenu(myconnectindex); M_OpenMenu(myconnectindex);
@ -257,7 +257,7 @@ static int32_t osdcmd_map(osdfuncparm_t const * const parm)
enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE));
} }
if ((GametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(GametypeFlags[ud.m_coop] & GAMETYPE_TDM)) if ((g_gametypeFlags[ud.m_coop] & GAMETYPE_PLAYERSFRIENDLY) && !(g_gametypeFlags[ud.m_coop] & GAMETYPE_TDM))
ud.m_noexits = 0; ud.m_noexits = 0;
M_OpenMenu(myconnectindex); M_OpenMenu(myconnectindex);

2
source/duke3d/src/screens.cpp
View file

@ -1167,7 +1167,7 @@ void G_DisplayRest(int32_t smoothratio)
} }
} }
#if 0 #if 0
if (GametypeFlags[ud.coop] & GAMETYPE_TDM) if (g_gametypeFlags[ud.coop] & GAMETYPE_TDM)
{ {
for (i=0; i<ud.multimode; i++) for (i=0; i<ud.multimode; i++)
{ {