zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-25 01:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Initial setup to convert PlayerArray array to array of SWPlayer pointers.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-02 14:59:30 +11:00
parent f9c3a64f35
commit 789c4669f1
7 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/games/sw/src/game.cpp
View file

@ -118,16 +118,16 @@ void markgcroots()
GC::MarkArray(GenericQueue, MAX_GENERIC_QUEUE);
GC::MarkArray(LoWangsQueue, MAX_LOWANGS_QUEUE);
GC::MarkArray(BossSpriteNum, 3);
for (auto& pl : PlayerArray)
for (auto pl : PlayerArray)
{
GC::Mark(pl.actor);
GC::Mark(pl.lowActor);
GC::Mark(pl.highActor);
GC::Mark(pl.remoteActor);
GC::Mark(pl.PlayerUnderActor);
GC::Mark(pl.KillerActor);
GC::Mark(pl.HitBy);
GC::Mark(pl.last_camera_act);
GC::Mark(pl->actor);
GC::Mark(pl->lowActor);
GC::Mark(pl->highActor);
GC::Mark(pl->remoteActor);
GC::Mark(pl->PlayerUnderActor);
GC::Mark(pl->KillerActor);
GC::Mark(pl->HitBy);
GC::Mark(pl->last_camera_act);
}
for (auto& so : SectorObject)
{
@ -250,6 +250,13 @@ void GameInterface::SetupSpecialTextures(TilesetBuildInfo& info)
void GameInterface::app_init()
{
// Initialise player array.
for (unsigned i = 0; i < (MAX_SW_PLAYERS_REG+1); i++)
{
PlayerArray[i] = new SWPlayer;
*PlayerArray[i] = {};
}
// these are frequently checked markers.
FAFPlaceMirrorPic[0] = tileGetTextureID(FAF_PLACE_MIRROR_PIC);
FAFPlaceMirrorPic[1] = tileGetTextureID(FAF_PLACE_MIRROR_PIC + 1);
@ -293,7 +300,6 @@ void GameInterface::app_init()
defineSky(nullptr, 1, nullptr);
memset(Track, 0, sizeof(Track));
memset(PlayerArray, 0, sizeof(PlayerArray));
for (int i = 0; i < MAX_SW_PLAYERS; i++)
INITLIST(&(getPlayer(i)->PanelSpriteList));

4
source/games/sw/src/game.h
View file

@ -1859,11 +1859,11 @@ struct SWPlayer final : public CorePlayer
}
};
extern SWPlayer PlayerArray[MAX_SW_PLAYERS_REG+1];
extern SWPlayer* PlayerArray[MAX_SW_PLAYERS_REG+1];
inline SWPlayer* getPlayer(int index)
{
return &PlayerArray[index];
return PlayerArray[index];
}

4
source/games/sw/src/ninja.cpp
View file

