Mercurial > mm7

changeset 935:b462b598b97a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru272.h removed, stuff moved to arcomage
author Nomad
date Wed, 01 May 2013 12:38:19 +0200
parents f14af5bd375a
children 365a9acad64e
files Arcomage.cpp Arcomage.h UIBooks.cpp UICharacter.cpp UIMainMenu.cpp UIOptions.cpp UIPartyCreation.cpp UIPopup.cpp UIRest.cpp UISaveLoad.cpp UiGame.cpp mm7_1.cpp mm7_5.cpp mm7_6.cpp mm7_data.cpp
diffstat 15 files changed, 72 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Arcomage.cpp	Wed May 01 15:32:20 2013 +0600
+++ b/Arcomage.cpp	Wed May 01 12:38:19 2013 +0200
@@ -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 15:32:20 2013 +0600
+++ b/Arcomage.h	Wed May 01 12:38:19 2013 +0200
@@ -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/UIBooks.cpp	Wed May 01 15:32:20 2013 +0600
+++ b/UIBooks.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UICharacter.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UIMainMenu.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UIOptions.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UIPartyCreation.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UIPopup.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UIRest.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UISaveLoad.cpp	Wed May 01 12:38:19 2013 +0200
@@ -37,7 +37,6 @@
 #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 15:32:20 2013 +0600
+++ b/UiGame.cpp	Wed May 01 12:38:19 2013 +0200
@@ -38,7 +38,6 @@
 #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 15:32:20 2013 +0600
+++ b/mm7_1.cpp	Wed May 01 12:38:19 2013 +0200
@@ -43,7 +43,6 @@
 #include "TurnEngine.h"
 #include "CastSpellInfo.h"
 #include "Weather.h"
-#include "stru272.h"
 #include "stru298.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
--- a/mm7_5.cpp	Wed May 01 15:32:20 2013 +0600
+++ b/mm7_5.cpp	Wed May 01 12:38:19 2013 +0200
@@ -36,7 +36,6 @@
 #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 15:32:20 2013 +0600
+++ b/mm7_6.cpp	Wed May 01 12:38:19 2013 +0200
@@ -35,7 +35,6 @@
 #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 15:32:20 2013 +0600
+++ b/mm7_data.cpp	Wed May 01 12:38:19 2013 +0200
@@ -42,9 +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;