- SW: eliminated all remaining MAXSECTORS references, except static array declarations.

This commit is contained in:
Christoph Oelckers 2021-11-11 00:59:27 +01:00
parent 75e2d801a7
commit b6579809ad
5 changed files with 4 additions and 29 deletions

View file

@ -716,29 +716,6 @@ int StdRandomRange(int range)
//
//---------------------------------------------------------------------------
#include "saveable.h"
saveable_module saveable_build{};
void Saveable_Init_Dynamic()
{
static saveable_data saveable_build_data[] =
{
{sector, MAXSECTORS*sizeof(sectortype)},
{sprite, MAXSPRITES*sizeof(spritetype)},
{wall, MAXWALLS*sizeof(walltype)},
};
saveable_build.data = saveable_build_data;
saveable_build.numdata = NUM_SAVEABLE_ITEMS(saveable_build_data);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ReservedSpace GameInterface::GetReservedScreenSpace(int viewsize)
{
return { 0, 48 };

View file

@ -337,7 +337,8 @@ void StopInventoryCloak(PLAYERp pp, short InventoryNum)
//
//////////////////////////////////////////////////////////////////////
static char sectorfloorpals[MAXSECTORS], sectorceilingpals[MAXSECTORS], wallpals[MAXWALLS];
static char sectorfloorpals[MAXSECTORS], sectorceilingpals[MAXSECTORS];
static char wallpals[MAXWALLS];
void

View file

@ -1026,7 +1026,7 @@ void CollectPortals()
testnewrenderer = true;
TArray<PortalGroup> floorportals;
TArray<PortalGroup> ceilingportals;
FixedBitArray<MAXSECTORS> floordone, ceilingdone;
BitArray floordone(numsectors), ceilingdone(numsectors);
for (int i = 0; i < numsectors; i++)
{

View file

@ -36,8 +36,6 @@ void Saveable_Init(void)
{
if (saveablemodules.Size() > 0) return;
Saveable_Init_Dynamic();
#define MODULE(x) { \
extern saveable_module saveable_ ## x; \
saveablemodules.Push(&saveable_ ## x); \
@ -45,7 +43,7 @@ void Saveable_Init(void)
MODULE(actor)
MODULE(ai)
MODULE(build)
MODULE(ai) // was 'build' but that is not used anywhere anymore.
MODULE(bunny)
MODULE(coolg)
MODULE(coolie)

View file

@ -68,7 +68,6 @@ typedef struct
} saveddatasym;
void Saveable_Init(void);
void Saveable_Init_Dynamic(void);
int Saveable_FindCodeSym(void *ptr, savedcodesym *sym);
int Saveable_FindDataSym(void *ptr, saveddatasym *sym);