diff mm7_5.cpp @ 1264:6bc88137a019

Merge
author Gloval
date Thu, 13 Jun 2013 00:56:22 +0400
parents 73269755dd89 0aeac0b9ca30
children 2929c4406d2c
line wrap: on
line diff
--- a/mm7_5.cpp	Thu Jun 13 00:53:51 2013 +0400
+++ b/mm7_5.cpp	Thu Jun 13 00:56:22 2013 +0400
@@ -4,6 +4,8 @@
 
 #include <assert.h>
 
+#include "Texture.h"
+#include "mm7_data.h"
 #include "VideoPlayer.h"
 #include "Sprites.h"
 #include "MapInfo.h"
@@ -46,6 +48,8 @@
 #include "texts.h"
 #include "Log.h"
 #include "UIHouses.h"
+#include "Lights.h"
+#include "Lights.h"
 
 //----- (004304E7) --------------------------------------------------------
 void __cdecl GameUI_MsgProc()
@@ -3625,6 +3629,50 @@
   this->z = (1.0 / sqrt(this->x * this->x + this->y * this->y + this->z * this->z)) * this->z;
 }
 
+//----- (00438526) --------------------------------------------------------
+stru11::stru11()
+{
+  stru11 *v1; // esi@1
+  signed int v2; // eax@1
+  char *v3; // edx@1
+
+  v1 = this;
+  v2 = 0;
+  this->cpuid_00000000_eax_numops = 0;
+  this->cpuid_00000001_eax = 0;
+  this->cpuid_00000001_edx = 0;
+  this->field_38 = 0;
+  this->field_3C = 0;
+  this->cpuid_80000000_edx = 0;
+  this->cpuid_80000001_eax = 0;
+  this->cpuid_80000001_edx = 0;
+  this->cpuid_80000005_ebx = 0;
+  this->cpuid_80000005_ecx = 0;
+  this->cpuid_80000005_edx = 0;
+  this->cpuid_80000006_ecx = 0;
+  this->field_AC = 0;
+  this->uProcessorManufacturer = 0;
+  LOBYTE(this->cpuid_80000002_registers2[0]) = 0;
+  v3 = (char *)&this->cpuid_00000002_eax;
+  do
+  {
+    if ( v2 < 3 )
+      *((int *)v3 - 9) = 0;
+    if ( v2 < 4 )
+      *(int *)v3 = 0;
+    if ( v2 < 12 )
+      *((int *)v3 + 17) = 0;
+    if ( v2 < 13 )
+      this->pCPUString[v2] = 0;
+    if ( v2 < 30 )
+      *((char *)this->field_40 + v2) = 0;
+    *((char *)&this->cpuid_80000002_registers2[0] + v2++ + 1) = 0;
+    v3 += 4;
+  }
+  while ( v2 < 48 );
+  CheckCPU();
+}
+
 //----- (004385B5) --------------------------------------------------------
 void stru11::CheckCPU()
 {