Mercurial > mm7
comparison Party.cpp @ 321:15decc249a94
quick fix to spells commit (wasnt compiling)
author | Nomad |
---|---|
date | Wed, 20 Feb 2013 03:35:22 +0200 |
parents | 0ea5fbd16edb |
children | ce39b96acf5c |
comparison
equal
deleted
inserted
replaced
320:0b2af9c5f70f | 321:15decc249a94 |
---|---|
278 { | 278 { |
279 Party *pParty; // esi@1 | 279 Party *pParty; // esi@1 |
280 signed __int16 v3; // ax@1 | 280 signed __int16 v3; // ax@1 |
281 //int pResMagicBase; // ecx@1 | 281 //int pResMagicBase; // ecx@1 |
282 Player *pCharacter; // esi@3 | 282 Player *pCharacter; // esi@3 |
283 signed int uSpellBookPageCount; // edx@5 | 283 //signed int uSpellBookPageCount; // edx@5 |
284 int pMagicSkills; // eax@5 | 284 int pMagicSkills; // eax@5 |
285 int uSkillIdx; // eax@11 | 285 int uSkillIdx; // eax@11 |
286 //unsigned __int8 v9; // zf@37 | 286 //unsigned __int8 v9; // zf@37 |
287 //char v10; // sf@37 | 287 //char v10; // sf@37 |
288 //unsigned __int8 v11; // of@37 | 288 //unsigned __int8 v11; // of@37 |
375 for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++) | 375 for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++) |
376 { | 376 { |
377 pCharacter = &pParty->pPlayers[uNumPlayers]; | 377 pCharacter = &pParty->pPlayers[uNumPlayers]; |
378 if (pCharacter->classType == PLAYER_CLASS_KNIGHT) | 378 if (pCharacter->classType == PLAYER_CLASS_KNIGHT) |
379 pCharacter->sResMagicBase = v3; //player[i].pResMagicBase | 379 pCharacter->sResMagicBase = v3; //player[i].pResMagicBase |
380 uSpellBookPageCount = 0; | 380 //uSpellBookPageCount = 0; |
381 //pMagicSkills = pPlayers[uNumPlayers].pActiveSkills[12];// Skills | 381 //pMagicSkills = pPlayers[uNumPlayers].pActiveSkills[12];// Skills |
382 //while ( !*(short *)pMagicSkills ) //player[i].skillFire | 382 //while ( !*(short *)pMagicSkills ) //player[i].skillFire |
383 pCharacter->lastOpenedSpellbookPage = 0; | |
383 for (int i = 0; i < 9; i++)//for Magic Book | 384 for (int i = 0; i < 9; i++)//for Magic Book |
384 { | 385 { |
385 //++uSpellBookPageCount; | 386 //++uSpellBookPageCount; |
386 //pMagicSkills++; | 387 //pMagicSkills++; |
387 //if ( uSpellBookPageCount >= 9 ) | 388 //if ( uSpellBookPageCount >= 9 ) |
388 //goto LABEL_10; | 389 //goto LABEL_10; |
389 if (pPlayers[uNumPlayers].pActiveSkills[12+i]) | 390 if (pPlayers[uNumPlayers].pActiveSkills[12+i]) |
390 ++uSpellBookPageCount; | 391 { |
391 } | 392 pCharacter->lastOpenedSpellbookPage = i; |
392 pCharacter->lastOpenedSpellbookPage = uSpellBookPageCount; | 393 break; |
394 } | |
395 } | |
393 //LABEL_10: | 396 //LABEL_10: |
394 pCharacter->uExpressionTimePassed = 0; | 397 pCharacter->uExpressionTimePassed = 0; |
395 Dst.Reset(); | 398 Dst.Reset(); |
396 if ( bGiveItems ) | 399 if ( bGiveItems ) |
397 { | 400 { |