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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Edward Richardson 2014-03-03 00:25:04 +13:00
parent 8c6b4c12b6 8924ecbef9
commit 6d89fdbd53
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_level.cpp
View File

@ -387,7 +387,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
StatusBar->NewGame ();
setsizeneeded = true;
if (gameinfo.gametype == GAME_Strife || (SBarInfoScript != NULL && SBarInfoScript[SCRIPT_CUSTOM]->GetGameType() == GAME_Strife))
if (gameinfo.gametype == GAME_Strife || (SBarInfoScript[SCRIPT_CUSTOM] != NULL && SBarInfoScript[SCRIPT_CUSTOM]->GetGameType() == GAME_Strife))
{
// Set the initial quest log text for Strife.
for (i = 0; i < MAXPLAYERS; ++i)

22
src/v_font.cpp
View File

@ -2009,26 +2009,20 @@ void FSpecialFont::LoadTranslations()
}
// exclude the non-translated colors from the translation calculation
if (notranslate != NULL)
{
for (i = 0; i < 256; i++)
if (notranslate[i])
usedcolors[i] = false;
}
for (i = 0; i < 256; i++)
if (notranslate[i])
usedcolors[i] = false;
TotalColors = ActiveColors = SimpleTranslation (usedcolors, PatchRemap, identity, &luminosity);
// Map all untranslated colors into the table of used colors
if (notranslate != NULL)
for (i = 0; i < 256; i++)
{
for (i = 0; i < 256; i++)
if (notranslate[i])
{
if (notranslate[i])
{
PatchRemap[i] = TotalColors;
identity[TotalColors] = i;
TotalColors++;
}
PatchRemap[i] = TotalColors;
identity[TotalColors] = i;
TotalColors++;
}
}