Mercurial > mm7

comparison mm7_2.cpp @ 756:3523c3b581e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Mar 2013 00:18:02 +0200
parents e13ce1b0930d
children 0b3f4b854652
comparison
equal deleted inserted replaced
755:e0914a9bc424 756:3523c3b581e5
5059 v44 = "%s C"; 5059 v44 = "%s C";
5060 } 5060 }
5061 } 5061 }
5062 sprintf(Str2, v44, pTexture); 5062 sprintf(Str2, v44, pTexture);
5063 } 5063 }
5064 v26 = pMonsterList->GetMonsterByName(Str2); 5064 v50 = pMonsterList->GetMonsterIDByName(Str2);
5065 v50 = (signed __int16)v26;
5066 pTexture = Str2; 5065 pTexture = Str2;
5067 if ( (signed __int16)v26 == -1 ) 5066 if ( (signed __int16)v50 == -1 )
5068 { 5067 {
5069 sprintf(Str, "Can't create random monster: '%s'! See MapStats.txt and Monsters.txt!", pTexture); 5068 sprintf(Str, "Can't create random monster: '%s'! See MapStats.txt and Monsters.txt!", pTexture);
5070 MessageBoxA(nullptr, Str, nullptr, 0); 5069 MessageBoxA(nullptr, Str, nullptr, 0);
5071 ExitProcess(0); 5070 ExitProcess(0);
5072 } 5071 }
5073 v27 = &pMonsterList->pMonsters[(signed __int16)v26]; 5072 v27 = &pMonsterList->pMonsters[(signed __int16)v50];
5074 v28 = pMonsterStats->FindMonsterByName(pTexture); 5073 v28 = pMonsterStats->FindMonsterByTextureName(pTexture);
5075 if ( !v28 ) 5074 if ( !v28 )
5076 v28 = 1; 5075 v28 = 1;
5077 Src = &pMonsterStats->pInfos[v28]; 5076 Src = &pMonsterStats->pInfos[v28];
5078 strcpy(pMonster->pActorName, Src->pName); 5077 strcpy(pMonster->pActorName, Src->pName);
5079 pMonster->sCurrentHP = Src->uHP; 5078 pMonster->sCurrentHP = Src->uHP;
5174 if ( a2 == 3 ) 5173 if ( a2 == 3 )
5175 v15 = "Elemental Light B"; 5174 v15 = "Elemental Light B";
5176 else 5175 else
5177 v15 = "Elemental Light A"; 5176 v15 = "Elemental Light A";
5178 } 5177 }
5179 v23 = (signed __int16)pMonsterList->GetMonsterByName(v15); 5178 v23 = pMonsterList->GetMonsterIDByName(v15);
5180 v3 = 0; 5179 v3 = 0;
5181 v20 = uNumActors; 5180 v20 = uNumActors;
5182 if ( (signed int)uNumActors > 0 ) 5181 if ( (signed int)uNumActors > 0 )
5183 { 5182 {
5184 v4 = pActors;//[0].uAIState; 5183 v4 = pActors;//[0].uAIState;