Mercurial > mm7

diff mm7_2.cpp @ 296:af7e848d6def

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 19 Feb 2013 13:31:50 +0200
parents 640a176c030f 27670273a6ff
children 3dcc9d945eeb
line wrap: on
line diff
--- a/mm7_2.cpp	Tue Feb 19 13:29:02 2013 +0200
+++ b/mm7_2.cpp	Tue Feb 19 13:31:50 2013 +0200
@@ -11276,7 +11276,7 @@
   pParty->field_7B5_in_arena_quest = 0;
   //v1 = 0;
   dword_5C6DF8 = 1;
-  pNPCStats->field_17FC0 = 0;
+  pNPCStats->uNewlNPCBufPos = 0;
   v19 = pMapStats->GetMapInfo(pCurrentMapName);
 
   //v15 = 0;
@@ -11311,9 +11311,9 @@
         continue;
       if ( v17 )
       {
-        pNPCStats->InitializeAdditionalNPCs(&pNPCStats->array_13EF4[pNPCStats->field_17FC0], v3, 0, v19);
-        v14 = LOWORD(pNPCStats->field_17FC0) + 5000;
-        ++pNPCStats->field_17FC0;
+        pNPCStats->InitializeAdditionalNPCs(&pNPCStats->pAdditionalNPC[pNPCStats->uNewlNPCBufPos], v3, 0, v19);
+        v14 = LOWORD(pNPCStats->uNewlNPCBufPos) + 5000;
+        ++pNPCStats->uNewlNPCBufPos;
         pActor->uNPC_ID = v14;
         continue;
       }
@@ -12872,7 +12872,7 @@
   _wgetcwd(pCurrentDir, 1024);
 
   wchar_t pMM6IniFile[1024];
-  wsprintf(pMM6IniFile, L"%s\\mm6.ini", pCurrentDir);
+  wsprintfW(pMM6IniFile, L"%s\\mm6.ini", pCurrentDir);
 
   bCanLoadFromCD = GetPrivateProfileIntW(L"settings", L"use_cd", 1, pMM6IniFile);
   if (bNoCD)