@ -2321,7 +2321,7 @@ extern ACTOR_ACTION_SET PlayerNinjaActionSet;
void InitPlayerSprite(SWPlayer* pp, const DVector3& spawnpos, const DAngle startang)
{
int pnum = int(pp - PlayerArray);
int pnum = int(pp - *PlayerArray);
double fz,cz;
extern bool NewGame;
@ -2408,7 +2408,7 @@ void SpawnPlayerUnderSprite(SWPlayer* pp)
{
DSWActor* plActor = pp->GetActor();
int pnum = int(pp - PlayerArray);
int pnum = int(pp - *PlayerArray);
pp->PlayerUnderActor = SpawnActor(STAT_PLAYER_UNDER0 + pnum,
NINJA_RUN_R0, nullptr, pp->cursector, pp->GetActor()->getPosWithOffsetZ(), pp->GetActor()->spr.Angles.Yaw);

23
source/games/sw/src/player.cpp
View file

@ -119,7 +119,7 @@ extern bool DebugOperate;
int ChopTics;
SWPlayer PlayerArray[MAX_SW_PLAYERS_REG + 1];
SWPlayer* PlayerArray[MAX_SW_PLAYERS_REG + 1];
// These are a bunch of kens variables for the player
@ -1325,7 +1325,7 @@ void DoPlayerWarpTeleporter(SWPlayer* pp)
TRAVERSE_CONNECT(pnum)
{
if (pnum != pp - PlayerArray)
if (pnum != pp - *PlayerArray)
{
SWPlayer* npp = getPlayer(pnum);
@ -5458,7 +5458,7 @@ void DoPlayerDeathMessage(SWPlayer* pp, SWPlayer* killer)
int pnum;
bool SEND_OK = false;
killer->KilledPlayer[pp-PlayerArray]++;
killer->KilledPlayer[pp - *PlayerArray]++;
if (pp == killer && pp == getPlayer(myconnectindex))
{
@ -6867,14 +6867,15 @@ void domovethings(const ticcmd_t* playercmds)
void InitAllPlayers(void)
{
SWPlayer* pp;
SWPlayer* pfirst = PlayerArray;
int i;
SWPlayer* pfirst = getPlayer(0);
extern bool NewGame;
//int fz,cz;
// Initialize all [MAX_SW_PLAYERS] arrays here!
for (pp = PlayerArray; pp < getPlayer(MAX_SW_PLAYERS); pp++)
for (int i = 0; i < MAX_SW_PLAYERS; i++)
{
auto pp = getPlayer(i);
pp->cursector = pfirst->cursector;
// set like this so that player can trigger something on start of the level
pp->lastcursector = pfirst->cursector+1;
@ -6897,10 +6898,10 @@ void InitAllPlayers(void)
if (NewGame)
{
for (i = 0; i < MAX_INVENTORY; i++)
for (unsigned j = 0; j < MAX_INVENTORY; j++)
{
pp->InventoryAmount[i] = 0;
pp->InventoryPercent[i] = 0;
pp->InventoryAmount[j] = 0;
pp->InventoryPercent[j] = 0;
}
}
@ -6967,7 +6968,7 @@ bool SpawnPositionUsed[MAX_SW_PLAYERS_REG+1];
void PlayerSpawnPosition(SWPlayer* pp)
{
short pnum = short(pp - PlayerArray);
short pnum = short(pp - *PlayerArray);
short pos_num = pnum;
int i;
DSWActor* spawn_sprite = nullptr;
@ -7079,7 +7080,7 @@ void InitMultiPlayerInfo(const DVector3& spawnpos, const DAngle startang)
// set up the zero starting positions - its not saved in the map as a ST1 sprite
// like the others
pp = PlayerArray;
pp = getPlayer(0);
for (stat = 0; stat < SIZ(MultiStatList); stat++)
{
if (gNet.MultiGameType != MULTI_GAME_NONE)

2
source/games/sw/src/save.cpp
View file

@ -419,7 +419,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, REMOTE_CONTROL& w,
FSerializer& Serialize(FSerializer& arc, const char* keyname, SWPlayer*& w, SWPlayer** def)
{
int ndx = w ? int(w - PlayerArray) : -1;
int ndx = w ? int(w - *PlayerArray) : -1;
arc(keyname, ndx);
w = ndx == -1 ? nullptr : getPlayer(ndx);
return arc;

4
source/games/sw/src/sounds.cpp
View file

@ -379,7 +379,7 @@ public:
int SoundSourceIndex(FSoundChan* chan) override
{
if (chan->SourceType == SOURCE_Player) return int((SWPlayer*)(chan->Source) - PlayerArray);
if (chan->SourceType == SOURCE_Player) return int((SWPlayer*)(chan->Source) - *PlayerArray);
return 0;
}
@ -722,7 +722,7 @@ int _PlayerSound(int num, SWPlayer* pp)
if (Prediction)
return 0;
if (pp < PlayerArray || pp >= getPlayer(MAX_SW_PLAYERS))
if (pp < *PlayerArray || pp >= getPlayer(MAX_SW_PLAYERS))
{
return 0;
}

2
source/games/sw/src/text.cpp
View file

@ -47,7 +47,7 @@ BEGIN_SW_NS
void PutStringInfo(SWPlayer* pp, const char *string)
{
if (pp-PlayerArray == myconnectindex)
if ((pp - *PlayerArray) == myconnectindex)
Printf(PRINT_MEDIUM|PRINT_NOTIFY, "%s\n", string); // Put it in the console too
}