mirror of
https://github.com/ZDoom/Raze.git
synced 2025-05-30 17:01:03 +00:00
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.)
- removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
This commit is contained in:
parent
4b743b4063
commit
e146e73345
14 changed files with 207 additions and 629 deletions
|
@ -61,11 +61,48 @@ struct MapRecord
|
|||
|
||||
};
|
||||
|
||||
|
||||
extern MapRecord mapList[512];
|
||||
extern MapRecord userMapRecord;
|
||||
extern MapRecord *currentLevel;
|
||||
extern MapRecord* lastLevel;
|
||||
|
||||
inline bool SetMusicForMap(const char* mapname, const char* music, bool namehack = false)
|
||||
{
|
||||
static const char* specials[] = { "intro", "briefing", "loading" };
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
if (!stricmp(mapname, specials[i]))
|
||||
{
|
||||
// todo: store this properly.
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
int index = -1; // = FindMap(mapname);
|
||||
|
||||
// This is for the DEFS parser's MUSIC command which never bothered to check for the real map name.
|
||||
if (index < 0 && namehack)
|
||||
{
|
||||
int lev, ep;
|
||||
signed char b1, b2;
|
||||
|
||||
int numMatches = sscanf(mapname, "%c%d%c%d", &b1, &ep, &b2, &lev);
|
||||
|
||||
if (numMatches != 4 || toupper(b1) != 'E' || toupper(b2) != 'L')
|
||||
return false;
|
||||
|
||||
index = -1; // = FindMapByIndex(ep, lev);
|
||||
|
||||
}
|
||||
if (index >= 0)
|
||||
{
|
||||
mapList[index].music = music;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
inline void InitRREndMap()
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue