teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 07:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- migrated Duke's added sector properties.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-20 17:46:08 +01:00
parent 14907a9a97
commit cc41f4e7c6
9 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/duke/src/actors_r.cpp
View file

@ -3819,7 +3819,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
{
if (spr->sector()->ceilingstat & 1)
{
if (shadedsector[spr->sectnum] == 1)
if (spr->sector()->shadedsector == 1)
{
spr->shade += (16 - spr->shade) >> 1;
}
@ -3971,7 +3971,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
{
if (spr->sector()->ceilingstat & 1)
{
if (shadedsector[spr->sectnum] == 1)
if (spr->sector()->shadedsector == 1)
{
spr->shade += (16 - spr->shade) >> 1;
}
@ -4179,7 +4179,7 @@ void destroyit(DDukeActor *actor)
destsect->floorxpan_ = srcsect->floorxpan_;
destsect->floorypan_ = srcsect->floorypan_;
destsect->visibility = srcsect->visibility;
sectorextra[sectnum] = sectorextra[::sectnum(it_sect)]; // TRANSITIONAL: at least rename this.
destsect->keyinfo = srcsect->keyinfo;
destsect->lotag = srcsect->lotag;
destsect->hitag = srcsect->hitag;
destsect->extra = srcsect->extra;

4
source/games/duke/src/animatesprites_r.cpp
View file

@ -110,7 +110,7 @@ void animatesprites_r(spritetype* tsprite, int& spritesortcnt, int x, int y, int
default:
if (((t->cstat & 16)) || (badguy(t) && t->extra > 0) || t->statnum == 10)
{
if (shadedsector[s->sectnum] == 1 && s->statnum != 1)
if (s->sector()->shadedsector == 1 && s->statnum != 1)
{
s->shade = 16;
t->shade = 16;
@ -588,7 +588,7 @@ void animatesprites_r(spritetype* tsprite, int& spritesortcnt, int x, int y, int
stuff:
if (t->pal == 6) t->shade = -120;
if (shadedsector[s->sectnum] == 1)
if (s->sector()->shadedsector == 1)
t->shade = 16;
[[fallthrough]];

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

@ -91,10 +91,6 @@ TArray<CraneDef> cranes;
bool sound445done; // used in checksectors_r. This was local state inside a function, but this must be maintained globally and serialized
// serialized
uint8_t sectorextra[MAXSECTORS]; // something about keys, all access through the haskey function.
uint8_t shadedsector[MAXSECTORS]; // display hackiness
DDukeActor hittype[MAXSPRITES + 1]; // +1 to have a blank entry for serialization, all access in game code through the iterators.
int spriteqamount = 64; // internal sprite queue
int spriteqloc;

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

@ -53,9 +53,6 @@ extern int show_shareware;
extern int screenpeek;
// Variables that must be saved
extern uint8_t sectorextra[MAXSECTORS]; // these hold fields that were formerly in sprite and sector. Move these back into the base structs!
extern uint8_t shadedsector[MAXSECTORS];
extern int rtsplaying;
extern int tempwallptr;

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

@ -144,7 +144,7 @@ void displayweapon_r(int snum, double smoothratio)
weapon_xoffset -= bcosf(weapon_sway * 0.5) * (1. / 1536.);
weapon_xoffset -= 58 + p->weapon_ang;
if (p->insector() && shadedsector[p->cursectnum] == 1)
if (p->insector() && p->cursector()->shadedsector == 1)
shade = 16;
else
shade = p->GetActor()->s->shade;

8
source/games/duke/src/player.cpp
View file

@ -967,17 +967,17 @@ int haskey(sectortype* sectp, int snum)
{
int sect = sectnum(sectp);
auto p = &ps[snum];
if (!sectorextra[sect])
if (!sectp->keyinfo)
return 1;
if (sectorextra[sect] > 6)
if (sectp->keyinfo > 6)
return 1;
int wk = sectorextra[sect];
int wk = sectp->keyinfo;
if (wk > 3)
wk -= 3;
if (p->keys[wk] == 1)
{
sectorextra[sect] = 0;
sectp->keyinfo = 0;
return 1;
}

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

@ -682,8 +682,6 @@ void prelevel_common(int g)
numclouds = 0;
for (auto& h : hittype) h.clear();
memset(sectorextra, 0, sizeof(sectorextra));
memset(shadedsector, 0, sizeof(shadedsector));
memset(geosectorwarp, -1, sizeof(geosectorwarp));
memset(geosectorwarp2, -1, sizeof(geosectorwarp2));
memset(ambienthitag, -1, sizeof(ambienthitag));

4
source/games/duke/src/premap_r.cpp
View file

@ -576,7 +576,7 @@ void prelevel_r(int g)
break;
case RRTILE68:
shadedsector[si->sectnum] = 1;
si->sector()->shadedsector = 1;
deletesprite(ac);
break;
@ -659,7 +659,7 @@ void prelevel_r(int g)
deletesprite(i);
if (spr->picnum == RRTILE34)
{
sectorextra[spr->sectnum] = uint8_t(spr->lotag);
spr->sector()->keyinfo = uint8_t(spr->lotag);
deletesprite(i);
}
}

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

@ -339,8 +339,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
if (arc.isReading())
{
for (auto& h : hittype) h.clear();
memset(sectorextra, 0, sizeof(sectorextra));
memset(shadedsector, 0, sizeof(shadedsector));
memset(geosectorwarp, -1, sizeof(geosectorwarp));
memset(geosectorwarp2, -1, sizeof(geosectorwarp2));
memset(ambienthitag, -1, sizeof(ambienthitag));
@ -368,14 +366,12 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("levelclock", PlayClock)
("bomb_tag", ud.bomb_tag)
.Array("sectorextra", sectorextra, numsectors)
("rtsplaying", rtsplaying)
("tempwallptr", tempwallptr)
("cranes", cranes)
("sound445done", sound445done)
.Array("players", ps, ud.multimode)
("spriteqamount", spriteqamount)
.Array("shadedsector", shadedsector, numsectors)
("lastvisinc", lastvisinc)
("numanimwalls", numanimwalls)
.Array("animwall", animwall, numanimwalls)