diff --git a/Source/appfat.cpp b/Source/appfat.cpp index 5215e48..b48c3a6 100644 --- a/Source/appfat.cpp +++ b/Source/appfat.cpp @@ -31,7 +31,6 @@ bool __cdecl appfat_cpp_free(void *a1) } */ -//----- (0040102A) -------------------------------------------------------- char *__fastcall GetErr(int error_code) { int v1; // edi @@ -64,7 +63,6 @@ char *__fastcall GetErr(int error_code) return sz_error_buf; } -//----- (004010CE) -------------------------------------------------------- void __fastcall GetDDErr(int error_code, char *error_buf, int error_buf_len) { const char *v3; // eax @@ -494,7 +492,6 @@ LABEL_182: strncpy(error_buf, v3, error_buf_len); } -//----- (00401831) -------------------------------------------------------- void __fastcall GetDSErr(int error_code, char *error_buf, int error_buf_len) { const char *v3; // eax @@ -558,7 +555,6 @@ LABEL_29: strncpy(error_buf, v3, error_buf_len); } -//----- (0040193A) -------------------------------------------------------- char *__cdecl GetLastErr() { int v0; // eax @@ -567,7 +563,6 @@ char *__cdecl GetLastErr() return GetErr(v0); } -//----- (00401947) -------------------------------------------------------- void TermMsg(char *pszFmt, ...) { va_list arglist; // [esp+8h] [ebp+8h] @@ -580,7 +575,6 @@ void TermMsg(char *pszFmt, ...) exit(1); } -//----- (00401975) -------------------------------------------------------- void __fastcall MsgBox(char *pszFmt, va_list va) { char Text[256]; // [esp+0h] [ebp-100h] @@ -591,7 +585,6 @@ void __fastcall MsgBox(char *pszFmt, va_list va) MessageBoxA(ghMainWnd, Text, "ERROR", MB_TASKMODAL|MB_ICONHAND); } -//----- (004019C7) -------------------------------------------------------- void __cdecl FreeDlg() { if ( terminating && cleanup_thread_id != GetCurrentThreadId() ) @@ -611,7 +604,6 @@ void __cdecl FreeDlg() // 4B7A38: using guessed type int cleanup_thread_id; // 679660: using guessed type char gbMaxPlayers; -//----- (00401A30) -------------------------------------------------------- void DrawDlg(char *pszFmt, ...) { char text[256]; // [esp+0h] [ebp-100h] @@ -622,7 +614,6 @@ void DrawDlg(char *pszFmt, ...) SDrawMessageBox(text, "Diablo", MB_TASKMODAL|MB_ICONEXCLAMATION); } -//----- (00401A65) -------------------------------------------------------- void __fastcall DDErrDlg(int error_code, int log_line_nr, char *log_file_path) { int v3; // esi @@ -636,7 +627,6 @@ void __fastcall DDErrDlg(int error_code, int log_line_nr, char *log_file_path) } } -//----- (00401A88) -------------------------------------------------------- void __fastcall DSErrDlg(int error_code, int log_line_nr, char *log_file_path) { int v3; // esi @@ -650,7 +640,6 @@ void __fastcall DSErrDlg(int error_code, int log_line_nr, char *log_file_path) } } -//----- (00401AAB) -------------------------------------------------------- void __fastcall CenterDlg(HWND hDlg) { LONG v1; // esi @@ -677,7 +666,6 @@ void __fastcall CenterDlg(HWND hDlg) } } -//----- (00401B3D) -------------------------------------------------------- void __fastcall TermDlg(int template_id, int error_code, char *log_file_path, int log_line_nr) { int v4; // ebx @@ -701,7 +689,6 @@ void __fastcall TermDlg(int template_id, int error_code, char *log_file_path, in TermMsg(0); } -//----- (00401BCA) -------------------------------------------------------- bool __stdcall FuncDlg(HWND hDlg, UINT uMsg, WPARAM wParam, char *text) { if ( uMsg == WM_INITDIALOG ) @@ -724,7 +711,6 @@ bool __stdcall FuncDlg(HWND hDlg, UINT uMsg, WPARAM wParam, char *text) return 1; } -//----- (00401C0F) -------------------------------------------------------- void __fastcall TextDlg(HWND hDlg, char *text) { char *v2; // esi @@ -737,7 +723,6 @@ void __fastcall TextDlg(HWND hDlg, char *text) SetDlgItemTextA(v3, 1000, v2); } -//----- (00401C2E) -------------------------------------------------------- void __fastcall ErrDlg(template_id template_id, int error_code, char *log_file_path, int log_line_nr) { char *v4; // esi @@ -758,7 +743,6 @@ void __fastcall ErrDlg(template_id template_id, int error_code, char *log_file_p DialogBoxParamA(ghInst, (LPCSTR)v6, ghMainWnd, (DLGPROC)FuncDlg, (LPARAM)dwInitParam); } -//----- (00401C9C) -------------------------------------------------------- void __fastcall FileErrDlg(char *error) { char *v1; // esi @@ -772,7 +756,6 @@ void __fastcall FileErrDlg(char *error) TermMsg(0); } -//----- (00401CE1) -------------------------------------------------------- void __fastcall DiskFreeDlg(char *error) { char *v1; // esi @@ -784,7 +767,6 @@ void __fastcall DiskFreeDlg(char *error) TermMsg(0); } -//----- (00401D1D) -------------------------------------------------------- bool __cdecl InsertCDDlg() { int v0; // edi @@ -797,7 +779,6 @@ bool __cdecl InsertCDDlg() return v0 == 1; } -//----- (00401D68) -------------------------------------------------------- void __fastcall DirErrDlg(char *error) { char *v1; // esi diff --git a/Source/appfat.h b/Source/appfat.h index 8bb70c1..7046d22 100644 --- a/Source/appfat.h +++ b/Source/appfat.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __APPFAT_H__ +#define __APPFAT_H__ -//appfat extern int appfat_terminated; // weak extern char sz_error_buf[256]; extern int terminating; // weak @@ -26,3 +27,5 @@ void __fastcall FileErrDlg(char *error); void __fastcall DiskFreeDlg(char *error); bool __cdecl InsertCDDlg(); void __fastcall DirErrDlg(char *error); + +#endif /* __APPFAT_H__ */ diff --git a/Source/automap.cpp b/Source/automap.cpp index 768a10c..e8722e2 100644 --- a/Source/automap.cpp +++ b/Source/automap.cpp @@ -17,7 +17,6 @@ int AutoMapYPos; // weak int AMPlayerX; // weak int AMPlayerY; // weak -//----- (00401DA4) -------------------------------------------------------- void __cdecl InitAutomapOnce() { automapflag = 0; @@ -34,7 +33,6 @@ void __cdecl InitAutomapOnce() // 4B84C4: using guessed type int AMPlayerX; // 4B84C8: using guessed type int AMPlayerY; -//----- (00401DE8) -------------------------------------------------------- void __cdecl InitAutomap() { signed int v0; // edi @@ -124,7 +122,6 @@ void __cdecl InitAutomap() } // 5BB1ED: using guessed type char leveltype; -//----- (00401EF4) -------------------------------------------------------- void __cdecl StartAutomap() { AutoMapXOfs = 0; @@ -134,7 +131,6 @@ void __cdecl StartAutomap() // 4B84B0: using guessed type int AutoMapXOfs; // 4B84B4: using guessed type int AutoMapYOfs; -//----- (00401F0D) -------------------------------------------------------- void __cdecl AutomapUp() { --AutoMapXOfs; @@ -143,7 +139,6 @@ void __cdecl AutomapUp() // 4B84B0: using guessed type int AutoMapXOfs; // 4B84B4: using guessed type int AutoMapYOfs; -//----- (00401F1A) -------------------------------------------------------- void __cdecl AutomapDown() { ++AutoMapXOfs; @@ -152,7 +147,6 @@ void __cdecl AutomapDown() // 4B84B0: using guessed type int AutoMapXOfs; // 4B84B4: using guessed type int AutoMapYOfs; -//----- (00401F27) -------------------------------------------------------- void __cdecl AutomapLeft() { --AutoMapXOfs; @@ -161,7 +155,6 @@ void __cdecl AutomapLeft() // 4B84B0: using guessed type int AutoMapXOfs; // 4B84B4: using guessed type int AutoMapYOfs; -//----- (00401F34) -------------------------------------------------------- void __cdecl AutomapRight() { ++AutoMapXOfs; @@ -170,7 +163,6 @@ void __cdecl AutomapRight() // 4B84B0: using guessed type int AutoMapXOfs; // 4B84B4: using guessed type int AutoMapYOfs; -//----- (00401F41) -------------------------------------------------------- void __cdecl AutomapZoomIn() { if ( AutoMapScale < 200 ) @@ -189,7 +181,6 @@ void __cdecl AutomapZoomIn() // 4B84C4: using guessed type int AMPlayerX; // 4B84C8: using guessed type int AMPlayerY; -//----- (00401F80) -------------------------------------------------------- void __cdecl AutomapZoomOut() { if ( AutoMapScale > 50 ) @@ -208,7 +199,6 @@ void __cdecl AutomapZoomOut() // 4B84C4: using guessed type int AMPlayerX; // 4B84C8: using guessed type int AMPlayerY; -//----- (00401FBD) -------------------------------------------------------- void __cdecl DrawAutomap() { int v0; // eax @@ -391,7 +381,6 @@ void __cdecl DrawAutomap() // 69BD04: using guessed type int questlog; // 69CF0C: using guessed type int screen_buf_end; -//----- (00402233) -------------------------------------------------------- void __fastcall DrawAutomapType(int screen_x, int screen_y, short automap_type) { short v3; // al @@ -628,7 +617,6 @@ LABEL_36: // 4B84C4: using guessed type int AMPlayerX; // 4B84C8: using guessed type int AMPlayerY; -//----- (004029A8) -------------------------------------------------------- void __cdecl DrawAutomapPlr() { int v0; // ebx @@ -782,7 +770,6 @@ LABEL_25: // 4B8968: using guessed type int sbookflag; // 69BD04: using guessed type int questlog; -//----- (00402D83) -------------------------------------------------------- short __fastcall GetAutomapType(int tx, int ty, bool view) { int v3; // edi @@ -830,7 +817,6 @@ short __fastcall GetAutomapType(int tx, int ty, bool view) return v7; } -//----- (00402E4A) -------------------------------------------------------- void __cdecl DrawAutomapGame() { int v0; // esi @@ -867,7 +853,6 @@ void __cdecl DrawAutomapGame() // 5CF31D: using guessed type char setlevel; // 679660: using guessed type char gbMaxPlayers; -//----- (00402F27) -------------------------------------------------------- void __fastcall SetAutomapView(int x, int y) { signed int v2; // esi @@ -964,7 +949,6 @@ LABEL_35: // 4B7E40: using guessed type int AMdword_4B7E40; // 4B7E44: using guessed type int AMdword_4B7E44; -//----- (004030DD) -------------------------------------------------------- void __cdecl AutomapZoomReset() { AutoMapXOfs = 0; diff --git a/Source/automap.h b/Source/automap.h index 170908f..8a3fa15 100644 --- a/Source/automap.h +++ b/Source/automap.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __AUTOMAP_H__ +#define __AUTOMAP_H__ -//automap extern short automaptype[512]; extern int AMdword_4B7E40; // weak extern int AMdword_4B7E44; // weak @@ -31,4 +32,6 @@ void __cdecl DrawAutomapPlr(); short __fastcall GetAutomapType(int tx, int ty, bool view); void __cdecl DrawAutomapGame(); void __fastcall SetAutomapView(int x, int y); -void __cdecl AutomapZoomReset(); \ No newline at end of file +void __cdecl AutomapZoomReset(); + +#endif /* __AUTOMAP_H__ */ diff --git a/Source/capture.cpp b/Source/capture.cpp index 0509ec4..34002df 100644 --- a/Source/capture.cpp +++ b/Source/capture.cpp @@ -2,7 +2,6 @@ #include "../types.h" -//----- (0040311B) -------------------------------------------------------- void __cdecl CaptureScreen() { int v4; // edi @@ -38,7 +37,6 @@ void __cdecl CaptureScreen() // 40311B: could not find valid save-restore pair for edi // 40311B: could not find valid save-restore pair for esi -//----- (00403204) -------------------------------------------------------- bool __fastcall CaptureHdr(HANDLE hFile, short width, int height) { short v3; // si @@ -62,7 +60,6 @@ bool __fastcall CaptureHdr(HANDLE hFile, short width, int height) return WriteFile(v4, &Buffer, 0x80u, &lpNumBytes, NULL) && lpNumBytes == 128; } -//----- (00403294) -------------------------------------------------------- bool __fastcall CapturePal(HANDLE hFile, PALETTEENTRY *palette) { BYTE *v2; // eax @@ -88,7 +85,6 @@ bool __fastcall CapturePal(HANDLE hFile, PALETTEENTRY *palette) return WriteFile(hFile, Buffer, 0x301u, &lpNumBytes, 0) && lpNumBytes == 769; } -//----- (004032FD) -------------------------------------------------------- bool __fastcall CapturePix(HANDLE hFile, short width, short height, short stride, char *pixels) { int v5; // esi @@ -117,7 +113,6 @@ bool __fastcall CapturePix(HANDLE hFile, short width, short height, short stride return 0; } -//----- (0040336A) -------------------------------------------------------- char *__fastcall CaptureEnc(char *src, char *dst, int width) { int v3; // esi @@ -155,7 +150,6 @@ LABEL_13: return dst; } -//----- (004033A8) -------------------------------------------------------- HANDLE __fastcall CaptureFile(char *dst_path) { char *v1; // edi @@ -192,7 +186,6 @@ HANDLE __fastcall CaptureFile(char *dst_path) } // 4033A8: using guessed type char var_64[100]; -//----- (00403470) -------------------------------------------------------- void __fastcall RedPalette(PALETTEENTRY *pal) { int i; // eax diff --git a/Source/capture.h b/Source/capture.h index 43a0dfd..3f3b6e8 100644 --- a/Source/capture.h +++ b/Source/capture.h @@ -1,4 +1,6 @@ //HEADER_GOES_HERE +#ifndef __CAPTURE_H__ +#define __CAPTURE_H__ void __cdecl CaptureScreen(); bool __fastcall CaptureHdr(HANDLE hFile, short width, int height); @@ -6,4 +8,6 @@ bool __fastcall CapturePal(HANDLE hFile, PALETTEENTRY *palette); bool __fastcall CapturePix(HANDLE hFile, short width, short height, short stride, char *pixels); char *__fastcall CaptureEnc(char *src, char *dst, int width); HANDLE __fastcall CaptureFile(char *dst_path); -void __fastcall RedPalette(PALETTEENTRY *pal); \ No newline at end of file +void __fastcall RedPalette(PALETTEENTRY *pal); + +#endif /* __CAPTURE_H__ */ diff --git a/Source/codec.cpp b/Source/codec.cpp index 17f7e24..416b5c0 100644 --- a/Source/codec.cpp +++ b/Source/codec.cpp @@ -2,7 +2,6 @@ #include "../types.h" -//----- (004034D9) -------------------------------------------------------- int __fastcall codec_decode(void *pbSrcDst, int size, char *pszPassword) { unsigned int v3; // ebx @@ -65,7 +64,6 @@ LABEL_14: } // 4034D9: using guessed type char var_98[128]; -//----- (004035DB) -------------------------------------------------------- void __fastcall codec_init_key(int unused, char *pszPassword) { char *v2; // edi @@ -125,7 +123,6 @@ void __fastcall codec_init_key(int unused, char *pszPassword) // 4035DB: using guessed type char var_58[64]; // 4035DB: using guessed type char dst[20]; -//----- (004036AC) -------------------------------------------------------- int __fastcall codec_get_encoded_len(int dwSrcBytes) { if ( dwSrcBytes & 0x3F ) @@ -133,7 +130,6 @@ int __fastcall codec_get_encoded_len(int dwSrcBytes) return dwSrcBytes + 8; } -//----- (004036BE) -------------------------------------------------------- void __fastcall codec_encode(void *pbSrcDst, int size, int size_64, char *pszPassword) { char *v4; // esi diff --git a/Source/codec.h b/Source/codec.h index ab1ebea..3d271fb 100644 --- a/Source/codec.h +++ b/Source/codec.h @@ -1,6 +1,10 @@ //HEADER_GOES_HERE +#ifndef __CODEC_H__ +#define __CODEC_H__ int __fastcall codec_decode(void *pbSrcDst, int size, char *pszPassword); void __fastcall codec_init_key(int unused, char *pszPassword); int __fastcall codec_get_encoded_len(int dwSrcBytes); -void __fastcall codec_encode(void *pbSrcDst, int size, int size_64, char *pszPassword); \ No newline at end of file +void __fastcall codec_encode(void *pbSrcDst, int size, int size_64, char *pszPassword); + +#endif /* __CODEC_H__ */ diff --git a/Source/control.cpp b/Source/control.cpp index 066a6da..7294016 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -191,7 +191,6 @@ int SpellPages[6][7] = { -1, -1, -1, -1, -1, -1, -1 } }; -//----- (004037D4) -------------------------------------------------------- void __fastcall DrawSpellCel(int xp, int yp, char *Trans, int nCel, int w) { char *v5; // ebx @@ -276,7 +275,6 @@ LABEL_12: while ( v6 != (char *)v18 ); } -//----- (0040387E) -------------------------------------------------------- void __fastcall SetSpellTrans(char t) { signed int v1; // eax @@ -370,7 +368,6 @@ void __fastcall SetSpellTrans(char t) } } -//----- (004039C7) -------------------------------------------------------- void __cdecl DrawSpell() { int v0; // ebp @@ -405,7 +402,6 @@ void __cdecl DrawSpell() DrawSpellCel(629, 631, (char *)pSpellCels, (char)SpellITbl[v3], 56); } -//----- (00403A8E) -------------------------------------------------------- void __cdecl DrawSpellList() { int v0; // esi @@ -630,7 +626,6 @@ LABEL_68: // 4B8834: using guessed type int pSpell; // 4B8954: using guessed type int pSplType; -//----- (00403F69) -------------------------------------------------------- void __cdecl SetSpell() { int v0; // eax @@ -650,7 +645,6 @@ void __cdecl SetSpell() // 4B8C98: using guessed type int spselflag; // 52571C: using guessed type int drawpanflag; -//----- (00403FAC) -------------------------------------------------------- void __fastcall SetSpeedSpell(int slot) { int v1; // esi @@ -683,7 +677,6 @@ void __fastcall SetSpeedSpell(int slot) // 4B8834: using guessed type int pSpell; // 4B8954: using guessed type int pSplType; -//----- (00404017) -------------------------------------------------------- void __fastcall ToggleSpell(int slot) { int v1; // eax @@ -754,7 +747,6 @@ void __fastcall ToggleSpell(int slot) } // 52571C: using guessed type int drawpanflag; -//----- (004040DA) -------------------------------------------------------- void __fastcall CPrintString(int No, unsigned char pszStr, int Just) { int *v3; // ebx @@ -953,7 +945,6 @@ LABEL_15: } } -//----- (00404218) -------------------------------------------------------- void __fastcall AddPanelString(char *str, int just) { strcpy(&panelstr[64 * pnumlines], str); @@ -963,7 +954,6 @@ void __fastcall AddPanelString(char *str, int just) pnumlines++; } -//----- (0040424A) -------------------------------------------------------- void __cdecl ClearPanel() { pnumlines = 0; @@ -971,7 +961,6 @@ void __cdecl ClearPanel() } // 4B8824: using guessed type int pinfoflag; -//----- (00404259) -------------------------------------------------------- void __fastcall DrawPanelBox(int x, int y, int w, int h, int sx, int sy) { char *v6; // esi @@ -1005,7 +994,6 @@ void __fastcall DrawPanelBox(int x, int y, int w, int h, int sx, int sy) while ( v8 ); } -//----- (004042CA) -------------------------------------------------------- void __fastcall SetFlaskHeight(char *buf, int min, int max, int c, int r) { char *v5; // esi @@ -1025,7 +1013,6 @@ void __fastcall SetFlaskHeight(char *buf, int min, int max, int c, int r) while ( v7 ); } -//----- (0040431B) -------------------------------------------------------- void __fastcall DrawFlask(void *a1, int a2, int a3, void *a4, int a5, int a6) { char *v6; // esi @@ -1058,7 +1045,6 @@ void __fastcall DrawFlask(void *a1, int a2, int a3, void *a4, int a5, int a6) while ( v8 ); } -//----- (0040435B) -------------------------------------------------------- void __cdecl DrawLifeFlask() { signed __int64 v0; // rax @@ -1078,7 +1064,6 @@ void __cdecl DrawLifeFlask() DrawFlask(pBtmBuff, 640, 640 * v2 + 2029, gpBuffer, 768 * v2 + 383405, 13 - v2); } -//----- (004043F4) -------------------------------------------------------- void __cdecl UpdateLifeFlask() { signed __int64 v0; // rax @@ -1102,7 +1087,6 @@ LABEL_8: goto LABEL_8; } -//----- (00404475) -------------------------------------------------------- void __cdecl DrawManaFlask() { int v0; // eax @@ -1121,7 +1105,6 @@ void __cdecl DrawManaFlask() DrawFlask(pBtmBuff, 640, 640 * v2 + 2395, gpBuffer, 768 * v2 + 383771, 13 - v2); } -//----- (004044F6) -------------------------------------------------------- void __cdecl control_update_life_mana() { int v0; // esi @@ -1144,7 +1127,6 @@ void __cdecl control_update_life_mana() plr[v0]._pHPPer = (signed __int64)((double)plr[v0]._pHitPoints / (double)plr[v0]._pMaxHP * 80.0); } -//----- (0040456A) -------------------------------------------------------- void __cdecl UpdateManaFlask() { signed int v0; // edi @@ -1171,7 +1153,6 @@ void __cdecl UpdateManaFlask() DrawSpell(); } -//----- (00404616) -------------------------------------------------------- void __cdecl InitControlPan() { size_t v0; // esi @@ -1284,7 +1265,6 @@ void __cdecl InitControlPan() // 4B8C98: using guessed type int spselflag; // 679660: using guessed type char gbMaxPlayers; -//----- (00404934) -------------------------------------------------------- void __cdecl ClearCtrlPan() { DrawPanelBox(0, sgbPlrTalkTbl + 16, 0x280u, 0x80u, 64, 512); @@ -1292,7 +1272,6 @@ void __cdecl ClearCtrlPan() } // 4B8840: using guessed type int sgbPlrTalkTbl; -//----- (00404959) -------------------------------------------------------- void __cdecl DrawCtrlPan() { signed int v0; // edi @@ -1326,7 +1305,6 @@ void __cdecl DrawCtrlPan() // 484368: using guessed type int FriendlyMode; // 4B8A7C: using guessed type int numpanbtns; -//----- (00404A0A) -------------------------------------------------------- void __cdecl DoSpeedBook() { int v0; // eax @@ -1421,7 +1399,6 @@ void __cdecl DoSpeedBook() } // 4B8C98: using guessed type int spselflag; -//----- (00404B52) -------------------------------------------------------- void __cdecl DoPanBtn() { int v0; // edx @@ -1465,7 +1442,6 @@ void __cdecl DoPanBtn() // 4B8C90: using guessed type int panbtndown; // 4B8C98: using guessed type int spselflag; -//----- (00404BEB) -------------------------------------------------------- void __fastcall control_set_button_down(int btn_id) { panbtn[btn_id] = 1; @@ -1474,7 +1450,6 @@ void __fastcall control_set_button_down(int btn_id) } // 4B8C90: using guessed type int panbtndown; -//----- (00404C00) -------------------------------------------------------- void __cdecl control_check_btn_press() { int v0; // edx @@ -1498,7 +1473,6 @@ void __cdecl control_check_btn_press() } } -//----- (00404C74) -------------------------------------------------------- void __cdecl DoAutoMap() { if ( currlevel || gbMaxPlayers != 1 ) @@ -1515,7 +1489,6 @@ void __cdecl DoAutoMap() } // 679660: using guessed type char gbMaxPlayers; -//----- (00404CA0) -------------------------------------------------------- void __cdecl CheckPanelInfo() { int v0; // edi @@ -1656,7 +1629,6 @@ LABEL_54: // 4B8C98: using guessed type int spselflag; // 4B8CB8: using guessed type char pcursinvitem; -//----- (00404FE4) -------------------------------------------------------- void __cdecl CheckBtnUp() { signed int v0; // esi @@ -1753,7 +1725,6 @@ void __cdecl CheckBtnUp() // 646D00: using guessed type char qtextflag; // 69BD04: using guessed type int questlog; -//----- (00405181) -------------------------------------------------------- void __cdecl FreeControlPan() { void *v0; // ecx @@ -1823,7 +1794,6 @@ void __cdecl FreeControlPan() mem_free_dbg(v15); } -//----- (00405295) -------------------------------------------------------- int __fastcall control_WriteStringToBuffer(char *str) { signed int v1; // edx @@ -1842,7 +1812,6 @@ int __fastcall control_WriteStringToBuffer(char *str) return 0; } -//----- (004052C8) -------------------------------------------------------- void __cdecl DrawInfoBox() { int v0; // ecx @@ -1978,7 +1947,6 @@ LABEL_33: // 4B8CC2: using guessed type char pcursplr; // 5BB1ED: using guessed type char leveltype; -//----- (004055BC) -------------------------------------------------------- void __fastcall control_print_info_str(int y, char *str, bool center, int lines) { int v4; // edi @@ -2036,7 +2004,6 @@ LABEL_14: } // 4B883C: using guessed type int infoclr; -//----- (00405681) -------------------------------------------------------- void __fastcall PrintGameStr(int x, int y, char *str, int color) { char *v4; // edi @@ -2056,7 +2023,6 @@ void __fastcall PrintGameStr(int x, int y, char *str, int color) } } -//----- (004056D8) -------------------------------------------------------- void __cdecl DrawChr() { char v0; // al @@ -2307,7 +2273,6 @@ void __cdecl DrawChr() ADD_PlrStringXY(143, 332, 174, a4, a5[0]); } -//----- (00406058) -------------------------------------------------------- void __fastcall ADD_PlrStringXY(int x, int y, int width, char *pszStr, char col) { int v5; // eax @@ -2359,7 +2324,6 @@ void __fastcall ADD_PlrStringXY(int x, int y, int width, char *pszStr, char col) } } -//----- (0040610F) -------------------------------------------------------- void __fastcall MY_PlrStringXY(int x, int y, int width, char *pszStr, char col, int base) { char *v6; // ebx @@ -2411,7 +2375,6 @@ void __fastcall MY_PlrStringXY(int x, int y, int width, char *pszStr, char col, } } -//----- (004061CA) -------------------------------------------------------- void __cdecl CheckLvlBtn() { if ( !lvlbtndown && MouseX >= 40 && MouseX <= 81 && MouseY >= 313 && MouseY <= 335 ) @@ -2419,7 +2382,6 @@ void __cdecl CheckLvlBtn() } // 4B851C: using guessed type int lvlbtndown; -//----- (00406200) -------------------------------------------------------- void __cdecl ReleaseLvlBtn() { if ( MouseX >= 40 && MouseX <= 81 && MouseY >= 313 && MouseY <= 335 ) @@ -2428,7 +2390,6 @@ void __cdecl ReleaseLvlBtn() } // 4B851C: using guessed type int lvlbtndown; -//----- (00406234) -------------------------------------------------------- void __cdecl DrawLevelUpIcon() { int v0; // esi @@ -2443,7 +2404,6 @@ void __cdecl DrawLevelUpIcon() // 4B851C: using guessed type int lvlbtndown; // 6AA705: using guessed type char stextflag; -//----- (0040627A) -------------------------------------------------------- void __cdecl CheckChrBtns() { int v0; // esi @@ -2519,7 +2479,6 @@ LABEL_12: } // 4B87A8: using guessed type int chrbtnactive; -//----- (00406366) -------------------------------------------------------- void __cdecl ReleaseChrBtns() { signed int v0; // esi @@ -2577,7 +2536,6 @@ LABEL_16: } // 4B87A8: using guessed type int chrbtnactive; -//----- (00406408) -------------------------------------------------------- void __cdecl DrawDurIcon() { int v0; // edx @@ -2601,7 +2559,6 @@ void __cdecl DrawDurIcon() // 4B8968: using guessed type int sbookflag; // 69BD04: using guessed type int questlog; -//----- (0040648E) -------------------------------------------------------- int __fastcall DrawDurIcon4Item(ItemStruct *pItem, int x, int c) { int v3; // eax @@ -2668,7 +2625,6 @@ LABEL_18: return v4 - 40; } -//----- (00406508) -------------------------------------------------------- void __cdecl RedBack() { int v0; // eax @@ -2732,7 +2688,6 @@ void __cdecl RedBack() // 525728: using guessed type int light4flag; // 5BB1ED: using guessed type char leveltype; -//----- (00406592) -------------------------------------------------------- int __fastcall GetSBookTrans(int ii, unsigned char townok) { int v2; // edi @@ -2764,7 +2719,6 @@ int __fastcall GetSBookTrans(int ii, unsigned char townok) return result; } -//----- (00406667) -------------------------------------------------------- void __cdecl DrawSpellBook() { int v0; // edi @@ -2844,7 +2798,6 @@ void __cdecl DrawSpellBook() } // 4B8950: using guessed type int sbooktab; -//----- (004068F4) -------------------------------------------------------- void __fastcall PrintSBookStr(int x, int y, bool cjustflag, char *pszStr, int bright) { char *v5; // ebx @@ -2897,7 +2850,6 @@ LABEL_14: } } -//----- (004069B6) -------------------------------------------------------- void __cdecl CheckSBook() { signed int v0; // ecx @@ -2942,7 +2894,6 @@ void __cdecl CheckSBook() // 4B8950: using guessed type int sbooktab; // 52571C: using guessed type int drawpanflag; -//----- (00406AF8) -------------------------------------------------------- char *__fastcall get_pieces_str(int nGold) { char *result; // eax @@ -2953,7 +2904,6 @@ char *__fastcall get_pieces_str(int nGold) return result; } -//----- (00406B08) -------------------------------------------------------- void __fastcall DrawGoldSplit(int amount) { int v1; // ebp @@ -2992,7 +2942,6 @@ void __fastcall DrawGoldSplit(int amount) frame_4B8800 = (frame_4B8800 & 7) + 1; } -//----- (00406C40) -------------------------------------------------------- void __fastcall control_drop_gold(int vkey) { char v1; // bl @@ -3053,7 +3002,6 @@ void __fastcall control_drop_gold(int vkey) // 4B84DC: using guessed type int dropGoldFlag; // 406C40: using guessed type char var_8[8]; -//----- (00406D6E) -------------------------------------------------------- void __fastcall control_remove_gold(int pnum, int gold_index) { int v2; // edi @@ -3096,7 +3044,6 @@ void __fastcall control_remove_gold(int pnum, int gold_index) plr[v3]._pGold = v8; } -//----- (00406E24) -------------------------------------------------------- void __fastcall control_set_gold_curs(int pnum) { int v1; // ecx @@ -3127,7 +3074,6 @@ void __fastcall control_set_gold_curs(int pnum) SetCursor(*v3 + 12); } -//----- (00406E6A) -------------------------------------------------------- void __cdecl DrawTalkPan() { int v0; // esi @@ -3216,7 +3162,6 @@ LABEL_18: // 4B8840: using guessed type int sgbPlrTalkTbl; // 4B8960: using guessed type int talkflag; -//----- (00407071) -------------------------------------------------------- char *__fastcall control_print_talk_msg(char *msg, int x, int y, int *a4, int just) { int v5; // edx @@ -3253,7 +3198,6 @@ char *__fastcall control_print_talk_msg(char *msg, int x, int y, int *a4, int ju return v6; } -//----- (004070F3) -------------------------------------------------------- int __cdecl control_check_talk_btn() { int v0; // ecx @@ -3279,7 +3223,6 @@ int __cdecl control_check_talk_btn() } // 4B8960: using guessed type int talkflag; -//----- (0040714D) -------------------------------------------------------- void __cdecl control_release_talk_btn() { signed int v0; // ecx @@ -3312,7 +3255,6 @@ void __cdecl control_release_talk_btn() } // 4B8960: using guessed type int talkflag; -//----- (004071C0) -------------------------------------------------------- void __cdecl control_reset_talk_msg() { int v0; // edi @@ -3331,7 +3273,6 @@ void __cdecl control_reset_talk_msg() NetSendCmdString(v0, sgszTalkMsg); } -//----- (004071FA) -------------------------------------------------------- void __cdecl control_type_message() { if ( gbMaxPlayers != 1 ) @@ -3354,7 +3295,6 @@ void __cdecl control_type_message() // 52571C: using guessed type int drawpanflag; // 679660: using guessed type char gbMaxPlayers; -//----- (00407241) -------------------------------------------------------- void __cdecl control_reset_talk() { talkflag = 0; @@ -3365,7 +3305,6 @@ void __cdecl control_reset_talk() // 4B8960: using guessed type int talkflag; // 52571C: using guessed type int drawpanflag; -//----- (0040725A) -------------------------------------------------------- int __fastcall control_talk_last_key(int a1) { char v1; // bl @@ -3385,7 +3324,6 @@ int __fastcall control_talk_last_key(int a1) // 4B8960: using guessed type int talkflag; // 679660: using guessed type char gbMaxPlayers; -//----- (0040729A) -------------------------------------------------------- int __fastcall control_presskeys(int a1) { signed int v1; // eax @@ -3424,7 +3362,6 @@ LABEL_15: // 4B8960: using guessed type int talkflag; // 679660: using guessed type char gbMaxPlayers; -//----- (00407304) -------------------------------------------------------- void __cdecl control_press_enter() { signed int v0; // esi @@ -3472,7 +3409,6 @@ void __cdecl control_press_enter() // 4B84CC: using guessed type char sgbNextTalkSave; // 4B84CD: using guessed type char sgbTalkSavePos; -//----- (004073C2) -------------------------------------------------------- void __fastcall control_up_down(char a1) { unsigned char v1; // al diff --git a/Source/control.h b/Source/control.h index 44a1802..3c9b67f 100644 --- a/Source/control.h +++ b/Source/control.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __CONTROL_H__ +#define __CONTROL_H__ -//control extern char sgbNextTalkSave; // weak extern char sgbTalkSavePos; // weak extern void *pDurIcons; @@ -136,3 +137,5 @@ extern char *PanBtnHotKey[8]; extern char *PanBtnStr[8]; extern RECT32 attribute_inc_rects[4]; extern int SpellPages[6][7]; + +#endif /* __CONTROL_H__ */ diff --git a/Source/cursor.cpp b/Source/cursor.cpp index 61311db..3b5e199 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -388,14 +388,12 @@ int InvItemHeight[180] = 84 }; -//----- (0040740A) -------------------------------------------------------- void __cdecl InitCursor() { pCursCels = LoadFileInMem("Data\\Inv\\Objcurs.CEL", 0); ClearCursor(); } -//----- (00407420) -------------------------------------------------------- void __cdecl FreeCursor() { void *v0; // ecx @@ -406,7 +404,6 @@ void __cdecl FreeCursor() ClearCursor(); } -//----- (00407437) -------------------------------------------------------- void __fastcall SetICursor(int i) { int v1; // ecx @@ -420,7 +417,6 @@ void __fastcall SetICursor(int i) // 4B8CB4: using guessed type int icursH; // 4B8CBC: using guessed type int icursW; -//----- (0040746B) -------------------------------------------------------- void __fastcall SetCursor(int i) { int v1; // eax @@ -433,7 +429,6 @@ void __fastcall SetCursor(int i) } // 4B8C9C: using guessed type int cursH; -//----- (00407493) -------------------------------------------------------- void __cdecl InitLevelCursor() { SetCursor(CURSOR_HAND); @@ -451,7 +446,6 @@ void __cdecl InitLevelCursor() // 4B8CC2: using guessed type char pcursplr; // 4B8CCC: using guessed type int dword_4B8CCC; -//----- (004074D0) -------------------------------------------------------- void __cdecl CheckTown() { int v0; // ecx @@ -495,7 +489,6 @@ void __cdecl CheckTown() } } -//----- (004075FD) -------------------------------------------------------- void __cdecl CheckRportal() { int v0; // ecx @@ -543,7 +536,6 @@ void __cdecl CheckRportal() } // 5CF31D: using guessed type char setlevel; -//----- (00407729) -------------------------------------------------------- void __cdecl CheckCursMove() { int v0; // esi diff --git a/Source/cursor.h b/Source/cursor.h index 57cad22..7542ded 100644 --- a/Source/cursor.h +++ b/Source/cursor.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __CURSOR_H__ +#define __CURSOR_H__ -//cursor extern int cursH; // weak extern int icursH28; // idb extern int cursW; // idb @@ -31,3 +32,5 @@ void __cdecl CheckCursMove(); /* data */ extern int InvItemWidth[180]; extern int InvItemHeight[180]; + +#endif /* __CURSOR_H__ */ diff --git a/Source/dead.cpp b/Source/dead.cpp index e59889b..90fd29a 100644 --- a/Source/dead.cpp +++ b/Source/dead.cpp @@ -6,7 +6,6 @@ int spurtndx; // weak DeadStruct dead[31]; int stonendx; -//----- (004084A6) -------------------------------------------------------- void __cdecl InitDead() { int v0; // ebx @@ -108,13 +107,11 @@ void __cdecl InitDead() } // 4B8CD8: using guessed type int spurtndx; -//----- (0040865C) -------------------------------------------------------- void __fastcall AddDead(int dx, int dy, char dv, int ddir) { dDead[dx][dy] = (dv & 0x1F) + 32 * ddir; } -//----- (0040867D) -------------------------------------------------------- void __cdecl SetDead() { int v0; // eax diff --git a/Source/dead.h b/Source/dead.h index 16a8e61..dfb9de0 100644 --- a/Source/dead.h +++ b/Source/dead.h @@ -1,10 +1,13 @@ //HEADER_GOES_HERE +#ifndef __DEAD_H__ +#define __DEAD_H__ -//dead extern int spurtndx; // weak extern DeadStruct dead[31]; extern int stonendx; void __cdecl InitDead(); void __fastcall AddDead(int dx, int dy, char dv, int ddir); -void __cdecl SetDead(); \ No newline at end of file +void __cdecl SetDead(); + +#endif /* __DEAD_H__ */ diff --git a/Source/debug.cpp b/Source/debug.cpp index 3a4977a..0b2fcbe 100644 --- a/Source/debug.cpp +++ b/Source/debug.cpp @@ -6,7 +6,6 @@ void *pSquareCel; char dMonsDbg[17][112][112]; char dFlagDbg[17][112][112]; -//----- (004086F4) -------------------------------------------------------- void __cdecl LoadDebugGFX() { if ( visiondebug ) @@ -14,7 +13,6 @@ void __cdecl LoadDebugGFX() } // 525720: using guessed type int visiondebug; -//----- (0040870F) -------------------------------------------------------- void __cdecl FreeDebugGFX() { void *v0; // ecx @@ -24,7 +22,6 @@ void __cdecl FreeDebugGFX() mem_free_dbg(v0); } -//----- (00408721) -------------------------------------------------------- void __cdecl CheckDungeonClear() { int i; diff --git a/Source/debug.h b/Source/debug.h index d6bcf90..26b6152 100644 --- a/Source/debug.h +++ b/Source/debug.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DEBUG_H__ +#define __DEBUG_H__ -//debug extern void *pSquareCel; extern char dMonsDbg[17][112][112]; extern char dFlagDbg[17][112][112]; @@ -18,4 +19,6 @@ void __cdecl PrintDebugQuest(); void __fastcall PrintDebugMonster(int m); void __cdecl GetDebugMonster(); void __cdecl NextDebugMonster(); -#endif \ No newline at end of file +#endif + +#endif /* __DEBUG_H__ */ diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 4835a47..9a61fd6 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -67,7 +67,6 @@ char *spszMsgTbl[4] = }; // weak char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" }; // weak -//----- (004087B6) -------------------------------------------------------- struct diablo_cpp_init { diablo_cpp_init() @@ -78,7 +77,6 @@ struct diablo_cpp_init // 479BF8: using guessed type int diablo_inf; // 525514: using guessed type int diablo_cpp_init_value; -//----- (004087C1) -------------------------------------------------------- void __cdecl FreeGameMem() { void *v0; // ecx @@ -110,7 +108,6 @@ void __cdecl FreeGameMem() FreeTownerGFX(); } -//----- (00408838) -------------------------------------------------------- int __fastcall diablo_init_menu(int a1, int bSinglePlayer) { int v2; // esi @@ -149,7 +146,6 @@ LABEL_11: // 5256E8: using guessed type int dword_5256E8; // 678640: using guessed type char byte_678640; -//----- (004088E2) -------------------------------------------------------- void __fastcall run_game_loop(int uMsg) { //int v3; // eax @@ -235,7 +231,6 @@ void __fastcall run_game_loop(int uMsg) // 52571C: using guessed type int drawpanflag; // 679660: using guessed type char gbMaxPlayers; -//----- (00408A8C) -------------------------------------------------------- void __fastcall start_game(int uMsg) { cineflag = 0; @@ -255,7 +250,6 @@ void __fastcall start_game(int uMsg) // 525718: using guessed type char cineflag; // 525748: using guessed type char sgbMouseDown; -//----- (00408ADB) -------------------------------------------------------- void __cdecl free_game() { int i; // esi @@ -276,7 +270,6 @@ void __cdecl free_game() FreeGameMem(); } -//----- (00408B1E) -------------------------------------------------------- bool __cdecl diablo_get_not_running() { SetLastError(0); @@ -284,7 +277,6 @@ bool __cdecl diablo_get_not_running() return GetLastError() != ERROR_ALREADY_EXISTS; } -//----- (00408B4A) -------------------------------------------------------- int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { HINSTANCE v4; // esi @@ -350,7 +342,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine return 0; } -//----- (00408CB1) -------------------------------------------------------- void __fastcall diablo_parse_flags(char *args) { #ifdef _DEBUG @@ -477,7 +468,6 @@ void __fastcall diablo_parse_flags(char *args) // 52A548: using guessed type char gbBackBuf; // 52A549: using guessed type char gbEmulate; -//----- (00408D61) -------------------------------------------------------- void __cdecl diablo_init_screen() { int v0; // ecx @@ -503,7 +493,6 @@ void __cdecl diablo_init_screen() } // 69CEFC: using guessed type int scrollrt_cpp_init_value; -//----- (00408DB1) -------------------------------------------------------- HWND __fastcall diablo_find_window(LPCSTR lpClassName) { HWND result; // eax @@ -528,7 +517,6 @@ HWND __fastcall diablo_find_window(LPCSTR lpClassName) return result; } -//----- (00408DF4) -------------------------------------------------------- void __fastcall diablo_reload_process(HMODULE hModule) { char *i; // eax @@ -614,7 +602,6 @@ LABEL_23: } } -//----- (00408FCF) -------------------------------------------------------- int __cdecl PressEscKey() { int result; // eax @@ -674,7 +661,6 @@ LABEL_10: // 646D00: using guessed type char qtextflag; // 6AA705: using guessed type char stextflag; -//----- (0040905E) -------------------------------------------------------- LRESULT __stdcall DisableInputWndProc(HWND hWnd, int uMsg, int wParam, int lParam) { bool v5; // zf @@ -737,7 +723,6 @@ LABEL_23: } // 525748: using guessed type char sgbMouseDown; -//----- (00409131) -------------------------------------------------------- int __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if ( uMsg > WM_LBUTTONDOWN ) @@ -854,7 +839,6 @@ int __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) // 525748: using guessed type char sgbMouseDown; // 679660: using guessed type char gbMaxPlayers; -//----- (004093B2) -------------------------------------------------------- bool __fastcall LeftMouseDown(int a1) { int v1; // edi @@ -1059,7 +1043,6 @@ LABEL_98: // 69BD04: using guessed type int questlog; // 6AA705: using guessed type char stextflag; -//----- (004097EC) -------------------------------------------------------- bool __cdecl TryIconCurs() { unsigned char v0; // dl @@ -1137,7 +1120,6 @@ LABEL_26: // 4B8CC1: using guessed type char pcursobj; // 4B8CC2: using guessed type char pcursplr; -//----- (00409963) -------------------------------------------------------- void __cdecl LeftMouseUp() { gmenu_left_mouse(0); @@ -1156,7 +1138,6 @@ void __cdecl LeftMouseUp() // 4B8C90: using guessed type int panbtndown; // 6AA705: using guessed type char stextflag; -//----- (004099A8) -------------------------------------------------------- void __cdecl RightMouseDown() { if ( !gmenu_exception() && sgnTimeoutCurs == CURSOR_NONE && PauseMode != 2 && !plr[myplr]._pInvincible ) @@ -1196,7 +1177,6 @@ void __cdecl RightMouseDown() // 52575C: using guessed type int doomflag; // 6AA705: using guessed type char stextflag; -//----- (00409A8E) -------------------------------------------------------- bool __fastcall PressSysKey(int wParam) { if ( gmenu_exception() || wParam != VK_F10 ) @@ -1205,7 +1185,6 @@ bool __fastcall PressSysKey(int wParam) return 1; } -//----- (00409AB0) -------------------------------------------------------- void __fastcall diablo_hotkey_msg(int dwMsg) { int v1; // esi @@ -1230,14 +1209,12 @@ void __fastcall diablo_hotkey_msg(int dwMsg) // 48437C: using guessed type char *spszMsgKeyTbl[4]; // 679660: using guessed type char gbMaxPlayers; -//----- (00409B51) -------------------------------------------------------- void __fastcall ReleaseKey(int vkey) { if ( vkey == VK_SNAPSHOT ) CaptureScreen(); } -//----- (00409B5C) -------------------------------------------------------- void __fastcall PressKey(int vkey) { int v1; // esi @@ -1482,7 +1459,6 @@ LABEL_101: // 69BD04: using guessed type int questlog; // 6AA705: using guessed type char stextflag; -//----- (00409F43) -------------------------------------------------------- void __cdecl diablo_pause_game() { if ( (unsigned char)gbMaxPlayers <= 1u ) @@ -1504,7 +1480,6 @@ void __cdecl diablo_pause_game() // 525740: using guessed type int PauseMode; // 679660: using guessed type char gbMaxPlayers; -//----- (00409F7F) -------------------------------------------------------- void __fastcall PressChar(int vkey) { int v1; // ebx @@ -1816,7 +1791,6 @@ LABEL_27: // 69BD04: using guessed type int questlog; // 6AA705: using guessed type char stextflag; -//----- (0040A391) -------------------------------------------------------- void __cdecl LoadLvlGFX() { unsigned char *v0; // eax @@ -1877,7 +1851,6 @@ LABEL_14: } // 5BB1ED: using guessed type char leveltype; -//----- (0040A4B4) -------------------------------------------------------- void __cdecl LoadAllGFX() { pSpeedCels = DiabloAllocPtr(0x100000); @@ -1889,7 +1862,6 @@ void __cdecl LoadAllGFX() IncProgress(); } -//----- (0040A4E1) -------------------------------------------------------- void __fastcall CreateLevel(int lvldir) { int hnd; // cl @@ -1934,7 +1906,6 @@ void __fastcall CreateLevel(int lvldir) } // 5BB1ED: using guessed type char leveltype; -//----- (0040A5A4) -------------------------------------------------------- void __fastcall LoadGameLevel(bool firstflag, int lvldir) { int v2; // ebp @@ -2172,7 +2143,6 @@ LABEL_72: // 5CF31D: using guessed type char setlevel; // 679660: using guessed type char gbMaxPlayers; -//----- (0040AAE3) -------------------------------------------------------- void __fastcall game_loop(bool startup) { int v1; // ecx @@ -2208,7 +2178,6 @@ void __fastcall game_loop(bool startup) // 525650: using guessed type int gbRunGame; // 679660: using guessed type char gbMaxPlayers; -//----- (0040AB33) -------------------------------------------------------- void __cdecl game_logic() { if ( PauseMode != 2 ) @@ -2266,7 +2235,6 @@ void __cdecl game_logic() // 5BB1ED: using guessed type char leveltype; // 679660: using guessed type char gbMaxPlayers; -//----- (0040ABE7) -------------------------------------------------------- void __fastcall timeout_cursor(bool timeout) { if ( timeout ) @@ -2294,7 +2262,6 @@ void __fastcall timeout_cursor(bool timeout) // 52571C: using guessed type int drawpanflag; // 525748: using guessed type char sgbMouseDown; -//----- (0040AC6B) -------------------------------------------------------- void __cdecl diablo_color_cyc_logic() { DWORD v0; // eax diff --git a/Source/diablo.h b/Source/diablo.h index b505dcf..fe8ba0a 100644 --- a/Source/diablo.h +++ b/Source/diablo.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DIABLO_H__ +#define __DIABLO_H__ -//diablo extern int diablo_cpp_init_value; // weak extern HWND ghMainWnd; extern int glMid1Seed[17]; @@ -96,3 +97,5 @@ extern int framestart; extern int FriendlyMode; // weak extern char *spszMsgTbl[4]; // weak extern char *spszMsgKeyTbl[4]; // weak + +#endif /* __DIABLO_H__ */ diff --git a/Source/doom.cpp b/Source/doom.cpp index 0daf4b8..2d0610d 100644 --- a/Source/doom.cpp +++ b/Source/doom.cpp @@ -8,7 +8,6 @@ void *pDoomCel; int doomflag; // weak int DoomQuestState; // idb -//----- (0040ACAD) -------------------------------------------------------- int __cdecl doom_get_frame_from_time() { int result; // eax @@ -20,13 +19,11 @@ int __cdecl doom_get_frame_from_time() return result; } -//----- (0040ACC6) -------------------------------------------------------- void __cdecl doom_alloc_cel() { pDoomCel = DiabloAllocPtr(229376); } -//----- (0040ACD6) -------------------------------------------------------- void __cdecl doom_cleanup() { void *v0; // ecx @@ -36,7 +33,6 @@ void __cdecl doom_cleanup() mem_free_dbg(v0); } -//----- (0040ACE8) -------------------------------------------------------- void __cdecl doom_load_graphics() { if ( doom_quest_time == 31 ) @@ -55,7 +51,6 @@ void __cdecl doom_load_graphics() } // 525750: using guessed type int doom_quest_time; -//----- (0040AD34) -------------------------------------------------------- void __cdecl doom_init() { int v0; // eax @@ -70,7 +65,6 @@ void __cdecl doom_init() // 525750: using guessed type int doom_quest_time; // 52575C: using guessed type int doomflag; -//----- (0040AD5E) -------------------------------------------------------- void __cdecl doom_close() { if ( doomflag ) @@ -81,7 +75,6 @@ void __cdecl doom_close() } // 52575C: using guessed type int doomflag; -//----- (0040AD74) -------------------------------------------------------- void __cdecl doom_draw() { if ( doomflag ) diff --git a/Source/doom.h b/Source/doom.h index ee6e28e..400f7c4 100644 --- a/Source/doom.h +++ b/Source/doom.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DOOM_H__ +#define __DOOM_H__ -//doom extern int doom_quest_time; // weak extern int doom_stars_drawn; // weak extern void *pDoomCel; @@ -13,4 +14,6 @@ void __cdecl doom_cleanup(); void __cdecl doom_load_graphics(); void __cdecl doom_init(); void __cdecl doom_close(); -void __cdecl doom_draw(); \ No newline at end of file +void __cdecl doom_draw(); + +#endif /* __DOOM_H__ */ diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp index b95c607..8c4ad45 100644 --- a/Source/drlg_l1.cpp +++ b/Source/drlg_l1.cpp @@ -110,7 +110,6 @@ unsigned char PWATERIN[] = { 6, 6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 1 /* rdata */ unsigned char L5ConvTbl[16] = { 22u, 13u, 1u, 13u, 2u, 13u, 13u, 13u, 4u, 13u, 1u, 13u, 2u, 13u, 16u, 13u }; -//----- (0040ADD6) -------------------------------------------------------- void __cdecl DRLG_Init_Globals() { char v0; // al @@ -132,7 +131,6 @@ void __cdecl DRLG_Init_Globals() // 525728: using guessed type int light4flag; // 646A28: using guessed type int lightflag; -//----- (0040AE79) -------------------------------------------------------- void __fastcall LoadL1Dungeon(char *sFileName, int vx, int vy) { char *v3; // esi @@ -222,7 +220,6 @@ void __fastcall LoadL1Dungeon(char *sFileName, int vx, int vy) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (0040AF65) -------------------------------------------------------- void __cdecl DRLG_L1Floor() { signed int i; // edi @@ -254,7 +251,6 @@ void __cdecl DRLG_L1Floor() while ( i < 40 ); } -//----- (0040AFB3) -------------------------------------------------------- void __cdecl DRLG_L1Pass3() { int v0; // eax @@ -338,7 +334,6 @@ void __cdecl DRLG_L1Pass3() while ( v4 < 40 ); } -//----- (0040B0A5) -------------------------------------------------------- void __cdecl DRLG_InitL1Vals() { int v0; // esi @@ -418,7 +413,6 @@ LABEL_23: while ( (signed int)v7 < (signed int)dPiece[1] ); } -//----- (0040B160) -------------------------------------------------------- void __fastcall LoadPreL1Dungeon(char *sFileName, int vx, int vy) { unsigned char *v3; // ebx @@ -514,7 +508,6 @@ void __fastcall LoadPreL1Dungeon(char *sFileName, int vx, int vy) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (0040B229) -------------------------------------------------------- void __fastcall CreateL5Dungeon(int rseed, int entry) { int v2; // esi @@ -539,7 +532,6 @@ void __fastcall CreateL5Dungeon(int rseed, int entry) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (0040B276) -------------------------------------------------------- void __cdecl DRLG_LoadL1SP() { setloadflag = 0; @@ -562,7 +554,6 @@ void __cdecl DRLG_LoadL1SP() // 5276A4: using guessed type int setloadflag; // 679660: using guessed type char gbMaxPlayers; -//----- (0040B2F4) -------------------------------------------------------- void __cdecl DRLG_FreeL1SP() { void *v0; // ecx @@ -572,7 +563,6 @@ void __cdecl DRLG_FreeL1SP() mem_free_dbg(v0); } -//----- (0040B306) -------------------------------------------------------- void __fastcall DRLG_L5(int entry) { signed int v1; // esi @@ -735,7 +725,6 @@ LABEL_34: DRLG_CheckQuests(setpc_x, setpc_y); } -//----- (0040B56F) -------------------------------------------------------- void __fastcall DRLG_PlaceDoor(int x, int y) { int v2; // edi @@ -831,7 +820,6 @@ LABEL_57: *v8 = -128; } -//----- (0040B699) -------------------------------------------------------- void __cdecl DRLG_L1Shadows() { signed int v0; // ebx @@ -973,7 +961,6 @@ void __cdecl DRLG_L1Shadows() while ( v10 < 40 ); } -//----- (0040B881) -------------------------------------------------------- int __fastcall DRLG_PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int noquad, int ldir) { unsigned char *v8; // ebx @@ -1201,7 +1188,6 @@ LABEL_57: // 5CF320: using guessed type int LvlViewY; // 5CF324: using guessed type int LvlViewX; -//----- (0040BAF6) -------------------------------------------------------- void __cdecl InitL5Dungeon() { signed int v0; // edx @@ -1226,7 +1212,6 @@ void __cdecl InitL5Dungeon() while ( v0 < 40 ); } -//----- (0040BB18) -------------------------------------------------------- void __cdecl L5ClearFlags() { signed int v0; // ecx @@ -1250,7 +1235,6 @@ void __cdecl L5ClearFlags() while ( v0 < 40 ); } -//----- (0040BB33) -------------------------------------------------------- void __cdecl L5firstRoom() { signed int v0; // ebx @@ -1348,7 +1332,6 @@ void __cdecl L5firstRoom() } } -//----- (0040BD66) -------------------------------------------------------- void __fastcall L5drawRoom(int x, int y, int w, int h) { int i; // esi @@ -1372,7 +1355,6 @@ void __fastcall L5drawRoom(int x, int y, int w, int h) } } -//----- (0040BD9D) -------------------------------------------------------- void __fastcall L5roomGen(int x, int y, int w, int h, bool dir) { int v5; // eax @@ -1490,7 +1472,6 @@ void __fastcall L5roomGen(int x, int y, int w, int h, bool dir) } } -//----- (0040BFA4) -------------------------------------------------------- bool __fastcall L5checkRoom(int x, int y, int width, int height) { int v4; // eax @@ -1523,7 +1504,6 @@ LABEL_10: return 0; } -//----- (0040C008) -------------------------------------------------------- int __cdecl L5GetArea() { int rv; // eax @@ -1551,7 +1531,6 @@ int __cdecl L5GetArea() return rv; } -//----- (0040C02A) -------------------------------------------------------- void __cdecl L5makeDungeon() { signed int v0; // edi @@ -1583,7 +1562,6 @@ void __cdecl L5makeDungeon() while ( v0 < 40 ); } -//----- (0040C06E) -------------------------------------------------------- void __cdecl L5makeDmt() { signed int v0; // ecx @@ -1636,7 +1614,6 @@ void __cdecl L5makeDmt() while ( v3 <= 77 ); } -//----- (0040C0E0) -------------------------------------------------------- void __cdecl L5AddWall() { int v0; // edi @@ -1707,7 +1684,6 @@ void __cdecl L5AddWall() while ( v0 < 40 ); } -//----- (0040C23C) -------------------------------------------------------- int __fastcall L5HWallOk(int i, int j) { int v2; // esi @@ -1759,7 +1735,6 @@ int __fastcall L5HWallOk(int i, int j) return result; } -//----- (0040C2DC) -------------------------------------------------------- int __fastcall L5VWallOk(int i, int j) { int v2; // ecx @@ -1800,7 +1775,6 @@ int __fastcall L5VWallOk(int i, int j) return result; } -//----- (0040C35B) -------------------------------------------------------- void __fastcall L5HorizWall(int i, int j, char p, int dx) { int v4; // edi @@ -1879,7 +1853,6 @@ void __fastcall L5HorizWall(int i, int j, char p, int dx) } } -//----- (0040C449) -------------------------------------------------------- void __fastcall L5VertWall(int i, int j, char p, int dy) { int v4; // edi @@ -1970,7 +1943,6 @@ void __fastcall L5VertWall(int i, int j, char p, int dy) } } -//----- (0040C551) -------------------------------------------------------- void __cdecl L5tileFix() { signed int v0; // esi @@ -2252,7 +2224,6 @@ void __cdecl L5tileFix() while ( v35 < 40 ); } -//----- (0040C8C0) -------------------------------------------------------- void __cdecl DRLG_L5Subs() { signed int v0; // edi @@ -2321,7 +2292,6 @@ LABEL_23: while ( v0 < 40 ); } -//----- (0040C99D) -------------------------------------------------------- void __cdecl L5FillChambers() { int v0; // edi @@ -2512,7 +2482,6 @@ LABEL_107: } // 5276A4: using guessed type int setloadflag; -//----- (0040CD86) -------------------------------------------------------- void __fastcall DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftflag, bool rightflag) { int v6; // eax @@ -2602,7 +2571,6 @@ void __fastcall DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, b dungeon[7][v15 + 7] = 15; } -//----- (0040CEC7) -------------------------------------------------------- void __fastcall DRLG_L5GHall(int x1, int y1, int x2, int y2) { int v4; // eax @@ -2642,7 +2610,6 @@ void __fastcall DRLG_L5GHall(int x1, int y1, int x2, int y2) } } -//----- (0040CF17) -------------------------------------------------------- void __fastcall DRLG_L5SetRoom(int rx1, int ry1) { int v2; // edi @@ -2695,7 +2662,6 @@ void __fastcall DRLG_L5SetRoom(int rx1, int ry1) // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (0040CF9C) -------------------------------------------------------- void __cdecl DRLG_L5FloodTVal() { int v0; // ebx @@ -2733,7 +2699,6 @@ void __cdecl DRLG_L5FloodTVal() } // 5A5590: using guessed type char TransVal; -//----- (0040D00B) -------------------------------------------------------- void __fastcall DRLG_L5FTVR(int i, int j, int x, int y, int d) { int v5; // ebx @@ -2839,7 +2804,6 @@ void __fastcall DRLG_L5FTVR(int i, int j, int x, int y, int d) } // 5A5590: using guessed type char TransVal; -//----- (0040D1FB) -------------------------------------------------------- void __cdecl DRLG_L5TransFix() { signed int v0; // esi @@ -2906,7 +2870,6 @@ void __cdecl DRLG_L5TransFix() while ( v0 < 40 ); } -//----- (0040D283) -------------------------------------------------------- void __cdecl DRLG_L5DirtFix() { signed int v0; // ecx @@ -2941,7 +2904,6 @@ void __cdecl DRLG_L5DirtFix() while ( v0 < 40 ); } -//----- (0040D2EF) -------------------------------------------------------- void __cdecl DRLG_L5CornerFix() { signed int v0; // esi diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h index d741c91..6997cbe 100644 --- a/Source/drlg_l1.h +++ b/Source/drlg_l1.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DRLG_L1_H__ +#define __DRLG_L1_H__ -//drlg_l1 extern char L5dungeon[80][80]; extern char mydflags[40][40]; extern int setloadflag; // weak @@ -63,3 +64,5 @@ extern unsigned char PWATERIN[]; /* rdata */ extern unsigned char L5ConvTbl[16]; + +#endif /* __DRLG_L1_H__ */ diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp index dfbfb4a..155d8a1 100644 --- a/Source/drlg_l2.cpp +++ b/Source/drlg_l2.cpp @@ -235,7 +235,6 @@ int Patterns[100][10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -//----- (0040D357) -------------------------------------------------------- void __cdecl InitDungeon() { signed int v0; // edx @@ -260,7 +259,6 @@ void __cdecl InitDungeon() while ( v0 < 40 ); } -//----- (0040D379) -------------------------------------------------------- void __cdecl L2LockoutFix() { int i; // ecx @@ -333,7 +331,6 @@ void __cdecl L2LockoutFix() } } -//----- (0040D4CC) -------------------------------------------------------- void __cdecl L2DoorFix() { signed int v0; // ecx @@ -360,7 +357,6 @@ void __cdecl L2DoorFix() while ( v0 < 40 ); } -//----- (0040D501) -------------------------------------------------------- void __fastcall LoadL2Dungeon(char *sFileName, int vx, int vy) { char *v3; // esi @@ -541,7 +537,6 @@ void __fastcall LoadL2Dungeon(char *sFileName, int vx, int vy) mem_free_dbg(ptr); } -//----- (0040D6C1) -------------------------------------------------------- void __cdecl DRLG_L2Pass3() { int v0; // eax @@ -625,7 +620,6 @@ void __cdecl DRLG_L2Pass3() while ( v4 < 40 ); } -//----- (0040D7B3) -------------------------------------------------------- void __fastcall LoadPreL2Dungeon(char *sFileName, int vx, int vy) { char *v3; // esi @@ -737,7 +731,6 @@ void __fastcall LoadPreL2Dungeon(char *sFileName, int vx, int vy) mem_free_dbg(ptr); } -//----- (0040D888) -------------------------------------------------------- void __fastcall CreateL2Dungeon(int rseed, int entry) { int v2; // esi @@ -793,7 +786,6 @@ LABEL_10: // 5D245C: using guessed type int dminy; // 679660: using guessed type char gbMaxPlayers; -//----- (0040D94F) -------------------------------------------------------- void __cdecl DRLG_LoadL2SP() { char *v1; // ecx @@ -821,7 +813,6 @@ void __cdecl DRLG_LoadL2SP() } // 5B50D8: using guessed type int setloadflag_2; -//----- (0040D9A4) -------------------------------------------------------- void __cdecl DRLG_FreeL2SP() { char *v0; // ecx @@ -831,7 +822,6 @@ void __cdecl DRLG_FreeL2SP() mem_free_dbg(v0); } -//----- (0040D9B6) -------------------------------------------------------- void __fastcall DRLG_L2(int entry) { int v1; // esi @@ -1043,7 +1033,6 @@ LABEL_21: } // 5B50D8: using guessed type int setloadflag_2; -//----- (0040E074) -------------------------------------------------------- bool __fastcall DRLG_L2PlaceMiniSet(char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir) { int v7; // ebx @@ -1233,7 +1222,6 @@ bool __fastcall DRLG_L2PlaceMiniSet(char *miniset, int tmin, int tmax, int cx, i // 5CF320: using guessed type int LvlViewY; // 5CF324: using guessed type int LvlViewX; -//----- (0040E2D1) -------------------------------------------------------- void __fastcall DRLG_L2PlaceRndSet(char *miniset, int rndper) { char *v2; // ebx @@ -1402,7 +1390,6 @@ LABEL_34: // 5276CC: using guessed type int nSx2; // 5276D4: using guessed type int nSy2; -//----- (0040E49C) -------------------------------------------------------- void __cdecl DRLG_L2Subs() { signed int v0; // edi @@ -1469,7 +1456,6 @@ void __cdecl DRLG_L2Subs() // 5276CC: using guessed type int nSx2; // 5276D4: using guessed type int nSy2; -//----- (0040E59C) -------------------------------------------------------- void __cdecl DRLG_L2Shadows() { char *v0; // eax @@ -1538,7 +1524,6 @@ void __cdecl DRLG_L2Shadows() } // 48489A: using guessed type short word_48489A; -//----- (0040E66B) -------------------------------------------------------- void __fastcall DRLG_L2SetRoom(int rx1, int ry1) { int v2; // edi @@ -1591,7 +1576,6 @@ void __fastcall DRLG_L2SetRoom(int rx1, int ry1) // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (0040E6F0) -------------------------------------------------------- void __cdecl L2TileFix() { signed int v0; // edx @@ -1629,7 +1613,6 @@ void __cdecl L2TileFix() while ( v0 < 40 ); } -//----- (0040E74F) -------------------------------------------------------- bool __cdecl CreateDungeon() { int v0; // esi @@ -1747,7 +1730,6 @@ LABEL_12: return v8; } -//----- (0040E8A4) -------------------------------------------------------- void __fastcall CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir, int ForceHW, int nH, int nW) { int v9; // esi @@ -1980,7 +1962,6 @@ LABEL_7: // 5276CC: using guessed type int nSx2; // 5276D4: using guessed type int nSy2; -//----- (0040ECF9) -------------------------------------------------------- void __fastcall DefineRoom(int nX1, int nY1, int nX2, int nY2, int ForceHW) { int v5; // esi @@ -2063,7 +2044,6 @@ void __fastcall DefineRoom(int nX1, int nY1, int nX2, int nY2, int ForceHW) } } -//----- (0040EE1D) -------------------------------------------------------- void __fastcall AddHall(int nX1, int nY1, int nX2, int nY2, int nHd) { int v5; // edi @@ -2098,7 +2078,6 @@ void __fastcall AddHall(int nX1, int nY1, int nX2, int nY2, int nHd) } } -//----- (0040EEAC) -------------------------------------------------------- void __fastcall GetHall(int *nX1, int *nY1, int *nX2, int *nY2, int *nHd) { HALLNODE *v5; // esi @@ -2116,7 +2095,6 @@ void __fastcall GetHall(int *nX1, int *nY1, int *nX2, int *nY2, int *nHd) pHallList = v5; } -//----- (0040EF09) -------------------------------------------------------- void __fastcall ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd) { int v5; // edi @@ -2355,7 +2333,6 @@ LABEL_109: while ( !v34 ); } -//----- (0040F265) -------------------------------------------------------- void __fastcall CreateDoorType(int nX, int nY) { int v2; // eax @@ -2381,7 +2358,6 @@ void __fastcall CreateDoorType(int nX, int nY) *v4 = 68; } -//----- (0040F2BD) -------------------------------------------------------- void __fastcall PlaceHallExt(int nX, int nY) { char *v2; // eax @@ -2391,7 +2367,6 @@ void __fastcall PlaceHallExt(int nX, int nY) *v2 = 44; } -//----- (0040F2D0) -------------------------------------------------------- void __fastcall DoPatternCheck(int i, int j) { int v2; // edx @@ -2498,7 +2473,6 @@ LABEL_25: } } -//----- (0040F459) -------------------------------------------------------- bool __cdecl DL2_FillVoids() { int i; // eax @@ -2913,7 +2887,6 @@ LABEL_177: return DL2_NumNoChar() <= 700; } -//----- (0040F9B1) -------------------------------------------------------- bool __fastcall DL2_Cont(bool x1f, bool y1f, bool x2f, bool y2f) { bool v4; // zf @@ -2943,7 +2916,6 @@ LABEL_11: return 0; } -//----- (0040F9EE) -------------------------------------------------------- int __cdecl DL2_NumNoChar() { int result; // eax @@ -2971,7 +2943,6 @@ int __cdecl DL2_NumNoChar() return result; } -//----- (0040FA10) -------------------------------------------------------- void __fastcall DL2_DrawRoom(int x1, int y1, int x2, int y2) { int v4; // ebx @@ -3020,7 +2991,6 @@ void __fastcall DL2_DrawRoom(int x1, int y1, int x2, int y2) } } -//----- (0040FA97) -------------------------------------------------------- void __fastcall DL2_KnockWalls(int x1, int y1, int x2, int y2) { int v4; // esi @@ -3076,7 +3046,6 @@ void __fastcall DL2_KnockWalls(int x1, int y1, int x2, int y2) } } -//----- (0040FB6C) -------------------------------------------------------- void __cdecl DRLG_L2FloodTVal() { int v0; // ebx @@ -3114,7 +3083,6 @@ void __cdecl DRLG_L2FloodTVal() } // 5A5590: using guessed type char TransVal; -//----- (0040FBDB) -------------------------------------------------------- void __fastcall DRLG_L2FTVR(int i, int j, int x, int y, int d) { int v5; // ebx @@ -3220,7 +3188,6 @@ void __fastcall DRLG_L2FTVR(int i, int j, int x, int y, int d) } // 5A5590: using guessed type char TransVal; -//----- (0040FDCB) -------------------------------------------------------- void __cdecl DRLG_L2TransFix() { signed int v0; // esi @@ -3287,7 +3254,6 @@ void __cdecl DRLG_L2TransFix() while ( v0 < 40 ); } -//----- (0040FE53) -------------------------------------------------------- void __cdecl L2DirtFix() { signed int v0; // ecx @@ -3322,7 +3288,6 @@ void __cdecl L2DirtFix() while ( v0 < 40 ); } -//----- (0040FEBF) -------------------------------------------------------- void __cdecl DRLG_InitL2Vals() { int v0; // edi diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h index 7c28df6..456a546 100644 --- a/Source/drlg_l2.h +++ b/Source/drlg_l2.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DRLG_L2_H__ +#define __DRLG_L2_H__ -//drlg_l2 extern int nSx1; extern int nSx2; // weak extern int nSy1; @@ -167,4 +168,6 @@ extern unsigned char CTRDOOR5[]; extern unsigned char CTRDOOR6[]; extern unsigned char CTRDOOR7[]; extern unsigned char CTRDOOR8[]; -extern int Patterns[100][10]; \ No newline at end of file +extern int Patterns[100][10]; + +#endif /* __DRLG_L2_H__ */ diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp index febf139..ee44594 100644 --- a/Source/drlg_l3.cpp +++ b/Source/drlg_l3.cpp @@ -75,7 +75,6 @@ unsigned char L3SpawnTbl1[15] = { 0u, 10u, 67u, 5u, 44u, 6u, 9u, 0u, 0u, 28u, 13 unsigned char L3SpawnTbl2[15] = { 0u, 10u, 3u, 5u, 12u, 6u, 9u, 0u, 0u, 12u, 3u, 6u, 9u, 10u, 5u }; /* local spawntable? */ unsigned char L3PoolSub[15] = { 0u, 35u, 26u, 36u, 25u, 29u, 34u, 7u, 33u, 28u, 27u, 37u, 32u, 31u, 30u }; /* local poolsub? */ -//----- (0040FF81) -------------------------------------------------------- void __cdecl AddFenceDoors() { signed int v0; // esi @@ -121,7 +120,6 @@ void __cdecl AddFenceDoors() while ( v0 < 40 ); } -//----- (0040FFEC) -------------------------------------------------------- void __cdecl FenceDoorFix() { signed int v0; // edi @@ -193,7 +191,6 @@ void __cdecl FenceDoorFix() while ( v0 < 40 ); } -//----- (00410105) -------------------------------------------------------- int __cdecl DRLG_L3Anvil() { int v0; // esi @@ -289,7 +286,6 @@ int __cdecl DRLG_L3Anvil() // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (00410215) -------------------------------------------------------- void __cdecl FixL3Warp() { int v0; // ecx @@ -327,7 +323,6 @@ void __cdecl FixL3Warp() } } -//----- (0041027D) -------------------------------------------------------- void __cdecl FixL3HallofHeroes() { signed int v0; // ecx @@ -384,7 +379,6 @@ void __cdecl FixL3HallofHeroes() while ( v3 < 40 ); } -//----- (004102F1) -------------------------------------------------------- void __fastcall DRLG_L3LockRec(int x, int y) { int v2; // esi @@ -414,7 +408,6 @@ void __fastcall DRLG_L3LockRec(int x, int y) } // 528380: using guessed type int lockoutcnt; -//----- (00410344) -------------------------------------------------------- bool __cdecl DRLG_L3Lockout() { int v0; // esi @@ -456,7 +449,6 @@ bool __cdecl DRLG_L3Lockout() } // 528380: using guessed type int lockoutcnt; -//----- (004103A1) -------------------------------------------------------- void __fastcall CreateL3Dungeon(int rseed, int entry) { int v2; // esi @@ -502,7 +494,6 @@ void __fastcall CreateL3Dungeon(int rseed, int entry) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (0041044E) -------------------------------------------------------- void __fastcall DRLG_L3(int entry) { int x1; // esi @@ -663,7 +654,6 @@ LABEL_24: } // 528378: using guessed type char lavapool; -//----- (0041087F) -------------------------------------------------------- void __cdecl InitL3Dungeon() { int i; // edx @@ -681,7 +671,6 @@ void __cdecl InitL3Dungeon() } } -//----- (004108B5) -------------------------------------------------------- int __fastcall DRLG_L3FillRoom(int x1, int y1, int x2, int y2) { int v4; // esi @@ -796,7 +785,6 @@ LABEL_12: return 1; } -//----- (004109F0) -------------------------------------------------------- void __fastcall DRLG_L3CreateBlock(int x, int y, int obs, int dir) { int v4; // esi @@ -919,7 +907,6 @@ void __fastcall DRLG_L3CreateBlock(int x, int y, int obs, int dir) } } -//----- (00410BC0) -------------------------------------------------------- void __fastcall DRLG_L3FloorArea(int x1, int y1, int x2, int y2) { int i; // esi @@ -943,7 +930,6 @@ void __fastcall DRLG_L3FloorArea(int x1, int y1, int x2, int y2) } } -//----- (00410BF4) -------------------------------------------------------- void __cdecl DRLG_L3FillDiags() { signed int v0; // ebx @@ -990,7 +976,6 @@ LABEL_11: while ( v0 < 39 ); } -//----- (00410C65) -------------------------------------------------------- void __cdecl DRLG_L3FillSingles() { signed int v0; // ecx @@ -1020,7 +1005,6 @@ void __cdecl DRLG_L3FillSingles() while ( v0 < 39 ); } -//----- (00410CC4) -------------------------------------------------------- void __cdecl DRLG_L3FillStraights() { int v0; // esi @@ -1242,7 +1226,6 @@ void __cdecl DRLG_L3FillStraights() while ( v17 < 39 ); } -//----- (00410EDB) -------------------------------------------------------- void __cdecl DRLG_L3Edges() { char *v0; // eax @@ -1257,7 +1240,6 @@ void __cdecl DRLG_L3Edges() while ( (signed int)v0 < (signed int)&dungeon[40][39] ); } -//----- (00410EFC) -------------------------------------------------------- int __cdecl DRLG_L3GetFloorArea() { int gfa; // eax @@ -1275,7 +1257,6 @@ int __cdecl DRLG_L3GetFloorArea() return gfa; } -//----- (00410F1F) -------------------------------------------------------- void __cdecl DRLG_L3MakeMegas() { signed int v0; // edi @@ -1327,7 +1308,6 @@ LABEL_9: while ( (signed int)v5 < (signed int)&dungeon[40][39] ); } -//----- (00410FAD) -------------------------------------------------------- void __cdecl DRLG_L3River() { signed int v0; // ebx @@ -1763,7 +1743,6 @@ LABEL_148: // 410FAD: using guessed type int var_4E8[100]; // 410FAD: using guessed type int var_358[98]; -//----- (00411614) -------------------------------------------------------- void __cdecl DRLG_L3Pool() { int v0; // ebx @@ -1865,7 +1844,6 @@ void __cdecl DRLG_L3Pool() } // 528378: using guessed type char lavapool; -//----- (00411772) -------------------------------------------------------- int __fastcall DRLG_L3SpawnEdge(int x, int y, int *totarea) { int *v3; // ebp @@ -1936,7 +1914,6 @@ LABEL_18: return 1; } -//----- (0041189C) -------------------------------------------------------- int __fastcall DRLG_L3Spawn(int x, int y, int *totarea) { int v3; // edi @@ -1970,7 +1947,6 @@ int __fastcall DRLG_L3Spawn(int x, int y, int *totarea) return result; } -//----- (004119E0) -------------------------------------------------------- void __cdecl DRLG_L3PoolFix() { signed int v0; // esi @@ -2033,7 +2009,6 @@ void __cdecl DRLG_L3PoolFix() while ( v0 < 40 ); } -//----- (00411A74) -------------------------------------------------------- int __fastcall DRLG_L3PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir) { int v7; // ebx @@ -2207,7 +2182,6 @@ int __fastcall DRLG_L3PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, i // 5CF320: using guessed type int LvlViewY; // 5CF324: using guessed type int LvlViewX; -//----- (00411C83) -------------------------------------------------------- void __fastcall DRLG_L3PlaceRndSet(unsigned char *miniset, int rndper) { unsigned char *v2; // ebx @@ -2345,7 +2319,6 @@ LABEL_33: } } -//----- (00411E0E) -------------------------------------------------------- void __cdecl DRLG_L3Wood() { char *v0; // edi @@ -2649,7 +2622,6 @@ LABEL_112: FenceDoorFix(); } -//----- (0041223E) -------------------------------------------------------- bool __fastcall WoodVertU(int i, int y) { int v2; // eax @@ -2676,7 +2648,6 @@ bool __fastcall WoodVertU(int i, int y) return result; } -//----- (0041228A) -------------------------------------------------------- bool __fastcall WoodVertD(int i, int y) { int v2; // eax @@ -2703,7 +2674,6 @@ bool __fastcall WoodVertD(int i, int y) return result; } -//----- (004122CE) -------------------------------------------------------- bool __fastcall WoodHorizL(int x, int j) { int v2; // eax @@ -2730,7 +2700,6 @@ bool __fastcall WoodHorizL(int x, int j) return result; } -//----- (0041231A) -------------------------------------------------------- bool __fastcall WoodHorizR(int x, int j) { int v2; // eax @@ -2757,7 +2726,6 @@ bool __fastcall WoodHorizR(int x, int j) return result; } -//----- (0041235E) -------------------------------------------------------- void __cdecl DRLG_L3Pass3() { int v0; // eax @@ -2855,7 +2823,6 @@ void __cdecl DRLG_L3Pass3() while ( v4 < 40 ); } -//----- (00412466) -------------------------------------------------------- void __fastcall LoadL3Dungeon(char *sFileName, int vx, int vy) { char *v3; // esi @@ -2964,7 +2931,6 @@ void __fastcall LoadL3Dungeon(char *sFileName, int vx, int vy) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (004125B0) -------------------------------------------------------- void __fastcall LoadPreL3Dungeon(char *sFileName, int vx, int vy) { char *v3; // esi diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h index 24fb201..b20aa78 100644 --- a/Source/drlg_l3.h +++ b/Source/drlg_l3.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DRLG_L3_H__ +#define __DRLG_L3_H__ -//drlg_l3 extern char lavapool; // weak extern int abyssx; // weak extern int lockoutcnt; // weak @@ -82,3 +83,5 @@ extern unsigned char L3ANVIL[244]; extern unsigned char L3SpawnTbl1[15]; /* local spawntable? */ extern unsigned char L3SpawnTbl2[15]; /* local spawntable? */ extern unsigned char L3PoolSub[15]; /* local poolsub? */ + +#endif /* __DRLG_L3_H__ */ diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp index 9883cbc..416758b 100644 --- a/Source/drlg_l4.cpp +++ b/Source/drlg_l4.cpp @@ -295,7 +295,6 @@ unsigned char L4BTYPES[140] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -//----- (00412655) -------------------------------------------------------- void __cdecl DRLG_LoadL4SP() { setloadflag_2 = 0; @@ -313,7 +312,6 @@ void __cdecl DRLG_LoadL4SP() // 5B50D8: using guessed type int setloadflag_2; // 679660: using guessed type char gbMaxPlayers; -//----- (004126AD) -------------------------------------------------------- void __cdecl DRLG_FreeL4SP() { char *v0; // ecx @@ -323,7 +321,6 @@ void __cdecl DRLG_FreeL4SP() mem_free_dbg(v0); } -//----- (004126BF) -------------------------------------------------------- void __fastcall DRLG_L4SetSPRoom(int rx1, int ry1) { int v2; // edi @@ -376,7 +373,6 @@ void __fastcall DRLG_L4SetSPRoom(int rx1, int ry1) // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (00412744) -------------------------------------------------------- void __cdecl L4SaveQuads() { char *v0; // esi @@ -428,7 +424,6 @@ void __cdecl L4SaveQuads() // 528A34: using guessed type int l4holdx; // 528A38: using guessed type int l4holdy; -//----- (004127D3) -------------------------------------------------------- void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1) { int v3; // ebx @@ -475,7 +470,6 @@ void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1) } } -//----- (00412831) -------------------------------------------------------- void __fastcall DRLG_LoadDiabQuads(bool preflag) { bool v1; // esi @@ -523,7 +517,6 @@ void __fastcall DRLG_LoadDiabQuads(bool preflag) // 528A34: using guessed type int l4holdx; // 528A38: using guessed type int l4holdy; -//----- (00412933) -------------------------------------------------------- bool __fastcall IsDURWall(char d) { bool result; // al @@ -535,7 +528,6 @@ bool __fastcall IsDURWall(char d) return result; } -//----- (00412948) -------------------------------------------------------- bool __fastcall IsDLLWall(char dd) { bool result; // al @@ -547,7 +539,6 @@ bool __fastcall IsDLLWall(char dd) return result; } -//----- (0041295D) -------------------------------------------------------- void __cdecl L4FixRim() { char (*v0)[20]; // eax @@ -567,7 +558,6 @@ void __cdecl L4FixRim() } // 52A4DC: using guessed type int dword_52A4DC; -//----- (0041297B) -------------------------------------------------------- void __cdecl DRLG_L4GeneralFix() { signed int v0; // ecx @@ -592,7 +582,6 @@ void __cdecl DRLG_L4GeneralFix() while ( v0 < 39 ); } -//----- (004129B0) -------------------------------------------------------- void __fastcall CreateL4Dungeon(int rseed, int entry) { int v2; // esi @@ -617,7 +606,6 @@ void __fastcall CreateL4Dungeon(int rseed, int entry) // 5D2458: using guessed type int dminx; // 5D245C: using guessed type int dminy; -//----- (00412A00) -------------------------------------------------------- void __fastcall DRLG_L4(int entry) { signed int v1; // ebp @@ -854,7 +842,6 @@ LABEL_31: // 5B50D8: using guessed type int setloadflag_2; // 679660: using guessed type char gbMaxPlayers; -//----- (00412DDD) -------------------------------------------------------- void __cdecl DRLG_L4Shadows() { signed int v0; // esi @@ -896,7 +883,6 @@ void __cdecl DRLG_L4Shadows() while ( v0 < 40 ); } -//----- (00412E34) -------------------------------------------------------- void __cdecl InitL4Dungeon() { signed int v0; // edx @@ -923,7 +909,6 @@ void __cdecl InitL4Dungeon() while ( v0 < 40 ); } -//----- (00412E7B) -------------------------------------------------------- void __cdecl L4makeDmt() { signed int v0; // ecx @@ -958,7 +943,6 @@ void __cdecl L4makeDmt() while ( v0 <= 77 ); } -//----- (00412ECB) -------------------------------------------------------- void __cdecl L4AddWall() { int v0; // edi @@ -1089,7 +1073,6 @@ void __cdecl L4AddWall() while ( v0 < 40 ); } -//----- (004131C2) -------------------------------------------------------- int __fastcall L4HWallOk(int i, int j) { int v2; // esi @@ -1145,7 +1128,6 @@ int __fastcall L4HWallOk(int i, int j) return result; } -//----- (00413270) -------------------------------------------------------- int __fastcall L4VWallOk(int i, int j) { int v2; // ecx @@ -1196,7 +1178,6 @@ int __fastcall L4VWallOk(int i, int j) return result; } -//----- (0041330B) -------------------------------------------------------- void __fastcall L4HorizWall(int i, int j, int dx) { int v3; // esi @@ -1254,7 +1235,6 @@ void __fastcall L4HorizWall(int i, int j, int dx) *v12 = 59; } -//----- (004133D6) -------------------------------------------------------- void __fastcall L4VertWall(int i, int j, int dy) { int v3; // edi @@ -1310,7 +1290,6 @@ void __fastcall L4VertWall(int i, int j, int dy) *(v10 - 41) = 55; } -//----- (004134B4) -------------------------------------------------------- void __cdecl L4tileFix() { signed int v0; // edx @@ -2296,7 +2275,6 @@ void __cdecl L4tileFix() while ( v135 < 40 ); } -//----- (004142DD) -------------------------------------------------------- void __cdecl DRLG_L4Subs() { signed int v0; // edi @@ -2361,7 +2339,6 @@ void __cdecl DRLG_L4Subs() while ( v6 < 40 ); } -//----- (0041439A) -------------------------------------------------------- void __cdecl L4makeDungeon() { signed int v0; // ebx @@ -2480,7 +2457,6 @@ void __cdecl L4makeDungeon() while ( (signed int)v26 > (signed int)&dung[18][19] ); } -//----- (004144B1) -------------------------------------------------------- void __cdecl uShape() { int v0; // ecx @@ -2599,7 +2575,6 @@ void __cdecl uShape() while ( v11 ); } -//----- (004145E4) -------------------------------------------------------- int __cdecl GetArea() { int result; // eax @@ -2627,7 +2602,6 @@ int __cdecl GetArea() return result; } -//----- (00414606) -------------------------------------------------------- void __cdecl L4firstRoom() { int v0; // esi @@ -2698,7 +2672,6 @@ LABEL_10: // 528A48: using guessed type int SP4y2; // 679660: using guessed type char gbMaxPlayers; -//----- (00414738) -------------------------------------------------------- void __fastcall L4drawRoom(int x, int y, int width, int height) { int i; // esi @@ -2722,7 +2695,6 @@ void __fastcall L4drawRoom(int x, int y, int width, int height) } } -//----- (0041476F) -------------------------------------------------------- void __fastcall L4roomGen(int x, int y, int w, int h, int dir) { int v5; // eax @@ -2836,7 +2808,6 @@ void __fastcall L4roomGen(int x, int y, int w, int h, int dir) } } -//----- (00414976) -------------------------------------------------------- bool __fastcall L4checkRoom(int x, int y, int width, int height) { int v4; // esi @@ -2872,7 +2843,6 @@ LABEL_12: return 0; } -//----- (004149E2) -------------------------------------------------------- bool __fastcall DRLG_L4PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, int setview, int ldir) { int v7; // ebx @@ -3065,7 +3035,6 @@ bool __fastcall DRLG_L4PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, // 5CF320: using guessed type int LvlViewY; // 5CF324: using guessed type int LvlViewX; -//----- (00414C44) -------------------------------------------------------- void __cdecl DRLG_L4FloodTVal() { int v0; // ebx @@ -3103,7 +3072,6 @@ void __cdecl DRLG_L4FloodTVal() } // 5A5590: using guessed type char TransVal; -//----- (00414CB3) -------------------------------------------------------- void __fastcall DRLG_L4FTVR(int i, int j, int x, int y, int d) { int v5; // ebx @@ -3209,7 +3177,6 @@ void __fastcall DRLG_L4FTVR(int i, int j, int x, int y, int d) } // 5A5590: using guessed type char TransVal; -//----- (00414EA3) -------------------------------------------------------- void __cdecl DRLG_L4TransFix() /* check */ { signed int v0; // edi @@ -3285,7 +3252,6 @@ void __cdecl DRLG_L4TransFix() /* check */ while ( v0 < 40 ); } -//----- (00414F5B) -------------------------------------------------------- void __cdecl DRLG_L4Corners() { signed int v0; // edx @@ -3316,7 +3282,6 @@ void __cdecl DRLG_L4Corners() while ( v0 < 39 ); } -//----- (00414F90) -------------------------------------------------------- void __cdecl DRLG_L4Pass3() { int v0; // eax diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h index e49a033..f732f60 100644 --- a/Source/drlg_l4.h +++ b/Source/drlg_l4.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DRLG_L4_H__ +#define __DRLG_L4_H__ -//drlg_l4 extern int diabquad1x; // weak extern int diabquad1y; // weak extern int diabquad3x; // idb @@ -63,4 +64,6 @@ extern unsigned char L4TWARP[42]; extern unsigned char L4DSTAIRS[52]; extern unsigned char L4PENTA[52]; extern unsigned char L4PENTA2[52]; -extern unsigned char L4BTYPES[140]; \ No newline at end of file +extern unsigned char L4BTYPES[140]; + +#endif /* __DRLG_L4_H__ */ diff --git a/Source/dthread.cpp b/Source/dthread.cpp index d421a83..da0270a 100644 --- a/Source/dthread.cpp +++ b/Source/dthread.cpp @@ -14,7 +14,6 @@ int dthread_inf = 0x7F800000; // weak /* rdata */ static HANDLE sghThread = (HANDLE)0xFFFFFFFF; // idb -//----- (0041509D) -------------------------------------------------------- struct dthread_cpp_init_1 { dthread_cpp_init_1() @@ -25,7 +24,6 @@ struct dthread_cpp_init_1 // 47A460: using guessed type int dthread_inf; // 52A4E0: using guessed type int dthread_cpp_init_value; -//----- (004150A8) -------------------------------------------------------- struct dthread_cpp_init_2 { dthread_cpp_init_2() @@ -35,25 +33,21 @@ struct dthread_cpp_init_2 } } _dthread_cpp_init_2; -//----- (004150B2) -------------------------------------------------------- void __cdecl dthread_init_mutex() { InitializeCriticalSection(&sgMemCrit); } -//----- (004150BE) -------------------------------------------------------- void __cdecl dthread_cleanup_mutex_atexit() { atexit(dthread_cleanup_mutex); } -//----- (004150CA) -------------------------------------------------------- void __cdecl dthread_cleanup_mutex() { DeleteCriticalSection(&sgMemCrit); } -//----- (004150D6) -------------------------------------------------------- void __fastcall dthread_remove_player(int pnum) { int v1; // edi @@ -69,7 +63,6 @@ void __fastcall dthread_remove_player(int pnum) LeaveCriticalSection(&sgMemCrit); } -//----- (00415109) -------------------------------------------------------- void __fastcall dthread_send_delta(int pnum, int cmd, void *pbSrc, int dwLen) { char v4; // bl @@ -105,7 +98,6 @@ void __fastcall dthread_send_delta(int pnum, int cmd, void *pbSrc, int dwLen) } // 679660: using guessed type char gbMaxPlayers; -//----- (00415186) -------------------------------------------------------- void __cdecl dthread_start() { char *v0; // eax @@ -131,7 +123,6 @@ void __cdecl dthread_start() // 52A508: using guessed type char byte_52A508; // 679660: using guessed type char gbMaxPlayers; -//----- (004151F3) -------------------------------------------------------- unsigned int __stdcall dthread_handler(void *a1) { char *v1; // eax @@ -171,7 +162,6 @@ unsigned int __stdcall dthread_handler(void *a1) // 52A508: using guessed type char byte_52A508; // 679730: using guessed type int gdwDeltaBytesSec; -//----- (004152C0) -------------------------------------------------------- void __cdecl dthread_cleanup() { char *v0; // eax diff --git a/Source/dthread.h b/Source/dthread.h index e8f4c70..33490a0 100644 --- a/Source/dthread.h +++ b/Source/dthread.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DTHREAD_H__ +#define __DTHREAD_H__ -//dthread extern int dthread_cpp_init_value; // weak extern unsigned int glpDThreadId; // idb extern TMegaPkt *sgpInfoHead; /* may not be right struct */ @@ -20,3 +21,5 @@ void __cdecl dthread_cleanup(); /* data */ extern int dthread_inf; // weak + +#endif /* __DTHREAD_H__ */ diff --git a/Source/dx.cpp b/Source/dx.cpp index 62026c8..88a6501 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -17,7 +17,6 @@ HMODULE ghDiabMod; // idb int dx_inf = 0x7F800000; // weak -//----- (00415367) -------------------------------------------------------- struct dx_cpp_init_1 { dx_cpp_init_1() @@ -28,7 +27,6 @@ struct dx_cpp_init_1 // 47A464: using guessed type int dx_inf; // 52A514: using guessed type int dx_cpp_init_value; -//----- (00415372) -------------------------------------------------------- struct dx_cpp_init_2 { dx_cpp_init_2() @@ -38,25 +36,21 @@ struct dx_cpp_init_2 } } _dx_cpp_init_2; -//----- (0041537C) -------------------------------------------------------- void __cdecl dx_init_mutex() { InitializeCriticalSection(&sgMemCrit); } -//----- (00415388) -------------------------------------------------------- void __cdecl dx_cleanup_mutex_atexit() { atexit(dx_cleanup_mutex); } -//----- (00415394) -------------------------------------------------------- void __cdecl dx_cleanup_mutex() { DeleteCriticalSection(&sgMemCrit); } -//----- (004153A0) -------------------------------------------------------- void __fastcall dx_init(HWND hWnd) { HWND v1; // esi @@ -106,7 +100,6 @@ void __fastcall dx_init(HWND hWnd) // 484364: using guessed type int fullscreen; // 52A549: using guessed type char gbEmulate; -//----- (004154B5) -------------------------------------------------------- void __cdecl dx_create_back_buffer() { int v0; // eax @@ -149,7 +142,6 @@ void __cdecl dx_create_back_buffer() } // 52A548: using guessed type char gbBackBuf; -//----- (004155C2) -------------------------------------------------------- void __cdecl dx_create_primary_surface() { int v0; // eax @@ -164,7 +156,6 @@ void __cdecl dx_create_primary_surface() TermDlg(104, v0, "C:\\Src\\Diablo\\Source\\dx.cpp", 109); } -//----- (0041561A) -------------------------------------------------------- HRESULT __fastcall dx_DirectDrawCreate(GUID *guid, IDirectDraw **DD, void *unknown) { IDirectDraw **v3; // ebp @@ -193,7 +184,6 @@ HRESULT __fastcall dx_DirectDrawCreate(GUID *guid, IDirectDraw **DD, void *unkno return ((int (__stdcall *)(GUID *, IDirectDraw **, void *))v5)(v8, v3, unknown); } -//----- (0041569A) -------------------------------------------------------- void __cdecl dx_lock_mutex() { Screen *v0; // eax @@ -225,7 +215,6 @@ LABEL_9: } // 69CF0C: using guessed type int screen_buf_end; -//----- (00415725) -------------------------------------------------------- void __cdecl dx_unlock_mutex() { Screen *v0; // eax @@ -251,7 +240,6 @@ void __cdecl dx_unlock_mutex() } // 69CF0C: using guessed type int screen_buf_end; -//----- (004157A0) -------------------------------------------------------- void __cdecl dx_cleanup() { void *v0; // ecx @@ -291,7 +279,6 @@ void __cdecl dx_cleanup() } } -//----- (00415848) -------------------------------------------------------- void __cdecl dx_reinit() { int v0; // esi diff --git a/Source/dx.h b/Source/dx.h index 92e9c2e..35bf00c 100644 --- a/Source/dx.h +++ b/Source/dx.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __DX_H__ +#define __DX_H__ -//dx extern void *sgpBackBuf; extern int dx_cpp_init_value; // weak extern IDirectDraw *lpDDInterface; @@ -33,3 +34,5 @@ void __cdecl j_dx_reinit(); /* data */ extern int dx_inf; // weak + +#endif /* __DX_H__ */ diff --git a/Source/effects.cpp b/Source/effects.cpp index 159b2d9..2cb262f 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -875,7 +875,6 @@ TSFX sgSFX[858] = { 1u, "Sfx\\Monsters\\DiabloD.wav", NULL } }; -//----- (004158AE) -------------------------------------------------------- struct effects_cpp_init { effects_cpp_init() @@ -886,7 +885,6 @@ struct effects_cpp_init // 47A468: using guessed type int effects_inf; // 52A550: using guessed type int effects_cpp_init_value; -//----- (004158B9) -------------------------------------------------------- bool __fastcall effect_is_playing(int nSFX) { TSFX *v1; // eax @@ -901,7 +899,6 @@ bool __fastcall effect_is_playing(int nSFX) return 0; } -//----- (004158E2) -------------------------------------------------------- void __cdecl sfx_stop() { if ( sfx_stream ) @@ -913,7 +910,6 @@ void __cdecl sfx_stop() } } -//----- (0041590B) -------------------------------------------------------- void __fastcall InitMonsterSND(int monst) { signed int v1; // ebx @@ -964,7 +960,6 @@ void __fastcall InitMonsterSND(int monst) } } -//----- (004159DB) -------------------------------------------------------- void __cdecl FreeEffects() { TSnd **v0; // esi @@ -1011,7 +1006,6 @@ void __cdecl FreeEffects() } } -//----- (00415A45) -------------------------------------------------------- void __fastcall PlayEffect(int i, int mode) { int v2; // edi @@ -1056,7 +1050,6 @@ void __fastcall PlayEffect(int i, int mode) // 4A22D5: using guessed type char gbSoundOn; // 676194: using guessed type char gbBufferMsgs; -//----- (00415AE1) -------------------------------------------------------- int __fastcall calc_snd_position(int x, int y, int *plVolume, int *plPan) { int v4; // edi @@ -1082,7 +1075,6 @@ int __fastcall calc_snd_position(int x, int y, int *plVolume, int *plPan) return 1; } -//----- (00415B59) -------------------------------------------------------- void __fastcall PlaySFX(int psfx) { int v1; // eax @@ -1091,7 +1083,6 @@ void __fastcall PlaySFX(int psfx) PlaySFX_priv(&sgSFX[v1], 0, 0, 0); } -//----- (00415B71) -------------------------------------------------------- void __fastcall PlaySFX_priv(TSFX *pSFX, char loc, int x, int y) { int v4; // edi @@ -1141,7 +1132,6 @@ void __fastcall PlaySFX_priv(TSFX *pSFX, char loc, int x, int y) // 676194: using guessed type char gbBufferMsgs; // 679660: using guessed type char gbMaxPlayers; -//----- (00415C2A) -------------------------------------------------------- void __fastcall stream_play(TSFX *pSFX, int lVolume, int lPan) { int v3; // esi @@ -1174,7 +1164,6 @@ void __fastcall stream_play(TSFX *pSFX, int lVolume, int lPan) } } -//----- (00415C97) -------------------------------------------------------- int __fastcall RndSFX(int psfx) { int v1; // esi @@ -1209,7 +1198,6 @@ LABEL_19: return psfx; } -//----- (00415D01) -------------------------------------------------------- void __fastcall PlaySfxLoc(int psfx, int x, int y) { int v3; // esi @@ -1227,7 +1215,6 @@ void __fastcall PlaySfxLoc(int psfx, int x, int y) PlaySFX_priv(&sgSFX[v4], 1, v3, y); } -//----- (00415D39) -------------------------------------------------------- void __cdecl FreeMonsterSnd() { TSnd **v0; // esi @@ -1267,7 +1254,6 @@ void __cdecl FreeMonsterSnd() } } -//----- (00415D9A) -------------------------------------------------------- void __cdecl sound_stop() { int i; // edi @@ -1279,7 +1265,6 @@ void __cdecl sound_stop() } } -//----- (00415DBA) -------------------------------------------------------- void __cdecl sound_update() { //int v0; // ebp @@ -1308,7 +1293,6 @@ void __cdecl sound_update() } // 415DBA: could not find valid save-restore pair for ebp -//----- (00415DFF) -------------------------------------------------------- void __cdecl effects_cleanup_sfx() { unsigned int v0; // edi @@ -1329,7 +1313,6 @@ void __cdecl effects_cleanup_sfx() while ( v0 < 858 ); } -//----- (00415E2A) -------------------------------------------------------- void __cdecl stream_update() { char v0; // bl @@ -1367,7 +1350,6 @@ void __cdecl stream_update() } // 679660: using guessed type char gbMaxPlayers; -//----- (00415E77) -------------------------------------------------------- void __fastcall priv_sound_init(int bLoadMask) { unsigned char v1; // bl @@ -1401,13 +1383,11 @@ void __fastcall priv_sound_init(int bLoadMask) } } -//----- (00415ED8) -------------------------------------------------------- void __cdecl sound_init() { priv_sound_init(4); } -//----- (00415EDF) -------------------------------------------------------- void __stdcall effects_play_sound(char *snd_file) { int v1; // edi diff --git a/Source/effects.h b/Source/effects.h index 46f3dfc..d54d450 100644 --- a/Source/effects.h +++ b/Source/effects.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __EFFECTS_H__ +#define __EFFECTS_H__ -//effects extern int effects_cpp_init_value; // weak extern int sfxdelay; // weak extern int sfxdnum; @@ -36,3 +37,5 @@ extern char monster_action_sounds[]; // idb /* rdata */ extern TSFX sgSFX[858]; + +#endif /* __EFFECTS_H__ */ diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp index 80cb761..22130c0 100644 --- a/Source/encrypt.cpp +++ b/Source/encrypt.cpp @@ -4,7 +4,6 @@ int encrypt_table[1280]; -//----- (00415F43) -------------------------------------------------------- void __fastcall encrypt_decrypt_block(void *block, int size, int key) // DecryptMPQBlock { unsigned int v3; // edx @@ -34,7 +33,6 @@ void __fastcall encrypt_decrypt_block(void *block, int size, int key) // Decrypt } } -//----- (00415F8F) -------------------------------------------------------- void __fastcall encrypt_encrypt_block(void *block, int size, int key) // EncryptMPQBlock { unsigned int v3; // edx @@ -64,7 +62,6 @@ void __fastcall encrypt_encrypt_block(void *block, int size, int key) // Encrypt } } -//----- (00415FDF) -------------------------------------------------------- int __fastcall encrypt_hash(char *s, int type) // HashStringSlash { int v2; // ebp @@ -88,7 +85,6 @@ int __fastcall encrypt_hash(char *s, int type) // HashStringSlash return v4; } -//----- (0041602E) -------------------------------------------------------- void __cdecl encrypt_init_lookup_table() // InitScratchSpace { unsigned int v0; // eax @@ -119,7 +115,6 @@ void __cdecl encrypt_init_lookup_table() // InitScratchSpace while ( (signed int)v5 < (signed int)&encrypt_table[256] ); } -//----- (0041609D) -------------------------------------------------------- int __fastcall encrypt_compress(void *buf, int size) // MPQCompress_PKWare { unsigned char *v2; // ebx @@ -162,7 +157,6 @@ int __fastcall encrypt_compress(void *buf, int size) // MPQCompress_PKWare return (int)v3; } -//----- (00416133) -------------------------------------------------------- unsigned int __cdecl encrypt_pkware_read(char *buf, unsigned int *size, void *param) // ReadPKWare { TDataInfo * pInfo = (TDataInfo *)param; @@ -178,7 +172,6 @@ unsigned int __cdecl encrypt_pkware_read(char *buf, unsigned int *size, void *pa return v3; } -//----- (00416167) -------------------------------------------------------- void __cdecl encrypt_pkware_write(char *buf, unsigned int *size, void *param) // WritePKWare { TDataInfo * pInfo = (TDataInfo *)param; @@ -187,7 +180,6 @@ void __cdecl encrypt_pkware_write(char *buf, unsigned int *size, void *param) // pInfo->pbOutBuffEnd += *size; } -//----- (0041618E) -------------------------------------------------------- void __fastcall encrypt_decompress(void *param, int recv_size, int dwMaxBytes) // MPQDecompress_PKWare { unsigned char *v3; // edi diff --git a/Source/encrypt.h b/Source/encrypt.h index 93b508f..f3c150b 100644 --- a/Source/encrypt.h +++ b/Source/encrypt.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __ENCRYPT_H__ +#define __ENCRYPT_H__ -//encrypt extern int encrypt_table[1280]; //int encrypt_52B564[257]; @@ -11,4 +12,6 @@ void __cdecl encrypt_init_lookup_table(); int __fastcall encrypt_compress(void *buf, int size); unsigned int __cdecl encrypt_pkware_read(char *buf, unsigned int *size, void *param); void __cdecl encrypt_pkware_write(char *buf, unsigned int *size, void *param); -void __fastcall encrypt_decompress(void *param, int recv_size, int dwMaxBytes); \ No newline at end of file +void __fastcall encrypt_decompress(void *param, int recv_size, int dwMaxBytes); + +#endif /* __ENCRYPT_H__ */ diff --git a/Source/engine.cpp b/Source/engine.cpp index 0192abd..ac8f525 100644 --- a/Source/engine.cpp +++ b/Source/engine.cpp @@ -14,7 +14,6 @@ int dword_52B99C; // bool valid - if x/y are in bounds int engine_inf = 0x7F800000; // weak -//----- (00416201) -------------------------------------------------------- struct engine_cpp_init_1 { engine_cpp_init_1() @@ -25,7 +24,6 @@ struct engine_cpp_init_1 // 47A474: using guessed type int engine_inf; // 52B968: using guessed type int engine_cpp_init_value; -//----- (0041620C) -------------------------------------------------------- void __fastcall CelDrawDatOnly(char *pDecodeTo, char *pRLEBytes, int dwRLESize, int dwRLEWdt) { char *v4; // esi @@ -88,7 +86,6 @@ LABEL_14: } } -//----- (00416274) -------------------------------------------------------- void __fastcall CelDecodeOnly(int screen_x, int screen_y, void *pCelBuff, int frame, int frame_width) { if ( gpBuffer ) @@ -102,7 +99,6 @@ void __fastcall CelDecodeOnly(int screen_x, int screen_y, void *pCelBuff, int fr } } -//----- (004162B8) -------------------------------------------------------- void __fastcall CelDecDatOnly(char *pBuff, char *pCelBuff, int frame, int frame_width) { if ( pCelBuff ) @@ -116,7 +112,6 @@ void __fastcall CelDecDatOnly(char *pBuff, char *pCelBuff, int frame, int frame_ } } -//----- (004162DE) -------------------------------------------------------- void __fastcall CelDrawHdrOnly(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int always_0, int direction) { int v7; // edx @@ -151,7 +146,6 @@ void __fastcall CelDrawHdrOnly(int screen_x, int screen_y, char *pCelBuff, int f } } -//----- (00416359) -------------------------------------------------------- void __fastcall CelDecodeHdrOnly(char *pBuff, char *pCelBuff, int frame, int frame_width, int always_0, int direction) { int v6; // esi @@ -180,7 +174,6 @@ void __fastcall CelDecodeHdrOnly(char *pBuff, char *pCelBuff, int frame, int fra } } -//----- (004163AC) -------------------------------------------------------- void __fastcall CelDecDatLightOnly(char *pDecodeTo, char *pRLEBytes, int frame_content_size, int frame_width) { char *v4; // esi @@ -225,7 +218,6 @@ LABEL_9: } // 69BEF8: using guessed type int light_table_index; -//----- (00416423) -------------------------------------------------------- void __fastcall CelDecDatLightEntry(int a1, char *a2, char *a3, char *v6) { int v4; // ebx @@ -278,7 +270,6 @@ void __fastcall CelDecDatLightEntry(int a1, char *a2, char *a3, char *v6) } } -//----- (00416488) -------------------------------------------------------- void __fastcall CelDecDatLightTrans(char *pDecodeTo, char *pRLEBytes, int frame_content_size, int frame_width) { char *v4; // esi @@ -424,7 +415,6 @@ LABEL_23: } // 69BEF8: using guessed type int light_table_index; -//----- (00416565) -------------------------------------------------------- void __fastcall CelDecodeLightOnly(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width) { int v5; // ebx @@ -448,7 +438,6 @@ void __fastcall CelDecodeLightOnly(int screen_x, int screen_y, char *pCelBuff, i } // 69BEF8: using guessed type int light_table_index; -//----- (004165BD) -------------------------------------------------------- void __fastcall CelDecodeHdrLightOnly(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int always_0, int direction) { int v7; // esi @@ -491,7 +480,6 @@ void __fastcall CelDecodeHdrLightOnly(int screen_x, int screen_y, char *pCelBuff } // 69BEF8: using guessed type int light_table_index; -//----- (0041664B) -------------------------------------------------------- void __fastcall CelDecodeHdrLightTrans(char *pBuff, char *pCelBuff, int frame, int frame_width, int always_0, int direction) { char *v6; // eax @@ -537,7 +525,6 @@ void __fastcall CelDecodeHdrLightTrans(char *pBuff, char *pCelBuff, int frame, i // 69BEF8: using guessed type int light_table_index; // 69CF94: using guessed type int cel_transparency_active; -//----- (004166BF) -------------------------------------------------------- void __fastcall CelDrawHdrLightRed(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int always_0, int direction, char always_1) { char *v8; // esi @@ -633,7 +620,6 @@ LABEL_20: } // 525728: using guessed type int light4flag; -//----- (004167DB) -------------------------------------------------------- void __fastcall Cel2DecDatOnly(char *pDecodeTo, char *pRLEBytes, int frame_content_size, int frame_width) { char *v4; // esi @@ -697,7 +683,6 @@ LABEL_17: } // 69CF0C: using guessed type int screen_buf_end; -//----- (0041685A) -------------------------------------------------------- void __fastcall Cel2DrawHdrOnly(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int a6, int direction) { int v7; // edx @@ -732,7 +717,6 @@ void __fastcall Cel2DrawHdrOnly(int screen_x, int screen_y, char *pCelBuff, int } } -//----- (004168D5) -------------------------------------------------------- void __fastcall Cel2DecodeHdrOnly(char *pBuff, char *pCelBuff, int frame, int frame_width, int a5, int direction) { int v6; // edi @@ -765,7 +749,6 @@ void __fastcall Cel2DecodeHdrOnly(char *pBuff, char *pCelBuff, int frame, int fr } } -//----- (0041692A) -------------------------------------------------------- void __fastcall Cel2DecDatLightOnly(char *pDecodeTo, char *pRLEBytes, int frame_content_size, int frame_width) { char *v4; // esi @@ -819,7 +802,6 @@ LABEL_13: // 69BEF8: using guessed type int light_table_index; // 69CF0C: using guessed type int screen_buf_end; -//----- (004169BC) -------------------------------------------------------- void __fastcall Cel2DecDatLightEntry(int a1, int a2) { int v2; // ebx @@ -873,7 +855,6 @@ void __fastcall Cel2DecDatLightEntry(int a1, int a2) } } -//----- (00416A21) -------------------------------------------------------- void __fastcall Cel2DecDatLightTrans(char *pDecodeTo, char *pRLEBytes, int frame_content_size, int frame_width) { char *v4; // esi @@ -1028,7 +1009,6 @@ LABEL_26: // 69BEF8: using guessed type int light_table_index; // 69CF0C: using guessed type int screen_buf_end; -//----- (00416B19) -------------------------------------------------------- void __fastcall Cel2DecodeHdrLight(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int a6, int direction) { int v7; // esi @@ -1075,7 +1055,6 @@ void __fastcall Cel2DecodeHdrLight(int screen_x, int screen_y, char *pCelBuff, i } // 69BEF8: using guessed type int light_table_index; -//----- (00416BA9) -------------------------------------------------------- void __fastcall Cel2DecodeLightTrans(char *dst_buf, char *pCelBuff, int frame, int frame_width, int a5, int direction) { char *v6; // eax @@ -1122,7 +1101,6 @@ void __fastcall Cel2DecodeLightTrans(char *dst_buf, char *pCelBuff, int frame, i // 69BEF8: using guessed type int light_table_index; // 69CF94: using guessed type int cel_transparency_active; -//----- (00416C1B) -------------------------------------------------------- void __fastcall Cel2DrawHdrLightRed(int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int always_0, int direction, char always_1) { char *v8; // esi @@ -1225,7 +1203,6 @@ LABEL_21: // 525728: using guessed type int light4flag; // 69CF0C: using guessed type int screen_buf_end; -//----- (00416D3C) -------------------------------------------------------- void __fastcall CelDecodeRect(char *pBuff, int always_0, int dst_height, int dst_width, char *pCelBuff, int frame, int frame_width) { char *v7; // ebx @@ -1292,7 +1269,6 @@ LABEL_14: } } -//----- (00416DC6) -------------------------------------------------------- void __fastcall CelDecodeClr(char colour, int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int a7, int direction) { char *v8; // ebx @@ -1371,7 +1347,6 @@ LABEL_20: } } -//----- (00416EC0) -------------------------------------------------------- void __fastcall CelDrawHdrClrHL(char colour, int screen_x, int screen_y, char *pCelBuff, int frame, int frame_width, int a7, int direction) { char *v8; // ebx @@ -1481,7 +1456,6 @@ LABEL_28: } // 69CF0C: using guessed type int screen_buf_end; -//----- (00416FEF) -------------------------------------------------------- void __fastcall ENG_set_pixel(int screen_x, int screen_y, char pixel) { char *v3; // edi @@ -1495,7 +1469,6 @@ void __fastcall ENG_set_pixel(int screen_x, int screen_y, char pixel) } // 69CF0C: using guessed type int screen_buf_end; -//----- (00417034) -------------------------------------------------------- void __fastcall engine_draw_pixel(int x, int y) { _BYTE *v2; // eax @@ -1522,7 +1495,6 @@ LABEL_14: // 52B99C: using guessed type int dword_52B99C; // 69CF0C: using guessed type int screen_buf_end; -//----- (004170BD) -------------------------------------------------------- void __fastcall engine_draw_automap_pixels(int x1, int y1, int x2, int y2, char a5) { int v5; // edi @@ -1821,7 +1793,6 @@ LABEL_65: // 52B970: using guessed type int dword_52B970; // 52B99C: using guessed type int dword_52B99C; -//----- (004174B3) -------------------------------------------------------- int __fastcall GetDirection(int x1, int y1, int x2, int y2) { int v4; // esi @@ -1875,7 +1846,6 @@ int __fastcall GetDirection(int x1, int y1, int x2, int y2) return result; } -//----- (00417518) -------------------------------------------------------- void __fastcall SetRndSeed(int s) { SeedCount = 0; @@ -1886,7 +1856,6 @@ void __fastcall SetRndSeed(int s) // 52B97C: using guessed type int sglGameSeed; // 52B998: using guessed type int SeedCount; -//----- (0041752C) -------------------------------------------------------- int __cdecl GetRndSeed() { ++SeedCount; @@ -1896,7 +1865,6 @@ int __cdecl GetRndSeed() // 52B97C: using guessed type int sglGameSeed; // 52B998: using guessed type int SeedCount; -//----- (0041754B) -------------------------------------------------------- int __fastcall random(int idx, int v) { int v2; // esi @@ -1911,7 +1879,6 @@ int __fastcall random(int idx, int v) return v4 % v2; } -//----- (0041756D) -------------------------------------------------------- struct engine_cpp_init_2 { engine_cpp_init_2() @@ -1921,25 +1888,21 @@ struct engine_cpp_init_2 } } _engine_cpp_init_2; -//----- (00417577) -------------------------------------------------------- void __cdecl mem_init_mutex() { InitializeCriticalSection(&sgMemCrit); } -//----- (00417583) -------------------------------------------------------- void __cdecl mem_atexit_mutex() { atexit(mem_free_mutex); } -//----- (0041758F) -------------------------------------------------------- void __cdecl mem_free_mutex() { DeleteCriticalSection(&sgMemCrit); } -//----- (0041759B) -------------------------------------------------------- void *__fastcall DiabloAllocPtr(int dwBytes) { int v1; // ebx @@ -1958,7 +1921,6 @@ void *__fastcall DiabloAllocPtr(int dwBytes) return v2; } -//----- (004175E8) -------------------------------------------------------- void __fastcall mem_free_dbg(void *ptr) { void *v1; // edi @@ -1972,7 +1934,6 @@ void __fastcall mem_free_dbg(void *ptr) } } -//----- (00417618) -------------------------------------------------------- unsigned char *__fastcall LoadFileInMem(char *pszName, int *pdwFileLen) { int *v2; // edi @@ -1997,7 +1958,6 @@ unsigned char *__fastcall LoadFileInMem(char *pszName, int *pdwFileLen) return (unsigned char *)v6; } -//----- (00417673) -------------------------------------------------------- void __fastcall LoadFileWithMem(char *pszName, void *buf) { char *v2; // ebx @@ -2017,7 +1977,6 @@ void __fastcall LoadFileWithMem(char *pszName, void *buf) WCloseFile(a1); } -//----- (004176D2) -------------------------------------------------------- void __fastcall Cl2ApplyTrans(char *p, char *ttbl, int last_frame) { int v3; // eax @@ -2069,7 +2028,6 @@ void __fastcall Cl2ApplyTrans(char *p, char *ttbl, int last_frame) } } -//----- (00417745) -------------------------------------------------------- void __fastcall Cl2DecodeFrm1(int x, int y, char *pCelBuff, int nCel, int width, int dir1, int dir2) { char *v8; // edx @@ -2103,7 +2061,6 @@ void __fastcall Cl2DecodeFrm1(int x, int y, char *pCelBuff, int nCel, int width, } } -//----- (004177BF) -------------------------------------------------------- void __fastcall Cl2DecDatFrm1(char *buffer, char *frame_content, int a3, int width) /* fix */ { char *v4; // esi @@ -2189,7 +2146,6 @@ void __fastcall Cl2DecDatFrm1(char *buffer, char *frame_content, int a3, int wid while ( v8 ); } -//----- (00417847) -------------------------------------------------------- void __fastcall Cl2DecodeFrm2(char colour, int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a7, int a8) { int v8; // ebx @@ -2222,7 +2178,6 @@ void __fastcall Cl2DecodeFrm2(char colour, int screen_x, int screen_y, char *pCe } } -//----- (004178C5) -------------------------------------------------------- void __fastcall Cl2DecDatFrm2(char *buffer, char *frame_content, int a3, int frame_width, char colour) { char *v5; // esi @@ -2320,7 +2275,6 @@ LABEL_12: while ( v9 ); } -//----- (00417981) -------------------------------------------------------- void __fastcall Cl2DecodeFrm3(int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a6, int a7, char a8) { char *v8; // edi @@ -2371,7 +2325,6 @@ void __fastcall Cl2DecodeFrm3(int screen_x, int screen_y, char *pCelBuff, int nC } // 525728: using guessed type int light4flag; -//----- (00417A44) -------------------------------------------------------- void __fastcall Cl2DecDatLightTbl1(char *a1, char *a2, int a3, int a4, char *unused_lindex) /* check 5th arg */ { char *v5; // esi @@ -2460,7 +2413,6 @@ void __fastcall Cl2DecDatLightTbl1(char *a1, char *a2, int a3, int a4, char *unu } // 52B978: using guessed type int sgnWidth; -//----- (00417AE9) -------------------------------------------------------- void __fastcall Cl2DecodeLightTbl(int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a6, int a7) { int v7; // esi @@ -2509,7 +2461,6 @@ void __fastcall Cl2DecodeLightTbl(int screen_x, int screen_y, char *pCelBuff, in } // 69BEF8: using guessed type int light_table_index; -//----- (00417B83) -------------------------------------------------------- void __fastcall Cl2DecodeFrm4(int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a6, int a7) { int v7; // ebx @@ -2547,7 +2498,6 @@ void __fastcall Cl2DecodeFrm4(int screen_x, int screen_y, char *pCelBuff, int nC } } -//----- (00417BFD) -------------------------------------------------------- void __fastcall Cl2DecDatFrm4(char *buffer, char *a2, int a3, int frame_width) { char *v4; // esi @@ -2641,7 +2591,6 @@ LABEL_12: } // 69CF0C: using guessed type int screen_buf_end; -//----- (00417C99) -------------------------------------------------------- void __fastcall Cl2DecodeClrHL(char colour, int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a7, int a8) { int v8; // ebx @@ -2681,7 +2630,6 @@ void __fastcall Cl2DecodeClrHL(char colour, int screen_x, int screen_y, char *pC } // 69CF0C: using guessed type int screen_buf_end; -//----- (00417D28) -------------------------------------------------------- void __fastcall Cl2DecDatClrHL(char *dst_buf, char *frame_content, int a3, int frame_width, char colour) { char *v5; // esi @@ -2787,7 +2735,6 @@ LABEL_15: } // 69CF0C: using guessed type int screen_buf_end; -//----- (00417DF8) -------------------------------------------------------- void __fastcall Cl2DecodeFrm5(int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a6, int a7, char a8) { char *v8; // edi @@ -2838,7 +2785,6 @@ void __fastcall Cl2DecodeFrm5(int screen_x, int screen_y, char *pCelBuff, int nC } // 525728: using guessed type int light4flag; -//----- (00417EBB) -------------------------------------------------------- void __fastcall Cl2DecDatLightTbl2(char *dst_buf, char *a2, int a3, int frame_width, char *a5) /* check 5th arg */ { char *v5; // esi @@ -2935,7 +2881,6 @@ LABEL_12: // 52B978: using guessed type int sgnWidth; // 69CF0C: using guessed type int screen_buf_end; -//----- (00417F78) -------------------------------------------------------- void __fastcall Cl2DecodeFrm6(int screen_x, int screen_y, char *pCelBuff, int nCel, int frame_width, int a6, int a7) { int v7; // esi @@ -2979,7 +2924,6 @@ void __fastcall Cl2DecodeFrm6(int screen_x, int screen_y, char *pCelBuff, int nC } // 69BEF8: using guessed type int light_table_index; -//----- (00418012) -------------------------------------------------------- void __fastcall PlayInGameMovie(char *pszMovie) { char *v1; // esi diff --git a/Source/engine.h b/Source/engine.h index 1b1e712..54a4f2d 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -1,9 +1,10 @@ //HEADER_GOES_HERE +#ifndef __ENGINE_H__ +#define __ENGINE_H__ //offset 0 //pCelBuff->pFrameTable[0] -//engine extern int engine_cpp_init_value; // weak extern char byte_52B96C; // automap pixel color 8-bit (palette entry) extern int dword_52B970; // bool flip - if y < x @@ -73,3 +74,5 @@ void __fastcall PlayInGameMovie(char *pszMovie); /* data */ extern int engine_inf; // weak + +#endif /* __ENGINE_H__ */ diff --git a/Source/error.cpp b/Source/error.cpp index 01b4e82..aab56c5 100644 --- a/Source/error.cpp +++ b/Source/error.cpp @@ -55,7 +55,6 @@ char *MsgStrings[44] = "Arcane knowledge gained!" }; -//----- (0041804E) -------------------------------------------------------- void __fastcall InitDiabloMsg(char e) { int i; // edx @@ -87,7 +86,6 @@ LABEL_4: // 52B9F1: using guessed type char msgflag; // 52B9F2: using guessed type char msgcnt; -//----- (0041808F) -------------------------------------------------------- void __cdecl ClrDiabloMsg() { msgflag = 0; @@ -97,7 +95,6 @@ void __cdecl ClrDiabloMsg() // 52B9F1: using guessed type char msgflag; // 52B9F2: using guessed type char msgcnt; -//----- (004180AA) -------------------------------------------------------- void __cdecl DrawDiabloMsg() { int v0; // esi diff --git a/Source/error.h b/Source/error.h index 51392a4..21c6aee 100644 --- a/Source/error.h +++ b/Source/error.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __ERROR_H__ +#define __ERROR_H__ -//error extern char msgtable[80]; extern char msgdelay; // weak extern char msgflag; // weak @@ -11,4 +12,6 @@ void __cdecl ClrDiabloMsg(); void __cdecl DrawDiabloMsg(); /* data */ -extern char *MsgStrings[44]; \ No newline at end of file +extern char *MsgStrings[44]; + +#endif /* __ERROR_H__ */ diff --git a/Source/fault.cpp b/Source/fault.cpp index dafa9a6..38099ca 100644 --- a/Source/fault.cpp +++ b/Source/fault.cpp @@ -4,7 +4,6 @@ LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter; // idb -//----- (004182AD) -------------------------------------------------------- struct exception_cpp_init { exception_cpp_init() @@ -14,25 +13,21 @@ struct exception_cpp_init } } _exception_cpp_init; -//----- (004182B7) -------------------------------------------------------- void __cdecl exception_install_filter() { exception_set_filter(); } -//----- (004182C1) -------------------------------------------------------- void __cdecl j_exception_init_filter() { atexit(exception_init_filter); } -//----- (004182CD) -------------------------------------------------------- void __cdecl exception_init_filter() { exception_set_filter_ptr(); } -//----- (004182D7) -------------------------------------------------------- LONG __stdcall TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) { PEXCEPTION_RECORD v1; // esi @@ -78,7 +73,6 @@ LONG __stdcall TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo return result; } -//----- (00418455) -------------------------------------------------------- void __fastcall exception_hex_format(char *a1, char a2) { unsigned int v2; // ebp @@ -138,7 +132,6 @@ void __fastcall exception_hex_format(char *a1, char a2) log_printf("\r\n"); } -//----- (00418518) -------------------------------------------------------- void __fastcall exception_unknown_module(LPCVOID lpAddress, LPSTR lpString1, int iMaxLength, int a4, int a5) { int v6; // eax @@ -208,7 +201,6 @@ void __fastcall exception_unknown_module(LPCVOID lpAddress, LPSTR lpString1, int } } -//----- (004185FF) -------------------------------------------------------- void __fastcall exception_call_stack(void *a1, LPVOID lp) { _DWORD *v2; // ebx @@ -237,7 +229,6 @@ void __fastcall exception_call_stack(void *a1, LPVOID lp) log_printf("\r\n"); } -//----- (00418688) -------------------------------------------------------- char *__fastcall exception_get_error_type(DWORD dwMessageId, LPSTR lpString1, DWORD nSize) { CHAR *v3; // esi @@ -356,19 +347,16 @@ LABEL_42: return v3; } -//----- (0041883C) -------------------------------------------------------- void __fastcall exception_set_filter() { lpTopLevelExceptionFilter = SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)TopLevelExceptionFilter); } -//----- (00418853) -------------------------------------------------------- LPTOP_LEVEL_EXCEPTION_FILTER __cdecl exception_set_filter_ptr() { return SetUnhandledExceptionFilter(lpTopLevelExceptionFilter); } -//----- (00418860) -------------------------------------------------------- LPTOP_LEVEL_EXCEPTION_FILTER __cdecl exception_get_filter() { return lpTopLevelExceptionFilter; diff --git a/Source/fault.h b/Source/fault.h index 0acefff..c5f8bce 100644 --- a/Source/fault.h +++ b/Source/fault.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __FAULT_H__ +#define __FAULT_H__ -//fault //int dword_52B9F4; extern LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter; // idb @@ -15,4 +16,6 @@ void __fastcall exception_call_stack(void *a1, LPVOID lp); char *__fastcall exception_get_error_type(DWORD dwMessageId, LPSTR lpString1, DWORD nSize); void __fastcall exception_set_filter(); LPTOP_LEVEL_EXCEPTION_FILTER __cdecl exception_set_filter_ptr(); -LPTOP_LEVEL_EXCEPTION_FILTER __cdecl exception_get_filter(); \ No newline at end of file +LPTOP_LEVEL_EXCEPTION_FILTER __cdecl exception_get_filter(); + +#endif /* __FAULT_H__ */ diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 3da3184..f5a9fd8 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -32,7 +32,6 @@ char *music_toggle_names[] = { "Music", "Music Disabled" }; char *sound_toggle_names[] = { "Sound", "Sound Disabled" }; char *color_cycling_toggle_names[] = { "Color Cycling Off", "Color Cycling On" }; -//----- (00418866) -------------------------------------------------------- void __cdecl gamemenu_previous() { void (__cdecl *v0)(); // edx @@ -53,7 +52,6 @@ void __cdecl gamemenu_previous() } // 679660: using guessed type char gbMaxPlayers; -//----- (0041888F) -------------------------------------------------------- void __cdecl gamemenu_enable_single() { bool v0; // dl @@ -65,19 +63,16 @@ void __cdecl gamemenu_enable_single() gmenu_enable(sgSingleMenu, v0); } -//----- (004188C8) -------------------------------------------------------- void __cdecl gamemenu_enable_multi() { gmenu_enable(&sgMultiMenu[2], deathflag); } -//----- (004188D8) -------------------------------------------------------- void __cdecl gamemenu_off() { gmenu_call_proc(0, 0); } -//----- (004188E1) -------------------------------------------------------- void __cdecl gamemenu_handle_previous() { if ( gmenu_exception() ) @@ -86,7 +81,6 @@ void __cdecl gamemenu_handle_previous() gamemenu_previous(); } -//----- (004188F9) -------------------------------------------------------- void __cdecl gamemenu_new_game() { int i; // eax @@ -106,7 +100,6 @@ void __cdecl gamemenu_new_game() // 525650: using guessed type int gbRunGame; // 52571C: using guessed type int drawpanflag; -//----- (0041893B) -------------------------------------------------------- void __cdecl gamemenu_quit_game() { gamemenu_new_game(); @@ -114,7 +107,6 @@ void __cdecl gamemenu_quit_game() } // 525698: using guessed type int gbRunGameResult; -//----- (00418948) -------------------------------------------------------- void __cdecl gamemenu_load_game() { LRESULT (__stdcall *saveProc)(HWND, UINT, WPARAM, LPARAM); // edi @@ -138,7 +130,6 @@ void __cdecl gamemenu_load_game() } // 52571C: using guessed type int drawpanflag; -//----- (004189BE) -------------------------------------------------------- void __cdecl gamemenu_save_game() { LRESULT (__stdcall *saveProc)(HWND, UINT, WPARAM, LPARAM); // edi @@ -168,13 +159,11 @@ void __cdecl gamemenu_save_game() } // 52571C: using guessed type int drawpanflag; -//----- (00418A42) -------------------------------------------------------- void __cdecl gamemenu_restart_town() { NetSendCmd(1u, CMD_RETOWN); } -//----- (00418A4C) -------------------------------------------------------- void __cdecl gamemenu_options() { gamemenu_get_music(); @@ -184,13 +173,11 @@ void __cdecl gamemenu_options() gmenu_call_proc(sgOptionMenu, 0); } -//----- (00418A6C) -------------------------------------------------------- void __cdecl gamemenu_get_music() { gamemenu_sound_music_toggle(music_toggle_names, sgOptionMenu, sound_get_or_set_music_volume(1)); } -//----- (00418A85) -------------------------------------------------------- void __fastcall gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int gamma) { if ( gbSndInited ) @@ -207,26 +194,22 @@ void __fastcall gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, } } -//----- (00418AC6) -------------------------------------------------------- void __cdecl gamemenu_get_sound() { gamemenu_sound_music_toggle(sound_toggle_names, &sgOptionMenu[1], sound_get_or_set_sound_volume(1)); } -//----- (00418ADF) -------------------------------------------------------- void __cdecl gamemenu_get_color_cycling() { sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling()]; } -//----- (00418AF4) -------------------------------------------------------- void __cdecl gamemenu_get_gamma() { gmenu_slider_3(&sgOptionMenu[2], 15); gmenu_slider_1(&sgOptionMenu[2], 30, 100, palette_update_gamma(0)); } -//----- (00418B1A) -------------------------------------------------------- void __fastcall gamemenu_music_volume(int a1) { int v1; // esi @@ -266,13 +249,11 @@ LABEL_11: // 4A22D4: using guessed type char gbMusicOn; // 5BB1ED: using guessed type char leveltype; -//----- (00418BA3) -------------------------------------------------------- int __fastcall gamemenu_slider_music_sound(TMenuItem *menu_item) { return gmenu_slider_get(menu_item, -1600, 0); } -//----- (00418BB0) -------------------------------------------------------- void __fastcall gamemenu_sound_volume(int a1) { int v1; // ecx @@ -315,7 +296,6 @@ void __fastcall gamemenu_sound_volume(int a1) } // 4A22D5: using guessed type char gbSoundOn; -//----- (00418C30) -------------------------------------------------------- void __fastcall gamemenu_gamma(int a1) { int v1; // eax @@ -335,13 +315,11 @@ void __fastcall gamemenu_gamma(int a1) gamemenu_get_gamma(); } -//----- (00418C5A) -------------------------------------------------------- int __cdecl gamemenu_slider_gamma() { return gmenu_slider_get(&sgOptionMenu[2], 30, 100); } -//----- (00418C6A) -------------------------------------------------------- void __cdecl gamemenu_color_cycling() { palette_set_color_cycling(palette_get_colour_cycling() == 0); diff --git a/Source/gamemenu.h b/Source/gamemenu.h index d5f6163..2470e42 100644 --- a/Source/gamemenu.h +++ b/Source/gamemenu.h @@ -1,4 +1,6 @@ //HEADER_GOES_HERE +#ifndef __GAMEMENU_H__ +#define __GAMEMENU_H__ void __cdecl gamemenu_previous(); void __cdecl gamemenu_enable_single(); @@ -29,4 +31,6 @@ extern TMenuItem sgMultiMenu[5]; extern TMenuItem sgOptionMenu[6]; extern char *music_toggle_names[]; extern char *sound_toggle_names[]; -extern char *color_cycling_toggle_names[]; \ No newline at end of file +extern char *color_cycling_toggle_names[]; + +#endif /* __GAMEMENU_H__ */ diff --git a/Source/gendung.cpp b/Source/gendung.cpp index cbe6d0d..376ddd3 100644 --- a/Source/gendung.cpp +++ b/Source/gendung.cpp @@ -69,7 +69,6 @@ int dminx; // weak int dminy; // weak short dpiece_defs_map_2[16][112][112]; -//----- (00418C8B) -------------------------------------------------------- void __cdecl FillSolidBlockTbls() { unsigned char *v0; // eax @@ -137,7 +136,6 @@ LABEL_13: } // 5BB1ED: using guessed type char leveltype; -//----- (00418D91) -------------------------------------------------------- void __cdecl gendung_418D91() { signed int v0; // edx @@ -496,7 +494,6 @@ LABEL_66: // 53CD4C: using guessed type int nlevel_frames; // 5BB1ED: using guessed type char leveltype; -//----- (004191BF) -------------------------------------------------------- void __fastcall gendung_4191BF(int frames) { int v1; // edi @@ -520,7 +517,6 @@ void __fastcall gendung_4191BF(int frames) } } -//----- (004191FB) -------------------------------------------------------- void __fastcall gendung_4191FB(int a1, int a2) { int v2; // esi @@ -554,7 +550,6 @@ void __fastcall gendung_4191FB(int a1, int a2) *(int *)((char *)level_frame_sizes + v2) = v10; } -//----- (0041927A) -------------------------------------------------------- int __fastcall gendung_get_dpiece_num_from_coord(int x, int y) { __int64 v3; // rax @@ -565,7 +560,6 @@ int __fastcall gendung_get_dpiece_num_from_coord(int x, int y) return 12543 - (((signed int)v3 - HIDWORD(v3)) >> 1); } -//----- (004192C2) -------------------------------------------------------- void __cdecl gendung_4192C2() { short (*v0)[112][112]; // ebx @@ -592,7 +586,6 @@ void __cdecl gendung_4192C2() while ( (signed int)v0 < (signed int)&dpiece_defs_map_2[16][0][0] ); } -//----- (0041930B) -------------------------------------------------------- void __cdecl SetDungeonMicros() { signed int v0; // esi @@ -679,7 +672,6 @@ void __cdecl SetDungeonMicros() // 5C3000: using guessed type int scr_pix_width; // 5C3004: using guessed type int scr_pix_height; -//----- (0041944A) -------------------------------------------------------- void __cdecl DRLG_InitTrans() { memset(dung_map, 0, 0x3100u); @@ -688,7 +680,6 @@ void __cdecl DRLG_InitTrans() } // 5A5590: using guessed type char TransVal; -//----- (00419477) -------------------------------------------------------- void __fastcall DRLG_MRectTrans(int x1, int y1, int x2, int y2) { int v4; // esi @@ -720,7 +711,6 @@ void __fastcall DRLG_MRectTrans(int x1, int y1, int x2, int y2) } // 5A5590: using guessed type char TransVal; -//----- (004194D0) -------------------------------------------------------- void __fastcall DRLG_RectTrans(int x1, int y1, int x2, int y2) { int i; // esi @@ -746,13 +736,11 @@ void __fastcall DRLG_RectTrans(int x1, int y1, int x2, int y2) } // 5A5590: using guessed type char TransVal; -//----- (00419515) -------------------------------------------------------- void __fastcall DRLG_CopyTrans(int sx, int sy, int dx, int dy) { dung_map[dx][dy] = dung_map[sx][sy]; } -//----- (00419534) -------------------------------------------------------- void __fastcall DRLG_ListTrans(int num, unsigned char *List) { unsigned char *v2; // esi @@ -782,7 +770,6 @@ void __fastcall DRLG_ListTrans(int num, unsigned char *List) } } -//----- (00419565) -------------------------------------------------------- void __fastcall DRLG_AreaTrans(int num, unsigned char *List) { unsigned char *v2; // esi @@ -815,7 +802,6 @@ void __fastcall DRLG_AreaTrans(int num, unsigned char *List) } // 5A5590: using guessed type char TransVal; -//----- (004195A2) -------------------------------------------------------- void __cdecl DRLG_InitSetPC() { setpc_x = 0; @@ -826,7 +812,6 @@ void __cdecl DRLG_InitSetPC() // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (004195B9) -------------------------------------------------------- void __cdecl DRLG_SetPC() { int v0; // ebx @@ -860,7 +845,6 @@ void __cdecl DRLG_SetPC() // 5CF330: using guessed type int setpc_h; // 5CF334: using guessed type int setpc_w; -//----- (0041960C) -------------------------------------------------------- void __fastcall Make_SetPC(int x, int y, int w, int h) { int v4; // eax @@ -892,7 +876,6 @@ void __fastcall Make_SetPC(int x, int y, int w, int h) } } -//----- (0041965B) -------------------------------------------------------- bool __fastcall DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height) { int v7; // esi @@ -1038,7 +1021,6 @@ LABEL_32: // 41965B: using guessed type int var_6C[20]; // 41965B: using guessed type int var_BC[20]; -//----- (004197F4) -------------------------------------------------------- void __fastcall DRLG_CreateThemeRoom(int themeIndex) { int v1; // esi @@ -1273,7 +1255,6 @@ LABEL_53: } // 5BB1ED: using guessed type char leveltype; -//----- (00419C10) -------------------------------------------------------- void __fastcall DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int freq, int rndSize) { int v5; // ebx @@ -1374,7 +1355,6 @@ void __fastcall DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int fr // 5A5590: using guessed type char TransVal; // 5BB1ED: using guessed type char leveltype; -//----- (00419D92) -------------------------------------------------------- void __cdecl DRLG_HoldThemeRooms() { int *v0; // esi @@ -1431,7 +1411,6 @@ void __cdecl DRLG_HoldThemeRooms() } } -//----- (00419E1F) -------------------------------------------------------- bool __fastcall SkipThemeRoom(int x, int y) { int i; // ebx @@ -1458,7 +1437,6 @@ bool __fastcall SkipThemeRoom(int x, int y) return 0; } -//----- (00419E71) -------------------------------------------------------- void __cdecl InitLevels() { if ( !leveldebug ) diff --git a/Source/gendung.h b/Source/gendung.h index 09b29df..97f20a6 100644 --- a/Source/gendung.h +++ b/Source/gendung.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __GENDUNG_H__ +#define __GENDUNG_H__ -//gendung extern short level_frame_types[2048]; extern int themeCount; extern char nTransTable[2049]; @@ -89,4 +90,6 @@ void __fastcall DRLG_CreateThemeRoom(int themeIndex); void __fastcall DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int freq, int rndSize); void __cdecl DRLG_HoldThemeRooms(); bool __fastcall SkipThemeRoom(int x, int y); -void __cdecl InitLevels(); \ No newline at end of file +void __cdecl InitLevels(); + +#endif /* __GENDUNG_H__ */ diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp index faf3bc5..f4d0399 100644 --- a/Source/gmenu.cpp +++ b/Source/gmenu.cpp @@ -41,7 +41,6 @@ unsigned char lfontkern[56] = 11, 10, 12, 11, 21, 23 }; -//----- (00419E8B) -------------------------------------------------------- void __cdecl gmenu_draw_pause() { if ( currlevel ) @@ -54,7 +53,6 @@ void __cdecl gmenu_draw_pause() } // 69BEF8: using guessed type int light_table_index; -//----- (00419EBE) -------------------------------------------------------- void __fastcall gmenu_print_text(int x, int y, char *pszStr) { char *v3; // edi @@ -76,7 +74,6 @@ void __fastcall gmenu_print_text(int x, int y, char *pszStr) } } -//----- (00419F17) -------------------------------------------------------- void __cdecl FreeGMenu() { void *v0; // ecx @@ -102,7 +99,6 @@ void __cdecl FreeGMenu() mem_free_dbg(v4); } -//----- (00419F70) -------------------------------------------------------- void __cdecl gmenu_init_menu() { byte_634478 = 1; @@ -121,13 +117,11 @@ void __cdecl gmenu_init_menu() // 634478: using guessed type char byte_634478; // 63448C: using guessed type int dword_63448C; -//----- (00419FE8) -------------------------------------------------------- bool __cdecl gmenu_exception() { return dword_634480 != 0; } -//----- (00419FF4) -------------------------------------------------------- void __fastcall gmenu_call_proc(TMenuItem *pItem, void (__cdecl *gmFunc)()) { TMenuItem *v2; // eax @@ -163,7 +157,6 @@ void __fastcall gmenu_call_proc(TMenuItem *pItem, void (__cdecl *gmFunc)()) // 634464: using guessed type char byte_634464; // 63448C: using guessed type int dword_63448C; -//----- (0041A04E) -------------------------------------------------------- void __fastcall gmenu_up_down(int a1) { TMenuItem *v1; // eax @@ -205,7 +198,6 @@ LABEL_10: // 634464: using guessed type char byte_634464; // 63448C: using guessed type int dword_63448C; -//----- (0041A0B6) -------------------------------------------------------- void __cdecl gmenu_draw() { int v0; // edi @@ -235,7 +227,6 @@ void __cdecl gmenu_draw() // 634474: using guessed type int dword_634474; // 634478: using guessed type char byte_634478; -//----- (0041A145) -------------------------------------------------------- void __fastcall gmenu_draw_menu_item(TMenuItem *pItem, int a2) { int v2; // edi @@ -286,7 +277,6 @@ void __fastcall gmenu_draw_menu_item(TMenuItem *pItem, int a2) // 634478: using guessed type char byte_634478; // 69BEF8: using guessed type int light_table_index; -//----- (0041A239) -------------------------------------------------------- void __fastcall gmenu_clear_buffer(int x, int y, int width, int height) { int v4; // edi @@ -300,7 +290,6 @@ void __fastcall gmenu_clear_buffer(int x, int y, int width, int height) } } -//----- (0041A272) -------------------------------------------------------- int __fastcall gmenu_get_lfont(TMenuItem *pItem) { char *v2; // eax @@ -320,7 +309,6 @@ int __fastcall gmenu_get_lfont(TMenuItem *pItem) return i - 2; } -//----- (0041A2AE) -------------------------------------------------------- int __fastcall gmenu_presskeys(int a1) { int v1; // ecx @@ -363,7 +351,6 @@ LABEL_10: return 1; } -//----- (0041A32A) -------------------------------------------------------- void __fastcall gmenu_left_right(int a1) { signed int v1; // edx @@ -393,7 +380,6 @@ void __fastcall gmenu_left_right(int a1) } } -//----- (0041A37A) -------------------------------------------------------- int __fastcall gmenu_on_mouse_move(LPARAM lParam) { int v2; // edx @@ -413,7 +399,6 @@ int __fastcall gmenu_on_mouse_move(LPARAM lParam) // 41A37A: could not find valid save-restore pair for esi // 634464: using guessed type char byte_634464; -//----- (0041A3D2) -------------------------------------------------------- bool __fastcall gmenu_valid_mouse_pos(int *plOffset) { *plOffset = 282; @@ -431,7 +416,6 @@ bool __fastcall gmenu_valid_mouse_pos(int *plOffset) return 1; } -//----- (0041A401) -------------------------------------------------------- int __fastcall gmenu_left_mouse(int a1) { int result; // eax @@ -486,7 +470,6 @@ int __fastcall gmenu_left_mouse(int a1) // 634464: using guessed type char byte_634464; // 63448C: using guessed type int dword_63448C; -//----- (0041A4B8) -------------------------------------------------------- void __fastcall gmenu_enable(TMenuItem *pMenuItem, bool enable) { if ( enable ) @@ -495,7 +478,6 @@ void __fastcall gmenu_enable(TMenuItem *pMenuItem, bool enable) pMenuItem->dwFlags &= 0x7F000000; } -//----- (0041A4C6) -------------------------------------------------------- void __fastcall gmenu_slider_1(TMenuItem *pItem, int min, int max, int gamma) { unsigned int v4; // esi @@ -509,7 +491,6 @@ void __fastcall gmenu_slider_1(TMenuItem *pItem, int min, int max, int gamma) pItem->dwFlags = v4 | (v5 * (gamma - min) + (max - min - 1) / 2) / (max - min); } -//----- (0041A508) -------------------------------------------------------- int __fastcall gmenu_slider_get(TMenuItem *pItem, int min, int max) { int v3; // eax @@ -522,7 +503,6 @@ int __fastcall gmenu_slider_get(TMenuItem *pItem, int min, int max) return min + (v4 * (max - min) + (v3 - 1) / 2) / v3; } -//----- (0041A545) -------------------------------------------------------- void __fastcall gmenu_slider_3(TMenuItem *pItem, int dwTicks) { pItem->dwFlags ^= (pItem->dwFlags ^ (dwTicks << 12)) & 0xFFF000; diff --git a/Source/gmenu.h b/Source/gmenu.h index 9190fe4..39a55c2 100644 --- a/Source/gmenu.h +++ b/Source/gmenu.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __GMENU_H__ +#define __GMENU_H__ -//gmenu extern void *optbar_cel; extern bool byte_634464; // weak extern void *PentSpin_cel; @@ -39,3 +40,5 @@ void __fastcall gmenu_slider_3(TMenuItem *pItem, int dwTicks); extern unsigned char lfontframe[127]; extern unsigned char lfontkern[56]; + +#endif /* __GMENU_H__ */ diff --git a/Source/help.cpp b/Source/help.cpp index af43199..8cec59c 100644 --- a/Source/help.cpp +++ b/Source/help.cpp @@ -78,7 +78,6 @@ char gszHelpText[] = "&" }; -//----- (0041A553) -------------------------------------------------------- void __cdecl InitHelp() { helpflag = 0; @@ -87,7 +86,6 @@ void __cdecl InitHelp() } // 634494: using guessed type int dword_634494; -//----- (0041A565) -------------------------------------------------------- void __cdecl DrawHelp() { int v0; // edi @@ -222,7 +220,6 @@ LABEL_48: // 634490: using guessed type int help_select_line; // 634960: using guessed type int HelpTop; -//----- (0041A6FA) -------------------------------------------------------- void __fastcall DrawHelpLine(int always_0, int help_line_nr, char *text, text_color color) { signed int v4; // ebx @@ -248,7 +245,6 @@ void __fastcall DrawHelpLine(int always_0, int help_line_nr, char *text, text_co } } -//----- (0041A773) -------------------------------------------------------- void __cdecl DisplayHelp() { help_select_line = 0; @@ -258,7 +254,6 @@ void __cdecl DisplayHelp() // 634490: using guessed type int help_select_line; // 634960: using guessed type int HelpTop; -//----- (0041A78F) -------------------------------------------------------- void __cdecl HelpScrollUp() { if ( help_select_line > 0 ) @@ -266,7 +261,6 @@ void __cdecl HelpScrollUp() } // 634490: using guessed type int help_select_line; -//----- (0041A79F) -------------------------------------------------------- void __cdecl HelpScrollDown() { if ( help_select_line < HelpTop ) diff --git a/Source/help.h b/Source/help.h index 987e31a..fee507e 100644 --- a/Source/help.h +++ b/Source/help.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __HELP_H__ +#define __HELP_H__ -//help extern int help_select_line; // weak extern int dword_634494; // weak extern int helpflag; @@ -16,3 +17,5 @@ void __cdecl HelpScrollDown(); /* data */ extern char gszHelpText[]; + +#endif /* __HELP_H__ */