OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- the final batch of easy level replacements.

Browse source 
What's left will require a bit more work...
This commit is contained in:
Christoph Oelckers 2019-01-27 21:59:19 +01:00
commit b4acb857ad
30 changed files with 226 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/c_cmds.cpp
View file

@ -1099,9 +1099,9 @@ CCMD(nextmap)
return;
}
if (level.NextMap.Len() > 0 && level.NextMap.Compare("enDSeQ", 6))
if (currentUILevel->NextMap.Len() > 0 && currentUILevel->NextMap.Compare("enDSeQ", 6))
{
G_DeferedInitNew(level.NextMap);
G_DeferedInitNew(currentUILevel->NextMap);
}
else
{
@ -1123,9 +1123,9 @@ CCMD(nextsecret)
return;
}
if (level.NextSecretMap.Len() > 0 && level.NextSecretMap.Compare("enDSeQ", 6))
if (currentUILevel->NextSecretMap.Len() > 0 && currentUILevel->NextSecretMap.Compare("enDSeQ", 6))
{
G_DeferedInitNew(level.NextSecretMap);
G_DeferedInitNew(currentUILevel->NextSecretMap);
}
else
{
@ -1170,10 +1170,10 @@ static void PrintSecretString(const char *string, bool thislevel)
{
auto secnum = (unsigned)strtoull(string+2, (char**)&string, 10);
if (*string == ';') string++;
if (thislevel && secnum < level.sectors.Size())
if (thislevel && secnum < currentUILevel->sectors.Size())
{
if (level.sectors[secnum].isSecret()) colstr = TEXTCOLOR_RED;
else if (level.sectors[secnum].wasSecret()) colstr = TEXTCOLOR_GREEN;
if (currentUILevel->sectors[secnum].isSecret()) colstr = TEXTCOLOR_RED;
else if (currentUILevel->sectors[secnum].wasSecret()) colstr = TEXTCOLOR_GREEN;
else colstr = TEXTCOLOR_ORANGE;
}
}
@ -1181,7 +1181,7 @@ static void PrintSecretString(const char *string, bool thislevel)
{
long tid = (long)strtoll(string+2, (char**)&string, 10);
if (*string == ';') string++;
auto it = level.GetActorIterator(tid);
auto it = currentUILevel->GetActorIterator(tid);
AActor *actor;
bool foundone = false;
if (thislevel)
@ -1214,8 +1214,8 @@ static void PrintSecretString(const char *string, bool thislevel)
CCMD(secret)
{
const char *mapname = argv.argc() < 2? level.MapName.GetChars() : argv[1];
bool thislevel = !stricmp(mapname, level.MapName);
const char *mapname = argv.argc() < 2? currentUILevel->MapName.GetChars() : argv[1];
bool thislevel = !stricmp(mapname, currentUILevel->MapName);
bool foundsome = false;
int lumpno=Wads.CheckNumForName("SECRETS");