zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 06:32:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some g_netServer || g_netServer --> g_netServer.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2925 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-19 12:54:30 +00:00
parent 9caf442177
commit ea74aad3a6
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/actors.c
View file

@ -1106,7 +1106,7 @@ ACTOR_STATIC void G_MovePlayers(void)
} }
else else
{ {
if (g_netServer || (g_netServer || ud.multimode > 1)) if (g_netServer || ud.multimode > 1)
otherp = P_FindOtherPlayer(s->yvel,&otherx); otherp = P_FindOtherPlayer(s->yvel,&otherx);
else else
{ {
@ -1117,7 +1117,7 @@ ACTOR_STATIC void G_MovePlayers(void)
if (actorscrptr[sprite[i].picnum]) if (actorscrptr[sprite[i].picnum])
A_Execute(i,s->yvel,otherx); A_Execute(i,s->yvel,otherx);
if (g_netServer || (g_netServer || ud.multimode > 1)) if (g_netServer || ud.multimode > 1)
if (sprite[g_player[otherp].ps->i].extra > 0) if (sprite[g_player[otherp].ps->i].extra > 0)
{ {
if (s->yrepeat > 32 && sprite[g_player[otherp].ps->i].yrepeat < 32) if (s->yrepeat > 32 && sprite[g_player[otherp].ps->i].yrepeat < 32)

9
polymer/eduke32/source/game.c
View file

@ -1519,10 +1519,11 @@ static void G_DrawStatusBar(int32_t snum)
if (u == -1) if (u == -1)
{ {
G_PatchStatusBar(0,0,320,200); G_PatchStatusBar(0,0,320,200);
if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) if ((g_netServer || ud.multimode > 1) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR))
rotatesprite_fs(sbarx(277+1),sbary(SBY+7-1),sb16,0,KILLSICON,0,0,10+16); rotatesprite_fs(sbarx(277+1),sbary(SBY+7-1),sb16,0,KILLSICON,0,0,10+16);
} }
if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR))
if ((g_netServer || ud.multimode > 1) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR))
{ {
if (u&32768) if (u&32768)
{ {
@ -1675,7 +1676,7 @@ static void G_PrintCoords(int32_t snum)
{ {
if (ud.multimode > 4) if (ud.multimode > 4)
y = 32; y = 32;
else if (g_netServer || (g_netServer || ud.multimode > 1)) else if (g_netServer || ud.multimode > 1)
y = 24; y = 24;
} }
Bsprintf(tempbuf,"XYZ= (%d,%d,%d)",g_player[snum].ps->pos.x,g_player[snum].ps->pos.y,g_player[snum].ps->pos.z); Bsprintf(tempbuf,"XYZ= (%d,%d,%d)",g_player[snum].ps->pos.x,g_player[snum].ps->pos.y,g_player[snum].ps->pos.z);
@ -1714,7 +1715,7 @@ void G_PrintGameQuotes(void)
int32_t i, j, k, l; int32_t i, j, k, l;
k = 1; k = 1;
if (GTFLAGS(GAMETYPE_FRAGBAR) && ud.screen_size > 0 && (g_netServer || (g_netServer || ud.multimode > 1))) if (GTFLAGS(GAMETYPE_FRAGBAR) && ud.screen_size > 0 && (g_netServer || ud.multimode > 1))
{ {
j = 0; j = 0;
k += 8; k += 8;