diff mm7_data.cpp @ 2:2ca04ccb612a

NoCD, main menu, various
author Nomad
date Wed, 10 Oct 2012 14:21:15 +0200
parents 8b8875f5b359
children 540178ef9b18
line wrap: on
line diff
--- a/mm7_data.cpp	Tue Oct 09 13:09:08 2012 +0200
+++ b/mm7_data.cpp	Wed Oct 10 14:21:15 2012 +0200
@@ -1,5 +1,6 @@
 #include "mm7_data.h"
 
+#include "NPC.h"
 
 
 
@@ -324,6 +325,7 @@
 
 int (__cdecl *sprintfex)(char *a1, const char *a2, ...) = nullptr;
 
+int pWindowList_at_506F50_minus1_indexing[1];
 int dword_4C9890[10]; // weak
 int dword_4C9920[16]; // weak
 _UNKNOWN unk_4D8548; // weak
@@ -1060,24 +1062,13 @@
 char aGammaControlNo[777]; // idb
 __int16 word_4E8152[11];
 char byte_4E8168[116];
-char aEWorkMsdevMm7Mm7CodeGenerate_cpp[777]; // idb
-char aCanTCreateRandomMonsterSSeeMapstats_txtAndMonsters[777]; // idb
-char aSC[777]; // idb
-char aSB[5]; // weak
-char aSA[777]; // idb
-char aElementalLightA[777]; // idb
-char aElementalLightB[18]; // weak
-char aElementalLightC[18]; // weak
-char asc_4E82A4[2]; // weak
-int dword_4E82B4; // weak
-int dword_4E82B8; // weak
-int dword_4E82BC; // weak
-int dword_4E82C0; // weak
 char aD3dTextureName[777]; // idb
 char aLogd3d_txt[777]; // idb
 char byte_4E8398[777]; // weak
 _UNKNOWN unk_4E83B0; // weak
 _UNKNOWN unk_4E8408; // weak
+stru355 stru_4E82A4 = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000};
+stru355 stru_4EFCBC = {0x20, 0x41, 0, 0x10, 0x7C00, 0x3E0, 0x1F, 0x8000};
 char aGlobal_txt[777]; // idb
 char aMagic[777]; // idb
 char aDark_0[777]; // idb
@@ -2084,7 +2075,6 @@
 char aDirect3dRender[777]; // idb
 char aD3drendInitFai[777]; // idb
 char aThereArenTAn_0[777]; // idb
-int dword_4EFCBC[8];
 char aErrorExecuting[777]; // idb
 char aEWorkMsdevM_23[777]; // idb
 char aHiscreen16Load[777]; // idb
@@ -2370,7 +2360,6 @@
 int dword_506E68; // weak
 __int16 word_506E6C[18]; // weak
 unsigned int pPrevVirtualCidesMapping[27];
-int pWindowList_at_506F50_minus1_indexing[777]; // idb
 int dword_506F08; // weak
 int dword_506F0C[777]; // idb
 int uRestUI_FoodRequiredToRest;
@@ -2702,7 +2691,7 @@
 int dword_6BE368_debug_settings_2; // weak
 unsigned __int8 bUseLoResSprites;
 unsigned __int8 bUseRegistry;
-unsigned __int8 bCanLoadFromCD;
+unsigned __int8 bCanLoadFromCD = false;
 int bShowDamage; // idb
 unsigned int bAlwaysRun;
 unsigned int bFlipOnExit;
@@ -2721,6 +2710,7 @@
 char _702ACC_unused; // weak
 int bDebugResouces; // weak
 unsigned int bNoVideo;
+bool bNoCD = false;
 int aborting_app; // weak
 int dword_720020_zvalues[100];
 int dword_7201B0_zvalues[299];
@@ -2755,33 +2745,7 @@
 int blv_prev_party_y; // weak
 char *dword_721660; // idb
 char *dword_721664; // idb
-_UNKNOWN unk_721668_pNPCTopic; // weak
-_UNKNOWN unk_72166C_pNPCText; // weak
-int dword_721824; // weak
-int dword_72193C; // weak
-int dword_721984[22];
-int dword_7219DC[777]; // weak
-char *dword_721A34; // idb
-char *_721A3C_npc_text; // idb
-int dword_721A44; // weak
-int dword_721A4C; // weak
-int dword_721A64; // weak
-int _721A6C_npc_text[777]; // weak
-int _721A84_npc_text; // weak
-int dword_721BAC[6];
-char *dword_721BC4; // idb
-_UNKNOWN dword_721E24[777]; // idb
-int dword_722164; // weak
-int dword_72216C; // weak
-int dword_722174; // weak
-char *pStr_72217C; // idb
-int dword_722240[777]; // idb
-int dword_722320; // weak
-char *pstr_722494;
-int dword_72266C; // weak
-_UNKNOWN unk_722880; // weak
-int dword_722B3C; // weak
-int dword_722B44; // weak
+NPCTopic pNPCTopics[789];
 char *dword_722F10; // idb
 const char *pQuestTable[512];
 _UNKNOWN unk_723714; // weak
@@ -2791,7 +2755,7 @@
 int dword_723E80_award_related[777]; // weak
 int dword_723E84[777]; // weak
 int dword_7241C8; // weak
-struct NPCStats *pNPCStats;
+struct NPCStats *pNPCStats = nullptr;
 char *aNPCProfessionNames[59];
 char *pAwardsTXT_Raw;
 char *pScrollsTXT_Raw;
@@ -2895,7 +2859,7 @@
 int dword_F8B198; // weak
 int dword_F8B19C; // weak
 __int16 word_F8B1A0; // weak
-char *dword_F8B1A4; // idb
+const char *dword_F8B1A4; // idb
 int dword_F8B1A8; // weak
 int dword_F8B1AC_something_todo_with_awards; // idb
 int dword_F8B1B0; // weak
@@ -2906,7 +2870,7 @@
 int dword_F8B1DC; // weak
 int dword_F8B1E0; // weak
 int dword_F8B1E4; // weak
-char *ptr_F8B1E8; // idb
+const char *ptr_F8B1E8; // idb
 char byte_F8B1EC; // weak
 char byte_F8B1EF[777]; // weak
 char byte_F8B1F0[4];