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

- unlimited and floatified the movesector position array.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-11 16:41:17 +02:00
parent 4f9718e8a8
commit b5b159f45b
7 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/actors.cpp
View file

@ -280,7 +280,7 @@ void movesector(DDukeActor* const actor, int msindex, DAngle rotation)
for(auto& wal : wallsofsector(actor->sector()))
{
auto t = rotatepoint({ 0, 0 }, { msx[msindex] * inttoworld, msy[msindex] * inttoworld }, rotation);
auto t = rotatepoint({ 0, 0 }, mspos[msindex], rotation);
dragpoint(&wal, actor->spr.pos.XY() + t);
msindex++;

1
source/games/duke/src/funct.h
View file

@ -31,7 +31,6 @@ void movefta();
void clearcameras(int i, player_struct* p);
void RANDOMSCRAP(DDukeActor* i);
void ms(DDukeActor* i);
void movecrane(DDukeActor* i, int crane);
void movefountain(DDukeActor* i, int fountain);
void moveflammable(DDukeActor* i, int pool);

3
source/games/duke/src/global.cpp
View file

@ -83,8 +83,7 @@ int actor_tog; // cheat helper
int playerswhenstarted; // why is this needed?
int show_shareware; // display only.
int rtsplaying; // RTS playback state
int tempwallptr; // msx/y index.
int msx[MAXANIMPOINTS], msy[MAXANIMPOINTS];
TArray<DVector2> mspos;
TArray<CraneDef> cranes;
bool sound445done; // used in checksectors_r. This was local state inside a function, but this must be maintained globally and serialized

3
source/games/duke/src/global.h
View file

@ -62,7 +62,6 @@ extern int screenpeek;
// Variables that must be saved
extern int rtsplaying;
extern int tempwallptr;
extern bool sound445done;
extern player_struct ps[MAXPLAYERS];
@ -123,7 +122,7 @@ extern int geocnt;
extern short ambientlotag[64];
extern short ambienthitag[64];
extern unsigned ambientfx;
extern int msx[MAXANIMPOINTS], msy[MAXANIMPOINTS]; // todo: unlimit
extern TArray<DVector2> mspos;
extern TArray<CraneDef> cranes;
extern int WindTime, WindDir;
extern short fakebubba_spawn, mamaspawn_count, banjosound;

2
source/games/duke/src/premap.cpp
View file

@ -453,7 +453,7 @@ void resetprestat(int snum,int g)
randomseed = 17L;
paused = 0;
ud.cameraactor =nullptr;
tempwallptr = 0;
mspos.Clear();
cranes.Clear();
camsprite =nullptr;
earthquaketime = 0;

5
source/games/duke/src/savegame.cpp
View file

@ -372,7 +372,7 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("bomb_tag", ud.bomb_tag)
("rtsplaying", rtsplaying)
("tempwallptr", tempwallptr)
//("tempwallptr", tempwallptr)
("cranes", cranes)
("sound445done", sound445done)
.Array("players", ps, ud.multimode)
@ -425,8 +425,7 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("ambientfx", ambientfx)
.Array("ambientlotag", ambientlotag, ambientfx)
.Array("ambienthitag", ambienthitag, ambientfx)
.Array("msx", msx, MAXANIMPOINTS)
.Array("msy", msy, MAXANIMPOINTS)
("mspos", mspos)
("windtime", WindTime)
("winddir", WindDir)
("fakebubba_spawn", fakebubba_spawn)

10
source/games/duke/src/spawn.cpp
View file

@ -955,16 +955,10 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
}
}
actor->temp_data[1] = tempwallptr;
actor->temp_data[1] = mspos.Size();
for (auto& wal : wallsofsector(sectp))
{
msx[tempwallptr] = wal.wall_int_pos().X - actor->int_pos().X;
msy[tempwallptr] = wal.wall_int_pos().Y - actor->int_pos().Y;
tempwallptr++;
if (tempwallptr > 2047)
{
I_Error("Too many moving sectors at (%d,%d).\n", int(wal.pos.X), int(wal.pos.Y));
}
mspos.Push(wal.pos - actor->spr.pos);
}
if (actor->spr.lotag == SE_30_TWO_WAY_TRAIN || actor->spr.lotag == SE_6_SUBWAY || actor->spr.lotag == SE_14_SUBWAY_CAR || actor->spr.lotag == SE_5_BOSS)
{