diff mm7_2.cpp @ 731:de482c901171

Moved unused CPU detection stuff to a separate file.
author Nomad
date Fri, 22 Mar 2013 11:18:51 +0200
parents 9f596a163257
children 700b58aac975
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Mar 22 10:52:19 2013 +0200
+++ b/mm7_2.cpp	Fri Mar 22 11:18:51 2013 +0200
@@ -9750,26 +9750,29 @@
 
   dword_6BE364_game_settings_1 |= 0x4000;
 
-  if ( uTurnSpeed )
-  {
     switch ( uTurnSpeed )
     {
-      case 1u:
+      case 0: // undefined turn option
+        __debugbreak(); // really shouldn't use this mode
+        uTurnSpeed = (unsigned int)uCPUSpeed < 199 ? 128 : 64; // adjust turn speed to estimated fps
+      break;
+
+      case 1u:             // 16x
+        Log::Warning(L"x16 Turn Speed"); // really shouldn't use this mode
         uTurnSpeed = 128;
-        break;
-      case 2u:
+      break;
+
+      case 2u:             // 32x
+        Log::Warning(L"x32 Turn Speed"); // really shouldn't use this mode
         uTurnSpeed = 64;
-        break;
-      case 3u:
+      break;
+
+      case 3u:             // smooth
         uTurnSpeed = 0;
-        break;
-    }
-  }
-  else
-  {
-    uTurnSpeed = (unsigned int)uCPUSpeed < 0xC7 ? 128 : 64; // adjust turn speed to estimated fps
-  }
-  initing=false; //ADDED Gloval
+      break;
+    }
+
+  initing = false; //ADDED Gloval
   return true;
 }
 
@@ -10064,12 +10067,13 @@
   stru_51076C.registry_debug_flags = ReadWindowsRegistryInt("debug flags", 0);
 
 
-  v8 = sub_4AC1C9(0, (Vec4_int_ *)a2);
+  /*v8 = _4AC1C9_get_cpu_speed(0, (Vec4_int_ *)a2);
   Rect.left = *(int *)v8;
   Rect.top = *(int *)(v8 + 4);
   Rect.right = *(int *)(v8 + 8);
   Rect.bottom = *(int *)(v8 + 12);
-  uCPUSpeed = Rect.bottom;
+  uCPUSpeed = Rect.bottom;*/
+  uCPUSpeed = 2048; // about 2GHz
 
 
   if (MM7_Initialize())