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
This commit is contained in:
helixhorned 2012-08-22 22:51:38 +00:00
parent 95de2abb3a
commit 772778205b
5 changed files with 10 additions and 10 deletions

View file

@ -1251,7 +1251,7 @@ ACTOR_STATIC void G_MoveFX(void)
{ {
int32_t x = ldist(&sprite[peekps->i],s); int32_t x = ldist(&sprite[peekps->i],s);
if (g_fakeMultiMode && ud.multimode==2) if (g_fakeMultiMode==2)
{ {
// HACK for splitscreen mod // HACK for splitscreen mod
int32_t otherdist = ldist(&sprite[g_player[1].ps->i],s); 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); int32_t x = dist(&sprite[peekps->i],s);
if (g_fakeMultiMode && ud.multimode==2) if (g_fakeMultiMode==2)
{ {
// HACK for splitscreen mod // HACK for splitscreen mod
int32_t otherdist = dist(&sprite[g_player[1].ps->i],s); int32_t otherdist = dist(&sprite[g_player[1].ps->i],s);

View file

@ -2623,7 +2623,7 @@ void G_DisplayRest(int32_t smoothratio)
palaccum_t tint = PALACCUM_INITIALIZER; palaccum_t tint = PALACCUM_INITIALIZER;
DukePlayer_t *const pp = g_player[screenpeek].ps; 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; int32_t cposx, cposy, cang;
#ifdef USE_OPENGL #ifdef USE_OPENGL
@ -2811,7 +2811,7 @@ void G_DisplayRest(int32_t smoothratio)
G_DrawStatusBar(screenpeek); G_DrawStatusBar(screenpeek);
// HACK // HACK
if (g_fakeMultiMode && ud.multimode==2) if (g_fakeMultiMode==2)
{ {
G_DrawStatusBar(1); G_DrawStatusBar(1);
G_PrintGameQuotes(1); G_PrintGameQuotes(1);
@ -9052,7 +9052,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
ud.multimode = numpl; ud.multimode = numpl;
initprintf("Fake multiplayer mode: %d players.\n", ud.multimode); initprintf("Fake multiplayer mode: %d players.\n", ud.multimode);
g_fakeMultiMode = 1; g_fakeMultiMode = numpl;
} }
} }

View file

@ -1229,7 +1229,7 @@ skip_check:
continue; continue;
} }
if (vm.g_p == screenpeek || (GametypeFlags[ud.coop]&GAMETYPE_COOPSOUND) 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); A_PlaySound(*insptr,g_player[screenpeek].ps->i);
insptr++; insptr++;

View file

@ -2009,7 +2009,7 @@ static int32_t P_DisplayFist(int32_t gs,int32_t snum)
fistpal = get_hud_pal(ps); fistpal = get_hud_pal(ps);
// XXX: this is outdated, doesn't handle above/below split. // 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; wx[(g_snum==0)] = (wx[0]+wx[1])/2+1;
rotatesprite( rotatesprite(
@ -2057,7 +2057,7 @@ static void G_DrawTileScaled(int32_t x, int32_t y, int32_t tilenum, int32_t shad
if (orientation&4) if (orientation&4)
ang = 1024; ang = 1024;
if (g_fakeMultiMode && ud.multimode==2) if (g_fakeMultiMode==2)
{ {
const int32_t sidebyside = (ud.screen_size!=0); const int32_t sidebyside = (ud.screen_size!=0);

View file

@ -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); 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 // HACK for splitscreen mod: take the min of sound distances
// to 1st and 2nd player. // 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); pitch = get_sound_pitch(num);
peekps = g_player[screenpeek].ps; peekps = g_player[screenpeek].ps;
if (g_fakeMultiMode && ud.multimode==2) if (g_fakeMultiMode==2)
{ {
// splitscreen HACK // splitscreen HACK
if (g_player[1].ps->i == i) if (g_player[1].ps->i == i)