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

- cleaned up and renamed buildtypes.h.

Browse source 
Content was reordered so that the file can contain the inlines belonging to the map data types that previously had to be stored elsewhere.
Also moved out of the Build folder because virtually everything in here can be traced to content available in Duke Nukem 3D's and Shadow Warrior's source releases.
This commit is contained in:
Christoph Oelckers 2021-12-17 20:24:48 +01:00
parent 4a5de6f56e
commit dddf48fd3e
23 changed files with 725 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/core/maploader.cpp
View file

@ -51,6 +51,14 @@
extern BitArray clipsectormap;
int numsectors, numwalls; // not really needed anymore, need to be refactored out (58x numsectors, 48x numwalls)
TArray<sectortype> sector;
TArray<walltype> wall;
// for differential savegames.
TArray<sectortype> sectorbackup;
TArray<walltype> wallbackup;
// needed for skipping over to get the map size first.
enum
{
@ -239,7 +247,7 @@ static void SetWallPalV5()
}
}
void ValidateSprite(spritetype& spr, int sectnum, int index)
void validateSprite(spritetype& spr, int sectnum, int index)
{
bool bugged = false;
if ((unsigned)spr.statnum >= MAXSTATUS)
@ -401,7 +409,7 @@ void fixSectors()
}
}
void engineLoadBoard(const char* filename, int flags, vec3_t* pos, int16_t* ang, int* cursectnum, SpawnSpriteDef& sprites)
void loadMap(const char* filename, int flags, vec3_t* pos, int16_t* ang, int* cursectnum, SpawnSpriteDef& sprites)
{
inputState.ClearAllInput();
@ -472,7 +480,7 @@ void engineLoadBoard(const char* filename, int flags, vec3_t* pos, int16_t* ang,
case 6: ReadSpriteV6(fr, sprites.sprites[i], secno); break;
default: ReadSpriteV7(fr, sprites.sprites[i], secno); break;
}
ValidateSprite(sprites.sprites[i], secno, i);
validateSprite(sprites.sprites[i], secno, i);
}
@ -486,7 +494,7 @@ void engineLoadBoard(const char* filename, int flags, vec3_t* pos, int16_t* ang,
auto buffer = fr.Read();
unsigned char md4[16];
md4once(buffer.Data(), buffer.Size(), md4);
G_LoadMapHack(filename, md4, sprites);
loadMapHack(filename, md4, sprites);
setWallSectors();
hw_CreateSections();
sectionGeometry.SetSize(sections.Size());
@ -514,7 +522,7 @@ void loadMapBackup(const char* filename)
}
else
{
engineLoadBoard(filename, 0, &pos, &scratch, &scratch2, scratch3);
loadMap(filename, 0, &pos, &scratch, &scratch2, scratch3);
}
}