Mercurial > mm7
comparison mm7_3.cpp @ 266:006188b68143
Merge
author | Nomad |
---|---|
date | Mon, 18 Feb 2013 10:06:38 +0200 |
parents | 96bc024a5fed 8cf4fe6b4941 |
children | ac44e716d051 |
comparison
equal
deleted
inserted
replaced
265:96bc024a5fed | 266:006188b68143 |
---|---|
15030 || a1 == 52 ) | 15030 || a1 == 52 ) |
15031 return (const char *)*(&pNPCStats->field_13A60 + 5 * a1); | 15031 return (const char *)*(&pNPCStats->field_13A60 + 5 * a1); |
15032 else | 15032 else |
15033 return pNPCTopics[407].pTopic; | 15033 return pNPCTopics[407].pTopic; |
15034 } | 15034 } |
15035 | |
15036 | 15035 |
15037 //----- (00445350) -------------------------------------------------------- | 15036 //----- (00445350) -------------------------------------------------------- |
15038 void __cdecl DrawDialogueUI() | 15037 void __cdecl DrawDialogueUI() |
15039 { | 15038 { |
15040 NPCData *pNPC; // ebx@2 | 15039 NPCData *pNPC; // ebx@2 |