Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
295:640a176c030f 296:af7e848d6def
11274 pGameLoadingUI_ProgressBar->Progress(); 11274 pGameLoadingUI_ProgressBar->Progress();
11275 pParty->uFlags |= 2u; 11275 pParty->uFlags |= 2u;
11276 pParty->field_7B5_in_arena_quest = 0; 11276 pParty->field_7B5_in_arena_quest = 0;
11277 //v1 = 0; 11277 //v1 = 0;
11278 dword_5C6DF8 = 1; 11278 dword_5C6DF8 = 1;
11279 pNPCStats->field_17FC0 = 0; 11279 pNPCStats->uNewlNPCBufPos = 0;
11280 v19 = pMapStats->GetMapInfo(pCurrentMapName); 11280 v19 = pMapStats->GetMapInfo(pCurrentMapName);
11281 11281
11282 //v15 = 0; 11282 //v15 = 0;
11283 for (uint i = 0; i < uNumActors; ++i) 11283 for (uint i = 0; i < uNumActors; ++i)
11284 //if ( (signed int)uNumActors > 0 ) 11284 //if ( (signed int)uNumActors > 0 )
11309 } 11309 }
11310 if ( pActor->uNPC_ID > 0 && pActor->uNPC_ID < 5000 ) 11310 if ( pActor->uNPC_ID > 0 && pActor->uNPC_ID < 5000 )
11311 continue; 11311 continue;
11312 if ( v17 ) 11312 if ( v17 )
11313 { 11313 {
11314 pNPCStats->InitializeAdditionalNPCs(&pNPCStats->array_13EF4[pNPCStats->field_17FC0], v3, 0, v19); 11314 pNPCStats->InitializeAdditionalNPCs(&pNPCStats->pAdditionalNPC[pNPCStats->uNewlNPCBufPos], v3, 0, v19);
11315 v14 = LOWORD(pNPCStats->field_17FC0) + 5000; 11315 v14 = LOWORD(pNPCStats->uNewlNPCBufPos) + 5000;
11316 ++pNPCStats->field_17FC0; 11316 ++pNPCStats->uNewlNPCBufPos;
11317 pActor->uNPC_ID = v14; 11317 pActor->uNPC_ID = v14;
11318 continue; 11318 continue;
11319 } 11319 }
11320 LABEL_12: 11320 LABEL_12:
11321 pActor->uNPC_ID = 0; 11321 pActor->uNPC_ID = 0;
12870 { 12870 {
12871 wchar_t pCurrentDir[1024]; 12871 wchar_t pCurrentDir[1024];
12872 _wgetcwd(pCurrentDir, 1024); 12872 _wgetcwd(pCurrentDir, 1024);
12873 12873
12874 wchar_t pMM6IniFile[1024]; 12874 wchar_t pMM6IniFile[1024];
12875 wsprintf(pMM6IniFile, L"%s\\mm6.ini", pCurrentDir); 12875 wsprintfW(pMM6IniFile, L"%s\\mm6.ini", pCurrentDir);
12876 12876
12877 bCanLoadFromCD = GetPrivateProfileIntW(L"settings", L"use_cd", 1, pMM6IniFile); 12877 bCanLoadFromCD = GetPrivateProfileIntW(L"settings", L"use_cd", 1, pMM6IniFile);
12878 if (bNoCD) 12878 if (bNoCD)
12879 bCanLoadFromCD = false; 12879 bCanLoadFromCD = false;
12880 if (bCanLoadFromCD) 12880 if (bCanLoadFromCD)