zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed some redundant parts in level.cpp

Browse source 
Let's use the underlying data directly.
This commit is contained in:
Christoph Oelckers 2020-08-03 19:11:48 +02:00
parent 5704c57fe0
commit 825b286424
5 changed files with 5 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/blood/src/levels.cpp
View file

@ -109,52 +109,6 @@ void CheckKeyAbend(const char *pzSection, const char *pzKey)
ThrowError("Key %s expected in section [%s] of BLOOD.INI", pzKey, pzSection);
}
MapRecord * levelGetInfoPtr(int nEpisode, int nLevel)
{
dassert(nEpisode >= 0 && nEpisode < gEpisodeCount);
EPISODEINFO *pEpisodeInfo = &gEpisodeInfo[nEpisode];
dassert(nLevel >= 0 && nLevel < pEpisodeInfo->nLevels);
return &pEpisodeInfo->levels[nLevel];
}
const char * levelGetFilename(int nEpisode, int nLevel)
{
dassert(nEpisode >= 0 && nEpisode < gEpisodeCount);
EPISODEINFO *pEpisodeInfo = &gEpisodeInfo[nEpisode];
dassert(nLevel >= 0 && nLevel < pEpisodeInfo->nLevels);
return pEpisodeInfo->levels[nLevel].labelName;
}
const char * levelGetMessage(int nMessage)
{
int nEpisode = gGameOptions.nEpisode;
int nLevel = gGameOptions.nLevel;
dassert(nMessage < kMaxMessages);
const char *pMessage = gEpisodeInfo[nEpisode].levels[nLevel].GetMessage(nMessage);
if (*pMessage == 0)
return NULL;
return pMessage;
}
const char * levelGetTitle(void)
{
int nEpisode = gGameOptions.nEpisode;
int nLevel = gGameOptions.nLevel;
const char *pTitle = gEpisodeInfo[nEpisode].levels[nLevel].DisplayName();
if (*pTitle == 0)
return NULL;
return pTitle;
}
const char * levelGetAuthor(void)
{
int nEpisode = gGameOptions.nEpisode;
int nLevel = gGameOptions.nLevel;
const char *pAuthor = gEpisodeInfo[nEpisode].levels[nLevel].author;
if (*pAuthor == 0)
return NULL;
return pAuthor;
}
void levelSetupOptions(int nEpisode, int nLevel)
{
@ -244,6 +198,7 @@ void levelLoadDefaults(void)
void levelAddUserMap(const char *pzMap)
{
// FIXME: Make this work with the reworked map system
char buffer[BMAX_PATH];
strncpy(buffer, pzMap, BMAX_PATH);
ChangeExtension(buffer, ".DEF");

5
source/blood/src/levels.h
View file

@ -104,11 +104,6 @@ void levelSetupSecret(int nCount);
void levelTriggerSecret(int nSecret);
void CheckSectionAbend(const char *pzSection);
void CheckKeyAbend(const char *pzSection, const char *pzKey);
MapRecord * levelGetInfoPtr(int nEpisode, int nLevel);
const char * levelGetFilename(int nEpisode, int nLevel);
const char * levelGetMessage(int nMessage);
const char * levelGetTitle(void);
const char * levelGetAuthor(void);
void levelSetupOptions(int nEpisode, int nLevel);
void levelLoadDefaults(void);
void levelAddUserMap(const char *pzMap);

4
source/blood/src/map2d.cpp
View file

@ -201,8 +201,8 @@ void CViewMap::sub_25C74(void)
twod->AddColorOnlyQuad(windowxy1.x, windowxy1.y, (windowxy2.x + 1) - windowxy1.x, (windowxy2.y + 1) - windowxy1.y, 0xff000000);
renderDrawMapView(x,y,nZoom>>2,angle);
sub_2541C(x,y,nZoom>>2,angle);
const char *pTitle = levelGetTitle();
const char *pFilename = levelGetFilename(gGameOptions.nEpisode, gGameOptions.nLevel);
const char *pTitle = currentLevel->DisplayName();
const char *pFilename = currentLevel->LabelName();
if (pTitle)
sprintf(pBuffer, "%s: %s", pFilename, pTitle);
else

2
source/blood/src/triggers.cpp
View file

@ -2182,7 +2182,7 @@ void trInit(void)
void trTextOver(int nId)
{
const char *pzMessage = levelGetMessage(nId);
const char *pzMessage = currentLevel->GetMessage(nId);
if (pzMessage)
viewSetMessage(pzMessage, VanillaMode() ? 0 : 8, MESSAGE_PRIORITY_INI); // 8: gold
}

2
source/blood/src/view.cpp
View file

@ -257,7 +257,7 @@ void viewDrawMapTitle(void)
if (alpha != 0)
{
viewDrawText(1, levelGetTitle(), 160, 50, -128, 0, 1, 1, 0, alpha);
viewDrawText(1, currentLevel->DisplayName(), 160, 50, -128, 0, 1, 1, 0, alpha);
}
}