ref: 2ec25b9ab94916c3dc953b0c7b24a0f6c1a5ea4e
parent: 8bc817adfb66bdec0ff4d9cddf0f240ef129c13a
author: James Haley <[email protected]>
date: Thu Feb 9 21:11:56 EST 2012
Remove all temporary code that was put in place until MAXPLAYERS became 8 rather than 4 (unfortunately this was NOT accounted for in the save code). Subversion-branch: /branches/v2-branch Subversion-revision: 2498
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -2244,11 +2244,6 @@
for (i=0 ; i<MAXPLAYERS ; i++)
*demo_p++ = playeringame[i];
-
- // STRIFE-TODO: TEMPORARY: fill out the rest of playeringame until
- // MAXPLAYERS == 8
- for (; i < 8; i++)
- *demo_p++ = 0;
}
@@ -2345,11 +2340,6 @@
for (i=0 ; i<MAXPLAYERS ; i++)
playeringame[i] = *demo_p++;
-
- // STRIFE-TODO: read out the rest of playeringame until
- // MAXPLAYERS is bumped to 8
- for(; i < 8; i++)
- ++demo_p;
//!
// @category demo
--- a/src/strife/p_mobj.c
+++ b/src/strife/p_mobj.c
@@ -896,10 +896,7 @@
// [STRIFE] Modifications for:
// * No Lost Souls, item count
// * New mapthing_t flag bits
-//
-// STRIFE-FIXME/STRIFE-TODO:
// * 8-player support
-// * Restore I_Error for missing mapthings (8-player support is prerequisite)
//
void P_SpawnMapThing (mapthing_t* mthing)
{@@ -930,8 +927,8 @@
}
// check for players specially
- // STRIFE-TODO: Need 8 player starts
- if (mthing->type <= 4)
+ // haleyjd 20120209: [STRIFE] 8 player starts
+ if (mthing->type <= 8)
{// save spots for respawning in network games
playerstarts[mthing->type-1] = *mthing;
@@ -960,15 +957,10 @@
if (mthing->type == mobjinfo[i].doomednum)
break;
- /*
if (i==NUMMOBJTYPES)
I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",mthing->type,
mthing->x, mthing->y);
- */
- // haleyjd 08/29/10: STRIFE-FIXME: Temporarily disabled I_Error for testing purposes
- if (i == NUMMOBJTYPES)
- return;
// don't spawn keycards and players in deathmatch
if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)
--- a/src/strife/p_saveg.c
+++ b/src/strife/p_saveg.c
@@ -1620,7 +1620,7 @@
//saveg_write8(gameepisode);
//saveg_write8(gamemap);
- for (i=0 ; i<MAXPLAYERS ; i++)
+ for (i=0 ; i<MAXPLAYERS ; i++)
saveg_write8(playeringame[i]);
saveg_write8((leveltime >> 16) & 0xff);
@@ -1659,7 +1659,7 @@
//gameepisode = saveg_read8();
//gamemap = saveg_read8();
- for (i=0 ; i<MAXPLAYERS ; i++)
+ for (i=0 ; i<MAXPLAYERS ; i++)
playeringame[i] = saveg_read8();
// get the times