zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- merged FixMapInfo into loadcons. 

No need to delay the remaining content. The reasons for the separate function no longer exist.
This commit is contained in:
Christoph Oelckers 2021-05-02 19:41:24 +02:00
parent 60d007fa93
commit 698d62bbc6
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,6 @@ void PlayerColorChanged(void);
bool movementBlocked(player_struct *p); bool movementBlocked(player_struct *p);
void loadcons(); void loadcons();
void recordoldspritepos(); void recordoldspritepos();
void FixMapinfo();
int* animateptr(int i); int* animateptr(int i);

1
source/games/duke/src/game.cpp
View File

@ -325,7 +325,6 @@ void GameInterface::app_init()
screenpeek = myconnectindex; screenpeek = myconnectindex;
LoadDefinitions(); LoadDefinitions();
FixMapinfo(); // Add some corrections. Can only be done after .def has been parsed.
fi.InitFonts(); fi.InitFonts();
SetTileNames(); SetTileNames();
TileFiles.SetBackup(); TileFiles.SetBackup();

7
source/games/duke/src/gamedef.cpp
View File

@ -3230,14 +3230,11 @@ void loadcons()
S_WorldTourMappingsForOldSounds(); // create a sound mapping for World Tour. S_WorldTourMappingsForOldSounds(); // create a sound mapping for World Tour.
S_CacheAllSounds(); S_CacheAllSounds();
comp.setmusic(); comp.setmusic();
}
void FixMapinfo()
{
// RR must link the last map of E1 to the first map of E2. // RR must link the last map of E1 to the first map of E2.
for (auto& map : mapList) if (isRR()) for (auto& map : mapList)
{ {
if (isRR() && map->cluster == 1) if (map->cluster == 1)
{ {
if (!FindMapByIndexOnly(map->cluster, map->mapindex + 1)) if (!FindMapByIndexOnly(map->cluster, map->mapindex + 1))
{ {