Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
1990:84fa3c83d63f 1991:012fcb1f223a
374 if (pNPC->uProfession) 374 if (pNPC->uProfession)
375 { 375 {
376 assert(pNPC->uProfession < sizeof(aNPCProfessionNames) / sizeof(*aNPCProfessionNames.data())); // sometimes buffer overflows; errors emerge both here and in dialogue text 376 assert(pNPC->uProfession < sizeof(aNPCProfessionNames) / sizeof(*aNPCProfessionNames.data())); // sometimes buffer overflows; errors emerge both here and in dialogue text
377 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s 377 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s
378 } 378 }
379 else 379 else if (pNPC->pName)
380 strcpy(pTmpBuf.data(), pNPC->pName); 380 strcpy(pTmpBuf.data(), pNPC->pName);
381 381
382 window.DrawTitleText(pFontArrus, 483, 112, ui_game_dialogue_npc_name_color, pTmpBuf.data(), 3); 382 window.DrawTitleText(pFontArrus, 483, 112, ui_game_dialogue_npc_name_color, pTmpBuf.data(), 3);
383 pParty->GetPartyFame(); 383 pParty->GetPartyFame();
384 384