diff MM7.h @ 956:e9292c58644a

Слияние
author Ritor1
date Thu, 02 May 2013 11:03:26 +0600
parents 016e3577865c
children c45d51b3f4f4
line wrap: on
line diff
--- a/MM7.h	Thu May 02 11:02:48 2013 +0600
+++ b/MM7.h	Thu May 02 11:03:26 2013 +0600
@@ -32,33 +32,6 @@
 
 #include "VectorTypes.h"
 #include "IndoorCameraD3D.h"
-/*#include "LOD.h"
-#include "Texture.h"
-#include "Mouse.h"
-#include "Overlays.h"
-#include "Game.h"
-#include "Items.h"
-#include "Actor.h"
-#include "Arcomage.h"
-#include "Render.h"
-#include "Time.h"
-#include "GUIWindow.h"
-#include "GUIButton.h"
-#include "GUIProgressBar.h"
-#include "GUIFont.h"
-#include "NPC.h"
-#include "PaletteManager.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "VideoPlayer.h"
-#include "Chest.h"
-#include "Allocator.h"
-#include "IndoorCamera.h"
-#include "Party.h"
-#include "Outdoor.h"
-
-#include "mm7_data.h"
-*/
 
 
 
@@ -66,35 +39,8 @@
 
 
 
-/*  285 */
-#pragma pack(push, 1)
-struct stru289
-{
-  //----- (0046263C) --------------------------------------------------------
-  inline stru289()
-  {
-    this->field_64 = 2;
-    this->field_74 = 0;
-    this->field_70 = 0;
-    this->field_6C = 0;
-    this->field_68 = 0;
-  }
-
-
-  char field_0[100];
-  int field_64;
-  int field_68;
-  int field_6C;
-  int field_70;
-  int field_74;
-};
-#pragma pack(pop)
-extern stru289 stru_6BE158;
-
-
-
 /*  288 */
-#pragma pack(push, 1)
+/*#pragma pack(push, 1)
 struct CheckHRESULT_stru0
 {
   void CheckHRESULT(HRESULT a2, const char *Str, int a4, unsigned int uType);
@@ -105,7 +51,7 @@
 
   void (__thiscall ***vdestructor_ptr)(CheckHRESULT_stru0 *, bool);
 };
-#pragma pack(pop)
+#pragma pack(pop)*/
 
 
 
@@ -141,40 +87,10 @@
 
 
 
-/*  369 */
-#pragma pack(push, 1)
-
-#pragma pack(pop)
-extern int paperdoll_Weapon[4][16][2];
-
-/*  371 */ // stru331 - deleted
 
 
-/*  372 */
-#pragma pack(push, 1)
-/*struct stru332
-{
-  unsigned int texids[11];
-  int texid1;
-  int texid2;
-  int texid3;
-  int texid4;
-  int texid5;
-};*/
-#pragma pack(pop)
-extern int paperdoll_helm_texture[2][16];
 
 
-/*  373 */
-#pragma pack(push, 1)
-/*struct stru333
-{
-  unsigned int texids[5];
-  int texid1;
-  int texid2;
-};*/
-#pragma pack(pop)
-extern int paperdoll_belt_texture[2][7];
 
 
 /*  374 */
@@ -204,38 +120,3 @@
 };
 #pragma pack(pop)
 
-
-
-
-
-
-
-
-
-
-
-
-
-/*  388 */
-#pragma pack(push, 1)
-struct stru348
-{
-  __int16 field_0;
-  __int16 field_2;
-  __int16 field_4;
-  __int16 field_6;
-  __int16 field_8;
-  __int16 field_A;
-  __int16 field_C;
-  __int16 field_E;
-  __int16 field_10;
-  __int16 field_12;
-  int field_14;
-};
-#pragma pack(pop)
-
-extern stru348 stru_4E1890[13];
-
-
-
-