Mercurial > mm7

comparison Engine/Party.cpp @ 2566:30eb6dcac768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big spell fx overhaul
author a.parshin
date Wed, 20 May 2015 21:05:07 +0200
parents 117c219bf913
children dd36326a9994
comparison
equal deleted inserted replaced
2565:117c219bf913 2566:30eb6dcac768
346 this->pPlayers[3].uVoiceID = 10; 346 this->pPlayers[3].uVoiceID = 10;
347 this->pPlayers[3].uMight = 5; 347 this->pPlayers[3].uMight = 5;
348 this->pPlayers[3].uIntelligence = 30; 348 this->pPlayers[3].uIntelligence = 30;
349 this->pPlayers[3].uWillpower = 9; 349 this->pPlayers[3].uWillpower = 9;
350 this->pPlayers[3].uLuck = 7; 350 this->pPlayers[3].uLuck = 7;
351 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather 351 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_LEATHER] = 1;
352 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_AIR] = 1; // air 352 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_AIR] = 1;
353 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_FIRE] = 1; // fire 353 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_FIRE] = 1;
354 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_STAFF] = 1; // staff 354 this->pPlayers[3].pActiveSkills[PLAYER_SKILL_STAFF] = 1;
355 355
356 for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++) 356 for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++)
357 { 357 {
358 pCharacter = &pParty->pPlayers[uNumPlayers]; 358 pCharacter = &pParty->pPlayers[uNumPlayers];
359 359
1061 } 1061 }
1062 if ( v12 == 4 ) 1062 if ( v12 == 4 )
1063 { 1063 {
1064 v5 = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; 1064 v5 = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID;
1065 v6 = 0; 1065 v6 = 0;
1066 a1.uType = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; 1066 a1.uType = (SPRITE_OBJECT_TYPE)pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID;
1067 for ( uint i = 0; i < pObjectList->uNumObjects; i++ ) 1067 for ( uint i = 0; i < pObjectList->uNumObjects; i++ )
1068 { 1068 {
1069 if ( v5 == pObjectList->pObjects[i].uObjectID ) 1069 if ( v5 == pObjectList->pObjects[i].uObjectID )
1070 { 1070 {
1071 v6 = i; 1071 v6 = i;
1084 pParty->vPosition.x, 1084 pParty->vPosition.x,
1085 pParty->vPosition.y, 1085 pParty->vPosition.y,
1086 pParty->sEyelevel + pParty->vPosition.z); 1086 pParty->sEyelevel + pParty->vPosition.z);
1087 a1.uSpriteFrameID = 0; 1087 a1.uSpriteFrameID = 0;
1088 a1.uSectorID = v8; 1088 a1.uSectorID = v8;
1089 memcpy(&a1.stru_24, &pParty->pPickedItem, sizeof(a1.stru_24)); 1089 memcpy(&a1.containing_item, &pParty->pPickedItem, sizeof(a1.containing_item));
1090 a1.Create(pParty->sRotationY, 184, 200, 0); 1090 a1.Create(pParty->sRotationY, 184, 200, 0);
1091 pMouse->RemoveHoldingItem(); 1091 pMouse->RemoveHoldingItem();
1092 } 1092 }
1093 } 1093 }
1094 if ( !v11 ) 1094 if ( !v11 )