From 772778205b502ba41b5559ae59e3a793bab4bc8f Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 22 Aug 2012 22:51:38 +0000
Subject: [PATCH] Pack how many players fake multi was started with into
 g_fakeMultiMode.

git-svn-id: https://svn.eduke32.com/eduke32@2957 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/actors.c   | 4 ++--
 polymer/eduke32/source/game.c     | 6 +++---
 polymer/eduke32/source/gameexec.c | 2 +-
 polymer/eduke32/source/player.c   | 4 ++--
 polymer/eduke32/source/sounds.c   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index cc14a11d4..ccf6bf903 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -1251,7 +1251,7 @@ ACTOR_STATIC void G_MoveFX(void)
             {
                 int32_t x = ldist(&sprite[peekps->i],s);
 
-                if (g_fakeMultiMode && ud.multimode==2)
+                if (g_fakeMultiMode==2)
                 {
                     // HACK for splitscreen mod
                     int32_t otherdist = ldist(&sprite[g_player[1].ps->i],s);
@@ -1277,7 +1277,7 @@ ACTOR_STATIC void G_MoveFX(void)
                 {
                     int32_t x = dist(&sprite[peekps->i],s);
 
-                    if (g_fakeMultiMode && ud.multimode==2)
+                    if (g_fakeMultiMode==2)
                     {
                         // HACK for splitscreen mod
                         int32_t otherdist = dist(&sprite[g_player[1].ps->i],s);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index d89d94ee0..d1480de06 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -2623,7 +2623,7 @@ void G_DisplayRest(int32_t smoothratio)
     palaccum_t tint = PALACCUM_INITIALIZER;
 
     DukePlayer_t *const pp = g_player[screenpeek].ps;
-    DukePlayer_t *const pp2 = g_fakeMultiMode && ud.multimode==2 ? g_player[1].ps : NULL;
+    DukePlayer_t *const pp2 = g_fakeMultiMode==2 ? g_player[1].ps : NULL;
     int32_t cposx, cposy, cang;
 
 #ifdef USE_OPENGL
@@ -2811,7 +2811,7 @@ void G_DisplayRest(int32_t smoothratio)
         G_DrawStatusBar(screenpeek);
 
     // HACK
-    if (g_fakeMultiMode && ud.multimode==2)
+    if (g_fakeMultiMode==2)
     {
         G_DrawStatusBar(1);
         G_PrintGameQuotes(1);
@@ -9052,7 +9052,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
                             ud.multimode = numpl;
                             initprintf("Fake multiplayer mode: %d players.\n", ud.multimode);
 
-                            g_fakeMultiMode = 1;
+                            g_fakeMultiMode = numpl;
                         }
                     }
 
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index b65e16bf0..40d84f4fe 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -1229,7 +1229,7 @@ skip_check:
                 continue;
             }
             if (vm.g_p == screenpeek || (GametypeFlags[ud.coop]&GAMETYPE_COOPSOUND)
-                || (g_fakeMultiMode && ud.multimode==2)
+                || (g_fakeMultiMode==2)
                 )
                 A_PlaySound(*insptr,g_player[screenpeek].ps->i);
             insptr++;
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index b25390a64..1255b1e23 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -2009,7 +2009,7 @@ static int32_t P_DisplayFist(int32_t gs,int32_t snum)
     fistpal = get_hud_pal(ps);
 
     // XXX: this is outdated, doesn't handle above/below split.
-    if (g_fakeMultiMode && ud.multimode==2)
+    if (g_fakeMultiMode==2)
         wx[(g_snum==0)] = (wx[0]+wx[1])/2+1;
 
     rotatesprite(
@@ -2057,7 +2057,7 @@ static void G_DrawTileScaled(int32_t x, int32_t y, int32_t tilenum, int32_t shad
     if (orientation&4)
         ang = 1024;
 
-    if (g_fakeMultiMode && ud.multimode==2)
+    if (g_fakeMultiMode==2)
     {
         const int32_t sidebyside = (ud.screen_size!=0);
 
diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c
index 7a1268896..2330d230a 100644
--- a/polymer/eduke32/source/sounds.c
+++ b/polymer/eduke32/source/sounds.c
@@ -424,7 +424,7 @@ static int32_t S_CalcDistAndAng(int32_t i, int32_t num, int32_t camsect, int32_t
 
     sndist = FindDistance3D(cam->x-pos->x, cam->y-pos->y, (cam->z-pos->z)>>4);
 
-    if (g_fakeMultiMode && ud.multimode==2)
+    if (g_fakeMultiMode==2)
     {
         // HACK for splitscreen mod: take the min of sound distances
         // to 1st and 2nd player.
@@ -550,7 +550,7 @@ int32_t S_PlaySound3D(int32_t num, int32_t i, const vec3_t *pos)
     pitch = get_sound_pitch(num);
     peekps = g_player[screenpeek].ps;
 
-    if (g_fakeMultiMode && ud.multimode==2)
+    if (g_fakeMultiMode==2)
     {
         // splitscreen HACK
         if (g_player[1].ps->i == i)