Mercurial > mm7

changeset 942:530e3d5ab48d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 01 May 2013 16:04:50 +0600
parents c44c9883b00f (current diff) ae747684f644 (diff)
children ffc32cabc5f5
files mm7_2.cpp stru272.h stru279.h
diffstat 23 files changed, 75 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/Arcomage.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/Arcomage.cpp	Wed May 01 16:04:50 2013 +0600
@@ -11,7 +11,6 @@
 #include "Party.h"
 #include "GUIWindow.h"
 #include "Events2D.h"
-#include "stru272.h"
 #include "VectorTypes.h"
 #include "texts.h"
 #include "mm7_data.h"
@@ -26,6 +25,8 @@
 
 
 
+stru272 array_4FAC10[10];
+
 
 
 /*  267 */
--- a/Arcomage.h	Wed May 01 16:04:37 2013 +0600
+++ b/Arcomage.h	Wed May 01 16:04:50 2013 +0600
@@ -130,4 +130,73 @@
 
 extern ArcomageGame *pArcomageGame;
 extern ArcomageCard pCards[87];
-extern ArcomageGame_stru0 stru_505708[2];
\ No newline at end of file
+extern ArcomageGame_stru0 stru_505708[2];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*  270 */
+#pragma pack(push, 1)
+struct stru272_stru0         // ARCOMAGE stuff
+{
+  int _40DFFE();
+  int _40E01A(int a2);
+  int _40E0F5(char a2, char a3);
+  int _40E133();
+  int _40E2A7();
+
+  int field_0;
+  int field_4;
+  int field_8;
+  int field_C;
+  int field_10;
+  int field_14;
+  int field_18;
+  int field_1C;
+  int field_20;
+  int field_24;
+  float field_28;
+  float field_2C;
+  float field_30;
+  int field_34;
+  int field_38;
+  int field_3C;
+  int field_40;
+  int field_44;
+  int field_48;
+  int field_4C;
+  int field_50;
+  int field_54;
+  char field_58;
+  char field_59;
+  char field_5A;
+  char field_5B;
+};
+#pragma pack(pop)
+
+
+/*  266 */
+#pragma pack(push, 1)
+struct stru272
+{
+  void _40DFD1();
+
+  struct stru272_stru0 *ptr_0;
+  char field_4[4264];
+};
+#pragma pack(pop)
+
+
+extern stru272 array_4FAC10[10];
\ No newline at end of file
--- a/Game.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/Game.cpp	Wed May 01 16:04:50 2013 +0600
@@ -9,7 +9,6 @@
 #include "Time.h"
 #include "Outdoor.h"
 #include "Overlays.h"
-#include "stru279.h"
 #include "AudioPlayer.h"
 #include "LOD.h"
 #include "OSInfo.h"
@@ -229,7 +228,7 @@
 
   GUI_UpdateWindows();
   pParty->UpdatePlayersAndHirelingsEmotions();
-  ++stru_51076C.field_8;
+
   _unused_5B5924_is_travel_ui_drawn = false;
   if (v4)
     pMouse->bRedraw = true;
@@ -767,7 +766,6 @@
     WriteWindowsRegistryInt("window X", Rect.left);
     WriteWindowsRegistryInt("window Y", Rect.top);
   }
-  WriteWindowsRegistryInt("debug flags", stru_51076C.registry_debug_flags);
   WriteWindowsRegistryInt("valAlwaysRun", bAlwaysRun);
   pItemsTable->Release();
   pNPCStats->Release();
--- a/Party.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/Party.cpp	Wed May 01 16:04:50 2013 +0600
@@ -8,7 +8,6 @@
 #include "Mouse.h"
 #include "PlayerFrameTable.h"
 #include "TurnEngine.h"
-#include "stru279.h"
 #include "Viewport.h"
 #include "Actor.h"
 #include "GUIWindow.h"
@@ -917,10 +916,6 @@
   //unsigned int v10; // edi@62
   //signed int v11; // [sp+0h] [bp-4h]@2
 
-  if (dword_A75070 == stru_51076C.field_8) // stru_51076C.field_8 is incremented each time after this function is called, so this is useless
-    return;
-
-  dword_A75070 = stru_51076C.field_8;
   //v1 = this->pPlayers;//(char *)&this->pPlayers[0].uExpressionID;
   for (int i = 0; i < 4; ++i)
   {
--- a/UIBooks.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIBooks.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UICharacter.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UICharacter.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UIMainMenu.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIMainMenu.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UIOptions.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIOptions.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UIPartyCreation.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIPartyCreation.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UIPopup.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIPopup.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UIRest.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UIRest.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UISaveLoad.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UISaveLoad.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,11 +33,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/UiGame.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/UiGame.cpp	Wed May 01 16:04:50 2013 +0600
@@ -34,11 +34,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/mm7_1.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_1.cpp	Wed May 01 16:04:50 2013 +0600
@@ -39,11 +39,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/mm7_2.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_2.cpp	Wed May 01 16:04:50 2013 +0600
@@ -38,7 +38,6 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "FactionTable.h"
 #include "StorylineTextTable.h"
@@ -9303,7 +9302,6 @@
     if (wcsstr(pCmdLine, L"-new_sky"))
       new_sky = true;
   }
