Mercurial > mm7

diff CastSpellInfo.cpp @ 1463:b330df6a2183

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 11 Aug 2013 12:09:33 +0600
parents bfe342ae0c1f
children 2ca62c9e7b3c
line wrap: on
line diff
--- a/CastSpellInfo.cpp	Sun Aug 11 12:09:09 2013 +0600
+++ b/CastSpellInfo.cpp	Sun Aug 11 12:09:33 2013 +0600
@@ -430,7 +430,7 @@
         //v649 = pPlayer;
         pParty->pTurnBasedPlayerRecoveryTimes[this[n].uPlayerID] = 100;
         pPlayer->SetRecoveryTime(sRecoveryTime);
-        pTurnEngine->_40471C();
+        pTurnEngine->ApplyPlayerAction();
       }
       ShowStatusBarString(pGlobalTXT_LocalizationStrings[428], 2u); // "Spell failed"
       pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0);
@@ -478,7 +478,7 @@
 				pSpellSprite.uSectorID = pIndoor->GetSector(pSpellSprite.vPosition.x, pSpellSprite.vPosition.y, pSpellSprite.vPosition.z);
 				if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed,
 					pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			}
 			break;
 		}
@@ -511,7 +511,7 @@
 				LOBYTE(pSpellSprite.uAttributes) |= 4u;
 			if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed,
 					pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			break;
 		}
 		case SPELL_FIRE_TORCH_LIGHT:
@@ -594,7 +594,7 @@
 				LOBYTE(pSpellSprite.uAttributes) |= 4u;
 			v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 			if ( pSpellSprite.Create(pParty->sRotationY, pParty->sRotationX + 10, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -751,7 +751,7 @@
 				LOBYTE(pSpellSprite.uAttributes) |= 0x40u;
 			v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 			if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -786,7 +786,7 @@
 				LOBYTE(pSpellSprite.uAttributes) |= 4u;
 			v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 			if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -826,7 +826,7 @@
 					LOBYTE(pSpellSprite.uAttributes) |= 4u;
 				v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 				if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-					++pTurnEngine->field_1C;
+					++pTurnEngine->pending_actions;
 				LODWORD(v727) = 1;
 			}
 			break;
@@ -973,7 +973,7 @@
 				v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 
 				if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -1393,7 +1393,7 @@
 						pSpellSprite.uAttributes = 4;
 					if ( pSpellSprite.Create(v687, SHIDWORD(v687), pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed, 0) != -1
 						&& pParty->bTurnBasedModeOn == 1 )
-						++pTurnEngine->field_1C;
+						++pTurnEngine->pending_actions;
 					j = rand() % 1024 - 512;
 					k = rand() % 1024 - 512;
 				}
@@ -1540,7 +1540,7 @@
 						pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed,
 						pCastSpell->uPlayerID + 1) != -1
 						&& pParty->bTurnBasedModeOn == 1 )
-				    ++pTurnEngine->field_1C;
+				    ++pTurnEngine->pending_actions;
 				v188 += _v726 / (amount - 1);
 			}
 			LODWORD(v727) = 1;
@@ -1710,7 +1710,7 @@
 				pSpellSprite.uAttributes = 4;
 				if ( pSpellSprite.Create(v685, SHIDWORD(v685), pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed, 0) != -1
 					   && pParty->bTurnBasedModeOn == 1 )
-				  ++pTurnEngine->field_1C;
+				  ++pTurnEngine->pending_actions;
 				v721 = rand() % 1024 - 512;
 				v218 = rand();
 				v14 = a2-- == 1;
@@ -1799,7 +1799,7 @@
 					LOBYTE(pSpellSprite.uAttributes) |= 4u;
 				v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 				if ( pSpellSprite.Create(v715.uYawAngle, v715.uPitchAngle, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-					++pTurnEngine->field_1C;
+					++pTurnEngine->pending_actions;
 			}
 			else
 			{
@@ -1834,7 +1834,7 @@
 								pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed,
 								pCastSpell->uPlayerID + 1) != -1
 								&& pParty->bTurnBasedModeOn == 1 )
-							++pTurnEngine->field_1C;
+							++pTurnEngine->pending_actions;
 						v227 += _v733 / (amount - 1);
 					}
 					while ( v227 <= _y );
@@ -2209,7 +2209,7 @@
 
 			v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 			if ( pSpellSprite.Create(pParty->sRotationY, pParty->sRotationX, v659, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -2246,7 +2246,7 @@
 
 			v659 = pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed;
 			if ( pSpellSprite.Create(pParty->sRotationY, stru_5C6E00->uIntegerHalfPi / 2, v659, 0) != -1 && pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			LODWORD(v727) = 1;
 			break;
 		}
@@ -3718,7 +3718,7 @@
 							pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed,
 							pCastSpell->uPlayerID + 1) != -1
 							&& pParty->bTurnBasedModeOn == 1 )
-						++pTurnEngine->field_1C;
+						++pTurnEngine->pending_actions;
 					v596 += _v726 / (amount - 1);
 				}
 				while ( v596 <= (signed int)y );
@@ -4010,7 +4010,7 @@
 			pParty->field_16140 = v2;
 			++pPlayer->uNumArmageddonCasts;
 			if ( pParty->bTurnBasedModeOn == 1 )
-				++pTurnEngine->field_1C;
+				++pTurnEngine->pending_actions;
 			auto _v726 = 50;
 			do
 			{
@@ -4046,7 +4046,7 @@
 			pParty->pTurnBasedPlayerRecoveryTimes[pCastSpell->uPlayerID] = sRecoveryTime;
 			pPlayer->SetRecoveryTime(v645);
 			if ( !some_active_character )
-				pTurnEngine->_40471C();
+				pTurnEngine->ApplyPlayerAction();
 		}
 		else
 		{
@@ -4386,7 +4386,7 @@
         ++pIcons_LOD->uTexturePacksCount;
         if ( !pIcons_LOD->uNumPrevLoadedFiles )
           pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-        pGUIWindow_Settings = pCastSpellInfo[result].sub_4219BE();
+        pGUIWindow_Settings = pCastSpellInfo[result].GetCastSpellInInventoryWindow();
         unk_50C9A0 = 1;
         some_active_character = uActiveCharacter;
         sub_421B2C_PlaceInInventory_or_DropPickedItem();