OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Pass playernum as a parameter to P_SpawnPlayer(). Now P_SpawnMapThing() is the only thing

Browse source 
that uses the MapThing's type to determine the which player is spawning.

SVN r3748 (trunk)
This commit is contained in:
Randy Heit 2012-07-07 22:52:37 +00:00
commit 390fd5dd6c
5 changed files with 10 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/g_game.cpp
View file

@ -1521,12 +1521,7 @@ void G_DeathMatchSpawnPlayer (int playernum)
}
}
if (playernum < 4)
spot->type = playernum+1;
else
spot->type = playernum + gameinfo.player5start - 4;
AActor *mo = P_SpawnPlayer (spot);
AActor *mo = P_SpawnPlayer(spot, playernum);
if (mo != NULL) P_PlayerStartStomp(mo);
}
@ -1599,7 +1594,7 @@ void G_DoReborn (int playernum, bool freshbot)
if (G_CheckSpot (playernum, &playerstarts[playernum]) )
{
AActor *mo = P_SpawnPlayer (&playerstarts[playernum]);
AActor *mo = P_SpawnPlayer(&playerstarts[playernum], playernum);
if (mo != NULL) P_PlayerStartStomp(mo);
}
else
@ -1609,27 +1604,13 @@ void G_DoReborn (int playernum, bool freshbot)
{
if (G_CheckSpot (playernum, &playerstarts[i]) )
{
int oldtype = playerstarts[i].type;
// fake as other player
// [RH] These numbers should be common across all games. Or better yet, not
// used at all outside P_SpawnMapThing().
if (playernum < 4)
{
playerstarts[i].type = playernum + 1;
}
else
{
playerstarts[i].type = playernum + gameinfo.player5start - 4;
}
AActor *mo = P_SpawnPlayer (&playerstarts[i]);
AActor *mo = P_SpawnPlayer(&playerstarts[i], playernum);
if (mo != NULL) P_PlayerStartStomp(mo);
playerstarts[i].type = oldtype; // restore
return;
}
// he's going to be inside something. Too bad.
}
AActor *mo = P_SpawnPlayer (&playerstarts[playernum]);
AActor *mo = P_SpawnPlayer(&playerstarts[playernum], playernum);
if (mo != NULL) P_PlayerStartStomp(mo);
}
}