From ea74aad3a6ae667f29690beb4abf70933c8282c0 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 19 Aug 2012 12:54:30 +0000 Subject: [PATCH] Some g_netServer || g_netServer --> g_netServer. git-svn-id: https://svn.eduke32.com/eduke32@2925 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.c | 4 ++-- polymer/eduke32/source/game.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 1e8a75ec5..cc14a11d4 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -1106,7 +1106,7 @@ ACTOR_STATIC void G_MovePlayers(void) } else { - if (g_netServer || (g_netServer || ud.multimode > 1)) + if (g_netServer || ud.multimode > 1) otherp = P_FindOtherPlayer(s->yvel,&otherx); else { @@ -1117,7 +1117,7 @@ ACTOR_STATIC void G_MovePlayers(void) if (actorscrptr[sprite[i].picnum]) 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 (s->yrepeat > 32 && sprite[g_player[otherp].ps->i].yrepeat < 32) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 38179251d..ef30fc95f 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -1519,10 +1519,11 @@ static void G_DrawStatusBar(int32_t snum) if (u == -1) { 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); } - 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) { @@ -1675,7 +1676,7 @@ static void G_PrintCoords(int32_t snum) { if (ud.multimode > 4) y = 32; - else if (g_netServer || (g_netServer || ud.multimode > 1)) + else if (g_netServer || ud.multimode > 1) 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); @@ -1714,7 +1715,7 @@ void G_PrintGameQuotes(void) int32_t i, j, k, l; 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; k += 8;