diff CastSpellInfo.cpp @ 1441:b67a3e0d6fc3

Слияние
author Ritor1
date Sat, 27 Jul 2013 09:36:55 +0600
parents c9e3b93ec570
children e11c498c0dc6
line wrap: on
line diff
--- a/CastSpellInfo.cpp	Sat Jul 27 09:36:29 2013 +0600
+++ b/CastSpellInfo.cpp	Sat Jul 27 09:36:55 2013 +0600
@@ -166,8 +166,8 @@
   int v440; // eax@843
   int v441; // eax@847
   signed int v445; // edi@857
-  int v446; // ecx@862
-  LevelDecoration *v447; // edi@864
+  //int v446; // ecx@862
+  //LevelDecoration *v447; // edi@864
   __int16 v448; // ax@864
   char *v449; // esi@870
   int v450; // eax@870
@@ -255,7 +255,7 @@
   int v671; // [sp+4h] [bp-E80h]@146
   int v675; // [sp+4h] [bp-E80h]@800
   int v676; // [sp+4h] [bp-E80h]@807
-  int v677; // [sp+4h] [bp-E80h]@861
+  //int v677; // [sp+4h] [bp-E80h]@861
   int v679[800]; // [sp+14h] [bp-E70h]@515
   AIDirection a3; // [sp+C94h] [bp-1F0h]@21
   int v681[4]; // [sp+CB0h] [bp-1D4h]@1137
@@ -1955,6 +1955,8 @@
 				{
 					v730 = 0;
 				}
+
+                __debugbreak(); // castspellinfo.cpp(1962): warning C4700: uninitialized local variable 'v271' used
 				if ( rand() % 100 < 10 * v2 || 
 					(rand() % 100 < 80 && (v731 == 3 || v731 == 4 )) ||
 					v245->GetValue() < 450 || 
@@ -1966,6 +1968,7 @@
 					{
 						v295 = rand() % 10;// pItemsTable->field_116D8[pItemsTable->pItems[_this->uItemID].uEquipType];
 						v245->uEnchantmentType = 0;
+                        __debugbreak(); // castspellinfo.cpp(1971): warning C4700: uninitialized local variable 'v294' used
 						for ( kk = pItemsTable->pEnchantments[0].to_item[pItemsTable->pItems[v245->uItemID].uEquipType + 1];
 							;
 							kk += pItemsTable->pEnchantments[v294->uEnchantmentType].to_item[pItemsTable->pItems[v245->uItemID].uEquipType + 1] )
@@ -2971,31 +2974,26 @@
 							LODWORD(v727) = 1;
 							break;
 						}
-						dword_507CD8 = 1;
-						v677 = 1;
+						OpenedTelekinesis = true;
 						if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
-							v446 = pIndoor->pFaceExtras[pIndoor->pFaces[v445].uFaceExtraID].uEventID;
+							v448 = pIndoor->pFaceExtras[pIndoor->pFaces[v445].uFaceExtraID].uEventID;
 						else
-							v446 = pOutdoor->pBModels[a2 >> 9].pFaces[v445 & 0x3F].sCogTriggeredID;
-						EventProcessor(v446, a2, v677);
+							v448 = pOutdoor->pBModels[a2 >> 9].pFaces[v445 & 0x3F].sCogTriggeredID;
+						EventProcessor(v448, a2, 1);
 						LODWORD(v727) = 1;
 						break;
 					}
-					v447 = &pLevelDecorations[v445];
-					dword_507CD8 = 1;
-					v448 = v447->field_16_event_id;
-					if (v448)
+					OpenedTelekinesis = true;
+					if ( pLevelDecorations[v445].field_16_event_id )
 					{
-						v677 = 1;
-						v446 = v448;
-						EventProcessor(v446, a2, v677);
+						EventProcessor(v448, a2, 1);
 						LODWORD(v727) = 1;
 						break;
 					}
-					if ( v447->IsInteractive() )
+					if ( pLevelDecorations[v445].IsInteractive() )
 					{
-						activeLevelDecoration = v447;
-						EventProcessor(stru_5E4C90._decor_events[v447->_idx_in_stru123 - 75] + 380, 0, 1);
+						activeLevelDecoration = &pLevelDecorations[v445];
+						EventProcessor(stru_5E4C90._decor_events[pLevelDecorations[v445]._idx_in_stru123 - 75] + 380, 0, 1);
 						activeLevelDecoration = NULL;
 					}
 				}