Mercurial > mm7

diff UI/UiGame.cpp @ 1991:012fcb1f223a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sun, 03 Nov 2013 01:20:06 -0800
parents 5cd26f2c6904
children 985fff9fb62d
line wrap: on
line diff
--- a/UI/UiGame.cpp	Sun Nov 03 01:19:07 2013 -0800
+++ b/UI/UiGame.cpp	Sun Nov 03 01:20:06 2013 -0800
@@ -376,7 +376,7 @@
     assert(pNPC->uProfession < sizeof(aNPCProfessionNames) / sizeof(*aNPCProfessionNames.data())); // sometimes buffer overflows; errors emerge both here and in dialogue text
     sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s
   }
-  else
+  else if (pNPC->pName)
     strcpy(pTmpBuf.data(), pNPC->pName);
 
   window.DrawTitleText(pFontArrus, 483, 112, ui_game_dialogue_npc_name_color, pTmpBuf.data(), 3);