-  stru_51076C.registry_debug_flags = ReadWindowsRegistryInt("debug flags", 0);
 
 
   /*v8 = _4AC1C9_get_cpu_speed(0, (Vec4_int_ *)a2);
--- a/mm7_3.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_3.cpp	Wed May 01 16:04:50 2013 +0600
@@ -33,7 +33,6 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "Weather.h"
 #include "stru220.h"
 #include "Events2D.h"
--- a/mm7_4.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_4.cpp	Wed May 01 16:04:50 2013 +0600
@@ -38,7 +38,6 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "FactionTable.h"
 #include "StorylineTextTable.h"
--- a/mm7_5.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_5.cpp	Wed May 01 16:04:50 2013 +0600
@@ -32,11 +32,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/mm7_6.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_6.cpp	Wed May 01 16:04:50 2013 +0600
@@ -31,11 +31,9 @@
 #include "Awards.h"
 #include "Autonotes.h"
 #include "stru160.h"
-#include "stru279.h"
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "texts.h"
 #include "StorylineTextTable.h"
--- a/mm7_data.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/mm7_data.cpp	Wed May 01 16:04:50 2013 +0600
@@ -42,13 +42,6 @@
 struct Viewport *pViewport = new Viewport;
 struct ViewingParams *viewparams = new ViewingParams;
 
-#include "stru272.h"
-stru272 array_4FAC10[10];
-
-
-#include "stru279.h"
-stru279 stru_51076C;
-
 
 int achievedAwardsIndex[1000];
 
@@ -2010,7 +2003,6 @@
 struct Texture *pTexture_PlayerFaceEradicated;
 struct Texture *pTexture_PlayerFaceDead;
 struct Texture *pTextures_PlayerFaces[4][56];
-int dword_A75070; // weak
 struct Player *pPlayers[5];
 __int64 qword_A750D8; // weak
 __int16 word_A750E0; // weak
--- a/stru272.h	Wed May 01 16:04:37 2013 +0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#pragma once
-
-
-
-/*  270 */
-#pragma pack(push, 1)
-struct stru272_stru0         // ARCOMAGE stuff
-{
-  int _40DFFE();
-  int _40E01A(int a2);
-  int _40E0F5(char a2, char a3);
-  int _40E133();
-  int _40E2A7();
-
-  int field_0;
-  int field_4;
-  int field_8;
-  int field_C;
-  int field_10;
-  int field_14;
-  int field_18;
-  int field_1C;
-  int field_20;
-  int field_24;
-  float field_28;
-  float field_2C;
-  float field_30;
-  int field_34;
-  int field_38;
-  int field_3C;
-  int field_40;
-  int field_44;
-  int field_48;
-  int field_4C;
-  int field_50;
-  int field_54;
-  char field_58;
-  char field_59;
-  char field_5A;
-  char field_5B;
-};
-#pragma pack(pop)
-
-
-/*  266 */
-#pragma pack(push, 1)
-struct stru272
-{
-  void _40DFD1();
-
-  struct stru272_stru0 *ptr_0;
-  char field_4[4264];
-};
-#pragma pack(pop)
-
-
-extern stru272 array_4FAC10[10];
\ No newline at end of file
--- a/stru279.h	Wed May 01 16:04:37 2013 +0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#pragma once
-
-
-/*  273 */
-#pragma pack(push, 1)
-struct stru279
-{
-  //----- (0043B506) --------------------------------------------------------
-  stru279()
-  {
-    this->field_4 = 0;
-    this->field_8 = 0;
-    this->field_C = 0;
-    this->field_10 = 0;
-    this->field_14 = 0;
-    this->registry_debug_flags = 0;
-  }
-
-
-  int registry_debug_flags;
-  int field_4;
-  int field_8;
-  int field_C;
-  int field_10;
-  int field_14;
-};
-#pragma pack(pop)
-extern stru279 stru_51076C;
\ No newline at end of file
--- a/texts.cpp	Wed May 01 16:04:37 2013 +0600
+++ b/texts.cpp	Wed May 01 16:04:50 2013 +0600
@@ -31,7 +31,7 @@
 
 //----- (00452B95) --------------------------------------------------------
 void __cdecl SetSomeItemsNames()
-	{
+{
 	pSomeItemsNames[0] = pGlobalTXT_LocalizationStrings[568];
 	pSomeItemsNames[1] = pGlobalTXT_LocalizationStrings[271];
 	pSomeItemsNames[2] = pGlobalTXT_LocalizationStrings[272];
@@ -47,7 +47,7 @@
 	pSomeItemsNames[12] = pGlobalTXT_LocalizationStrings[282];
 	pSomeItemsNames[13] = pGlobalTXT_LocalizationStrings[143];
 	memset(&stru_5E4C50, 0, sizeof(stru_5E4C50));
-	}
+}
 
 //----- (00452C30) --------------------------------------------------------
 char *RemoveQuotes(char *pStr)