Mercurial > mm7

changeset 2007:664146d9b101

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving sub_4C023F constructor, after pRendererD3D initialization
author zipi
date Fri, 08 Nov 2013 12:46:51 +0000
parents 30c2b575d25c
children 591024ad7269
files mm7_2.cpp mm7_7.cpp mm7_data.h
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_2.cpp	Wed Nov 06 13:06:02 2013 +0000
+++ b/mm7_2.cpp	Fri Nov 08 12:46:51 2013 +0000
@@ -3997,7 +3997,7 @@
     //window->SetWindowedMode(game_width, game_height);
     pRenderer->SwitchToWindow();
   }
-
+  sub_4C023F();
   uSoundVolumeMultiplier = ReadWindowsRegistryInt("soundflag", 9);
   if (uSoundVolumeMultiplier > 9)
     uSoundVolumeMultiplier = 9;
--- a/mm7_7.cpp	Wed Nov 06 13:06:02 2013 +0000
+++ b/mm7_7.cpp	Fri Nov 08 12:46:51 2013 +0000
@@ -102,7 +102,6 @@
 	sub_401022();
 	sub_423B4A();
 	crt_init_globals_46BD9F();
-	sub_4C023F();
 
 	//no call to these anywhere
 	uGameUIFontMain_initialize();
--- a/mm7_data.h	Wed Nov 06 13:06:02 2013 +0000
+++ b/mm7_data.h	Fri Nov 08 12:46:51 2013 +0000
@@ -1343,7 +1343,7 @@
     *p++ = value;
 }
 //inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);}
-
+void __cdecl sub_4C023F();
 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0)