Mercurial > mm7
diff Engine/Party.cpp @ 2569:d433439699be
Слияние
author | Ritor1 |
---|---|
date | Thu, 21 May 2015 18:33:07 +0600 |
parents | 30eb6dcac768 |
children | dd36326a9994 |
line wrap: on
line diff
--- a/Engine/Party.cpp Thu May 21 18:32:45 2015 +0600 +++ b/Engine/Party.cpp Thu May 21 18:33:07 2015 +0600 @@ -348,10 +348,10 @@ this->pPlayers[3].uIntelligence = 30; this->pPlayers[3].uWillpower = 9; this->pPlayers[3].uLuck = 7; - this->pPlayers[3].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; // leather - this->pPlayers[3].pActiveSkills[PLAYER_SKILL_AIR] = 1; // air - this->pPlayers[3].pActiveSkills[PLAYER_SKILL_FIRE] = 1; // fire - this->pPlayers[3].pActiveSkills[PLAYER_SKILL_STAFF] = 1; // staff + this->pPlayers[3].pActiveSkills[PLAYER_SKILL_LEATHER] = 1; + this->pPlayers[3].pActiveSkills[PLAYER_SKILL_AIR] = 1; + this->pPlayers[3].pActiveSkills[PLAYER_SKILL_FIRE] = 1; + this->pPlayers[3].pActiveSkills[PLAYER_SKILL_STAFF] = 1; for (uNumPlayers = 0; uNumPlayers < 4; uNumPlayers++) { @@ -1063,7 +1063,7 @@ { v5 = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; v6 = 0; - a1.uType = pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; + a1.uType = (SPRITE_OBJECT_TYPE)pItemsTable->pItems[pParty->pPickedItem.uItemID].uSpriteID; for ( uint i = 0; i < pObjectList->uNumObjects; i++ ) { if ( v5 == pObjectList->pObjects[i].uObjectID ) @@ -1086,7 +1086,7 @@ pParty->sEyelevel + pParty->vPosition.z); a1.uSpriteFrameID = 0; a1.uSectorID = v8; - memcpy(&a1.stru_24, &pParty->pPickedItem, sizeof(a1.stru_24)); + memcpy(&a1.containing_item, &pParty->pPickedItem, sizeof(a1.containing_item)); a1.Create(pParty->sRotationY, 184, 200, 0); pMouse->RemoveHoldingItem(); }