Mercurial > mm7

changeset 2302:2b65eb263ceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mm7_7 made redundant, exctracted the 2 useful functions, commented out the rest of the file
author Grumpy7
date Sun, 16 Mar 2014 21:03:36 +0100
parents df24d11208df
children 0a14fc2d121e
files mm7_7.cpp mm7_data.cpp mm7_unsorted_subs.h
diffstat 3 files changed, 6 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_7.cpp	Sun Mar 16 20:28:44 2014 +0100
+++ b/mm7_7.cpp	Sun Mar 16 21:03:36 2014 +0100
@@ -1,46 +1,4 @@
 #define _CRT_SECURE_NO_WARNINGS
-#include "mm7_data.h"
-#include "Render.h"
-#include "texts.h"
-#include "Party.h"
-#include "Viewport.h"
-
-int __cdecl sub_401022()
-{
-  int result; // eax@1
-  signed int v1; // ecx@1
-  int *v2; // edx@1
-/*
-  result = (int)dword_4F8580;
-  v1 = 60;
-  v2 = &dword_4F8580[1];
-  do
-  {
-    v2[2] = 0;
-    v2[1] = 0;
-    *v2 = 0;
-    v2 += 3;
-    --v1;
-  }
-  while ( v1 );
-  dword_4F8580[0] = 1;
-  return result;
-  */
-	//__debugbreak();//Ritor1
-  for( int i = 0; i < 62; i++ )
-  {
-	  dword_4F8580[i] = 0;
-  }
-  dword_4F8580[0] = 1;
-  return 0;
-}
-
-//----- (00423B4A) --------------------------------------------------------
-void  sub_423B4A()
-{
-  for ( uint i = 0; i < 50; i++ )
-    array_507D30[i].flt_2C = 0.0;
-}
 
 /*
 GUIProgressBar *__cdecl crt_construct_576E30()
@@ -73,16 +31,12 @@
 }
 */
 
-void constructors()
+/*void constructors()
 {
-	sub_401022();
-	sub_423B4A();
-
 	//no call to these anywhere
 	uGameUIFontMain_initialize();
 	uGameUIFontShadow_initialize();
-	SetSomeItemsNames();
-}
+}*/
 
 /*
 
@@ -96,7 +50,7 @@
 IOStream
 
 .data:004DF00C                 dd offset sub_401022
-added
+achieved by zero initializing dword_4F8580, dword_4F8580[0] = 1; is unused anyway
 
 .data:004DF010                 dd offset sub_408B98
 .data:004DF014                 dd offset sub_409BCC
@@ -128,7 +82,7 @@
 
 .data:004DF050                 dd offset uGameUIFontMain_initialize
 .data:004DF054                 dd offset uGameUIFontShadow_initialize
-added
+X called in SetUserInterface(Neutral)
 
 .data:004DF058                 dd offset crt_construct_507ABC
 .data:004DF05C                 dd offset crt_construct_507A94
@@ -152,7 +106,7 @@
 deleted
 
 .data:004DF084                 dd offset j_sub_423B4A
-added
+byte
 
 .data:004DF088                 dd offset crt_sub_4262DD
 byte
--- a/mm7_data.cpp	Sun Mar 16 20:28:44 2014 +0100
+++ b/mm7_data.cpp	Sun Mar 16 21:03:36 2014 +0100
@@ -763,7 +763,7 @@
 int ai_arrays_size; // weak
 std::array<int, 500> ai_near_actors_distances;
 std::array<unsigned int, 500> ai_near_actors_ids;
-std::array<int, 182> dword_4F8580; // weak
+std::array<int, 182> dword_4F8580 = {}; // weak
 
 char byte_4FAA24; // weak
 //HWND dword_4FAA28; // idb
--- a/mm7_unsorted_subs.h	Sun Mar 16 20:28:44 2014 +0100
+++ b/mm7_unsorted_subs.h	Sun Mar 16 21:03:36 2014 +0100
@@ -4,8 +4,6 @@
 
 //-------------------------------------------------------------------------
 // Function declarations
-void constructors();
-
 void init_event_triggers();
 void check_event_triggers();