diff --git a/Source/init.cpp b/Source/init.cpp index 64c0ad1..6662b3e 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -22,7 +22,6 @@ int init_inf = 0x7F800000; // weak char gszVersionNumber[260] = "internal version unknown"; char gszProductName[260] = "Diablo v1.09"; -//----- (0041A7B8) -------------------------------------------------------- struct init_cpp_init { init_cpp_init() @@ -33,7 +32,6 @@ struct init_cpp_init // 47AE20: using guessed type int init_inf; // 63497C: using guessed type int init_cpp_init_value; -//----- (0041A7C3) -------------------------------------------------------- void __fastcall init_cleanup(bool show_cursor) { int v1; // edi @@ -68,7 +66,6 @@ void __fastcall init_cleanup(bool show_cursor) ShowCursor(1); } -//----- (0041A84C) -------------------------------------------------------- void __cdecl init_run_office_from_start_menu() { HWND v0; // eax @@ -93,7 +90,6 @@ void __cdecl init_run_office_from_start_menu() } // 634CA0: using guessed type int killed_mom_parent; -//----- (0041A8B9) -------------------------------------------------------- void __fastcall init_run_office(char *dir) { char *v1; // esi @@ -142,7 +138,6 @@ void __fastcall init_run_office(char *dir) } } -//----- (0041AA2C) -------------------------------------------------------- void __fastcall init_disable_screensaver(bool disable) { bool v1; // al @@ -173,7 +168,6 @@ void __fastcall init_disable_screensaver(bool disable) } } -//----- (0041AAC5) -------------------------------------------------------- void __cdecl init_create_window() { int nHeight; // eax @@ -217,7 +211,6 @@ void __cdecl init_create_window() init_disable_screensaver(1); } -//----- (0041AC00) -------------------------------------------------------- void __cdecl init_kill_mom_parent() { HWND v0; // eax @@ -231,7 +224,6 @@ void __cdecl init_kill_mom_parent() } // 634CA0: using guessed type int killed_mom_parent; -//----- (0041AC21) -------------------------------------------------------- HWND __cdecl init_find_mom_parent() { HWND i; // eax @@ -250,7 +242,6 @@ HWND __cdecl init_find_mom_parent() return v1; } -//----- (0041AC71) -------------------------------------------------------- void __cdecl init_await_mom_parent_exit() { DWORD v0; // edi @@ -265,7 +256,6 @@ void __cdecl init_await_mom_parent_exit() while ( GetTickCount() - v0 <= 4000 ); } -//----- (0041ACA1) -------------------------------------------------------- void __cdecl init_archives() { void *a1; // [esp+8h] [ebp-8h] @@ -298,7 +288,6 @@ void __cdecl init_archives() patch_rt_mpq = init_test_access(patch_rt_mpq_path, "\\patch_rt.mpq", "DiabloInstall", 2000, 0); } -//----- (0041AD72) -------------------------------------------------------- void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, bool on_cd) { char *v5; // esi @@ -365,7 +354,6 @@ void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, return 0; } -//----- (0041AF22) -------------------------------------------------------- char *__fastcall init_strip_trailing_slash(char *path) { char *result; // eax @@ -379,7 +367,6 @@ char *__fastcall init_strip_trailing_slash(char *path) return result; } -//----- (0041AF3A) -------------------------------------------------------- int __fastcall init_read_test_file(char *mpq_path, char *mpq_name, int flags, void **archive) { char *v4; // edi @@ -416,7 +403,6 @@ int __fastcall init_read_test_file(char *mpq_path, char *mpq_name, int flags, vo return 1; } -//----- (0041AFCE) -------------------------------------------------------- void __cdecl init_get_file_info() { int v0; // eax @@ -449,7 +435,6 @@ void __cdecl init_get_file_info() } } -//----- (0041B06C) -------------------------------------------------------- LRESULT __stdcall init_palette(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { if ( Msg > WM_ERASEBKGND ) @@ -494,7 +479,6 @@ LRESULT __stdcall init_palette(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam } // 52571C: using guessed type int drawpanflag; -//----- (0041B105) -------------------------------------------------------- void __fastcall init_activate_window(HWND hWnd, bool activated) { LONG dwNewLong; // eax @@ -520,7 +504,6 @@ void __fastcall init_activate_window(HWND hWnd, bool activated) // 52571C: using guessed type int drawpanflag; // 634980: using guessed type int window_activated; -//----- (0041B15F) -------------------------------------------------------- LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { LRESULT result; // eax @@ -532,7 +515,6 @@ LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM return result; } -//----- (0041B184) -------------------------------------------------------- LRESULT (__stdcall *SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LRESULT (__stdcall *result)(HWND, UINT, WPARAM, LPARAM); // eax diff --git a/Source/init.h b/Source/init.h index 90b2141..1eb029c 100644 --- a/Source/init.h +++ b/Source/init.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __INIT_H__ +#define __INIT_H__ -//init extern _SNETVERSIONDATA fileinfo; extern int init_cpp_init_value; // weak extern int window_activated; // weak @@ -40,3 +41,5 @@ extern int init_inf; // weak extern char gszVersionNumber[260]; extern char gszProductName[260]; + +#endif /* __INIT_H__ */ diff --git a/Source/interfac.cpp b/Source/interfac.cpp index 671fd32..a8c88a2 100644 --- a/Source/interfac.cpp +++ b/Source/interfac.cpp @@ -11,7 +11,6 @@ int interfac_inf = 0x7F800000; // weak unsigned char progress_bar_colours[3] = { 138u, 43u, 254u }; POINT32 progress_bar_screen_pos[3] = { { 53, 37 }, { 53, 421 }, { 53, 37 } }; -//----- (0041B195) -------------------------------------------------------- struct interfac_cpp_init { interfac_cpp_init() @@ -21,7 +20,6 @@ struct interfac_cpp_init } _interfac_cpp_init; // 47AE40: using guessed type int interfac_inf; -//----- (0041B1A0) -------------------------------------------------------- void __cdecl interface_msg_pump() { MSG Msg; // [esp+8h] [ebp-1Ch] @@ -36,7 +34,6 @@ void __cdecl interface_msg_pump() } } -//----- (0041B1DF) -------------------------------------------------------- bool __cdecl IncProgress() { interface_msg_pump(); @@ -48,7 +45,6 @@ bool __cdecl IncProgress() return (unsigned int)sgdwProgress >= 0x216; } -//----- (0041B218) -------------------------------------------------------- void __cdecl DrawCutscene() { unsigned int v0; // esi @@ -71,7 +67,6 @@ void __cdecl DrawCutscene() } // 52571C: using guessed type int drawpanflag; -//----- (0041B28D) -------------------------------------------------------- void __fastcall DrawProgress(int screen_x, int screen_y, int progress_id) { _BYTE *v3; // eax @@ -88,7 +83,6 @@ void __fastcall DrawProgress(int screen_x, int screen_y, int progress_id) while ( v4 ); } -//----- (0041B2B6) -------------------------------------------------------- void __fastcall ShowProgress(int uMsg) { LRESULT (__stdcall *saveProc)(HWND, UINT, WPARAM, LPARAM); // edi @@ -245,7 +239,6 @@ LABEL_41: // 6761B8: using guessed type char gbSomebodyWonGameKludge; // 679660: using guessed type char gbMaxPlayers; -//----- (0041B5F5) -------------------------------------------------------- void __cdecl FreeInterface() { void *v0; // ecx @@ -255,7 +248,6 @@ void __cdecl FreeInterface() mem_free_dbg(v0); } -//----- (0041B607) -------------------------------------------------------- void __fastcall InitCutscene(int interface_mode) { int v1; // eax diff --git a/Source/interfac.h b/Source/interfac.h index d5f870a..6b6d3ab 100644 --- a/Source/interfac.h +++ b/Source/interfac.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __INTERFAC_H__ +#define __INTERFAC_H__ -//interfac extern void *sgpBackCel; extern float interfac_cpp_init_value; extern int sgdwProgress; @@ -20,3 +21,5 @@ void __fastcall InitCutscene(int interface_mode); extern int interfac_inf; // weak extern unsigned char progress_bar_colours[3]; extern POINT32 progress_bar_screen_pos[3]; + +#endif /* __INTERFAC_H__ */ diff --git a/Source/inv.cpp b/Source/inv.cpp index e04d6ac..57dec68 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -88,7 +88,6 @@ InvXY InvRect[73] = int AP2x2Tbl[10] = { 8, 28, 6, 26, 4, 24, 2, 22, 0, 20 }; // weak -//----- (0041B814) -------------------------------------------------------- void __cdecl FreeInvGFX() { void *v0; // ecx @@ -98,7 +97,6 @@ void __cdecl FreeInvGFX() mem_free_dbg(v0); } -//----- (0041B826) -------------------------------------------------------- void __cdecl InitInv() { char v0; // al @@ -123,7 +121,6 @@ LABEL_7: drawsbarflag = 0; } -//----- (0041B871) -------------------------------------------------------- void __fastcall InvDrawSlotBack(int X, int Y, int W, int H) { unsigned char *v4; // edi @@ -164,7 +161,6 @@ LABEL_9: while ( v5 ); } -//----- (0041B8C4) -------------------------------------------------------- void __cdecl DrawInv() { int v0; // ecx @@ -454,7 +450,6 @@ void __cdecl DrawInv() // 69CF94: using guessed type int cel_transparency_active; // 41B8C4: using guessed type int var_A0[40]; -//----- (0041C060) -------------------------------------------------------- void __cdecl DrawInvBelt() { int v0; // ebx @@ -539,7 +534,6 @@ void __cdecl DrawInvBelt() // 4B8960: using guessed type int talkflag; // 4B8CB8: using guessed type char pcursinvitem; -//----- (0041C23F) -------------------------------------------------------- int __fastcall AutoPlace(int pnum, int ii, int sx, int sy, int saveflag) { __int64 v5; // rax @@ -637,7 +631,6 @@ LABEL_16: return v6; } -//----- (0041C373) -------------------------------------------------------- int __fastcall SpecialAutoPlace(int pnum, int ii, int sx, int sy, int saveflag) { __int64 v5; // rax @@ -750,7 +743,6 @@ LABEL_24: return v6; } -//----- (0041C4E0) -------------------------------------------------------- int __fastcall GoldAutoPlace(int pnum) { int v1; // ebp @@ -885,7 +877,6 @@ LABEL_28: return v3; } -//----- (0041C6A9) -------------------------------------------------------- int __fastcall WeaponAutoPlace(int pnum) { int v1; // edi @@ -927,7 +918,6 @@ LABEL_13: return 0; } -//----- (0041C746) -------------------------------------------------------- int __fastcall SwapItem(ItemStruct *a, ItemStruct *b) { int v2; // eax @@ -940,7 +930,6 @@ int __fastcall SwapItem(ItemStruct *a, ItemStruct *b) return v2 + 12; } -//----- (0041C783) -------------------------------------------------------- void __fastcall CheckInvPaste(int pnum, int mx, int my) { int v3; // ebx @@ -1598,7 +1587,6 @@ LABEL_89: // 4B8CBC: using guessed type int icursW; // 52571C: using guessed type int drawpanflag; -//----- (0041D2CF) -------------------------------------------------------- void __fastcall CheckInvSwap(int pnum, int bLoc, int idx, int wCI, int seed, int bId) { unsigned char v6; // bl @@ -1628,7 +1616,6 @@ void __fastcall CheckInvSwap(int pnum, int bLoc, int idx, int wCI, int seed, int CalcPlrInv(p, 1u); } -//----- (0041D378) -------------------------------------------------------- void __fastcall CheckInvCut(int pnum, int mx, int my) { int v3; // ebp @@ -1805,7 +1792,6 @@ LABEL_60: // 4B84DC: using guessed type int dropGoldFlag; // 4B8C9C: using guessed type int cursH; -//----- (0041D6EB) -------------------------------------------------------- void __fastcall inv_update_rem_item(int pnum, int iv) { unsigned char v2; // dl @@ -1818,7 +1804,6 @@ void __fastcall inv_update_rem_item(int pnum, int iv) CalcPlrInv(pnum, v2); } -//----- (0041D722) -------------------------------------------------------- void __fastcall RemoveInvItem(int pnum, int iv) { int v2; // edx @@ -1877,7 +1862,6 @@ void __fastcall RemoveInvItem(int pnum, int iv) } // 52571C: using guessed type int drawpanflag; -//----- (0041D810) -------------------------------------------------------- void __fastcall RemoveSpdBarItem(int pnum, int iv) { int v2; // esi @@ -1896,7 +1880,6 @@ void __fastcall RemoveSpdBarItem(int pnum, int iv) } // 52571C: using guessed type int drawpanflag; -//----- (0041D86C) -------------------------------------------------------- void __cdecl CheckInvItem() { if ( pcurs < CURSOR_FIRSTITEM ) @@ -1905,14 +1888,12 @@ void __cdecl CheckInvItem() CheckInvPaste(myplr, MouseX, MouseY); } -//----- (0041D893) -------------------------------------------------------- void __cdecl CheckInvScrn() { if ( MouseX > 190 && MouseX < 437 && MouseY > 352 && MouseY < 385 ) CheckInvItem(); } -//----- (0041D8BF) -------------------------------------------------------- void __fastcall CheckItemStats(int pnum) { PlayerStruct *v1; // eax @@ -1929,7 +1910,6 @@ void __fastcall CheckItemStats(int pnum) } } -//----- (0041D90B) -------------------------------------------------------- void __fastcall CheckBookLevel(int pnum) { int v1; // ecx @@ -1962,7 +1942,6 @@ void __fastcall CheckBookLevel(int pnum) } } -//----- (0041D97F) -------------------------------------------------------- void __fastcall CheckQuestItem(int pnum) { int v1; // ecx @@ -2098,7 +2077,6 @@ void __fastcall CheckQuestItem(int pnum) } // 52A554: using guessed type int sfxdelay; -//----- (0041DB65) -------------------------------------------------------- void __fastcall InvGetItem(int pnum, int ii) { int v2; // ebp @@ -2148,7 +2126,6 @@ void __fastcall InvGetItem(int pnum, int ii) // 4B84DC: using guessed type int dropGoldFlag; // 4B8CC0: using guessed type char pcursitem; -//----- (0041DC79) -------------------------------------------------------- void __fastcall AutoGetItem(int pnum, int ii) { int v2; // ebx @@ -2437,7 +2414,6 @@ LABEL_84: // 48E9A8: using guessed type int AP2x2Tbl[10]; // 4B84DC: using guessed type int dropGoldFlag; -//----- (0041E103) -------------------------------------------------------- int __fastcall FindGetItem(int indx, unsigned short ci, int iseed) { int i; // ebx @@ -2457,7 +2433,6 @@ int __fastcall FindGetItem(int indx, unsigned short ci, int iseed) return ii; } -//----- (0041E158) -------------------------------------------------------- void __fastcall SyncGetItem(int x, int y, int idx, unsigned short ci, int iseed) { char v5; // cl @@ -2502,7 +2477,6 @@ void __fastcall SyncGetItem(int x, int y, int idx, unsigned short ci, int iseed) } } -//----- (0041E222) -------------------------------------------------------- int __fastcall CanPut(int i, int j) { int v2; // ecx @@ -2549,7 +2523,6 @@ int __fastcall CanPut(int i, int j) return 1; } -//----- (0041E2F9) -------------------------------------------------------- int __cdecl TryInvPut() { int result; // eax @@ -2578,7 +2551,6 @@ int __cdecl TryInvPut() return result; } -//----- (0041E3BC) -------------------------------------------------------- void __fastcall DrawInvMsg(char *msg) { char *v1; // esi @@ -2593,7 +2565,6 @@ void __fastcall DrawInvMsg(char *msg) } } -//----- (0041E3E4) -------------------------------------------------------- int __fastcall InvPutItem(int pnum, int x, int y) { int v3; // edi @@ -2713,7 +2684,6 @@ int __fastcall InvPutItem(int pnum, int x, int y) return yc; } -//----- (0041E639) -------------------------------------------------------- int __fastcall SyncPutItem(int pnum, int x, int y, int idx, int icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, unsigned int ibuff) { int v13; // ebx @@ -2847,7 +2817,6 @@ int __fastcall SyncPutItem(int pnum, int x, int y, int idx, int icreateinfo, int return ic; } -//----- (0041E8DD) -------------------------------------------------------- int __cdecl CheckInvHLight() { signed int v0; // ebx @@ -2996,7 +2965,6 @@ LABEL_36: } // 4B883C: using guessed type int infoclr; -//----- (0041EAEA) -------------------------------------------------------- void __fastcall RemoveScroll(int pnum) { int v1; // eax @@ -3040,7 +3008,6 @@ LABEL_8: CalcPlrScrolls(p); } -//----- (0041EB8B) -------------------------------------------------------- bool __cdecl UseScroll() { int v0; // eax @@ -3083,7 +3050,6 @@ LABEL_11: } // 5BB1ED: using guessed type char leveltype; -//----- (0041EC42) -------------------------------------------------------- void __fastcall UseStaffCharge(int pnum) { int v1; // eax @@ -3103,7 +3069,6 @@ void __fastcall UseStaffCharge(int pnum) } } -//----- (0041EC7F) -------------------------------------------------------- bool __cdecl UseStaff() { int v0; // eax @@ -3124,7 +3089,6 @@ bool __cdecl UseStaff() return result; } -//----- (0041ECC3) -------------------------------------------------------- void __cdecl StartGoldDrop() { int v0; // eax @@ -3144,7 +3108,6 @@ void __cdecl StartGoldDrop() // 4B8960: using guessed type int talkflag; // 4B8CB8: using guessed type char pcursinvitem; -//----- (0041ED29) -------------------------------------------------------- int __fastcall UseInvItem(int pnum, int cii) { int v2; // esi @@ -3300,7 +3263,6 @@ LABEL_39: // 52A554: using guessed type int sfxdelay; // 6AA705: using guessed type char stextflag; -//----- (0041EFA1) -------------------------------------------------------- void __cdecl DoTelekinesis() { if ( pcursobj != -1 ) @@ -3314,7 +3276,6 @@ void __cdecl DoTelekinesis() // 4B8CC0: using guessed type char pcursitem; // 4B8CC1: using guessed type char pcursobj; -//----- (0041F013) -------------------------------------------------------- int __fastcall CalculateGold(int pnum) { int result; // eax @@ -3356,7 +3317,6 @@ int __fastcall CalculateGold(int pnum) } // 52571C: using guessed type int drawpanflag; -//----- (0041F068) -------------------------------------------------------- int __cdecl DropItemBeforeTrig() { if ( !TryInvPut() ) diff --git a/Source/inv.h b/Source/inv.h index 626e5e2..c85f6ef 100644 --- a/Source/inv.h +++ b/Source/inv.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __INV_H__ +#define __INV_H__ -//inv extern int invflag; extern void *pInvCels; extern int drawsbarflag; // idb @@ -54,3 +55,5 @@ extern InvXY InvRect[73]; /* rdata */ extern int AP2x2Tbl[10]; // weak + +#endif /* __INV_H__ */ diff --git a/Source/items.cpp b/Source/items.cpp index 246899c..3d081ac 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -635,7 +635,6 @@ int ItemInvSnds[35] = int idoppely = 16; // weak int premiumlvladd[6] = { -1, -1, 0, 0, 1, 2 }; -//----- (0041F096) -------------------------------------------------------- void __cdecl InitItemGFX() { signed int v0; // esi @@ -652,7 +651,6 @@ void __cdecl InitItemGFX() memset(UniqueItemFlag, 0, 0x200u); } -//----- (0041F0E8) -------------------------------------------------------- bool __fastcall ItemPlace(int x, int y) { int v2; // ecx @@ -668,7 +666,6 @@ bool __fastcall ItemPlace(int x, int y) return result; } -//----- (0041F13A) -------------------------------------------------------- void __cdecl AddInitItems() { int i; // eax @@ -714,7 +711,6 @@ void __cdecl AddInitItems() } } -//----- (0041F24E) -------------------------------------------------------- void __cdecl InitItems() { int *v0; // eax @@ -759,7 +755,6 @@ void __cdecl InitItems() } // 5CF31D: using guessed type char setlevel; -//----- (0041F320) -------------------------------------------------------- void __fastcall CalcPlrItemVals(int p, bool Loadgfx) { int v2; // eax @@ -1109,7 +1104,6 @@ LABEL_86: } // 52571C: using guessed type int drawpanflag; -//----- (0041F953) -------------------------------------------------------- void __fastcall CalcPlrScrolls(int p) { int v1; // esi @@ -1170,7 +1164,6 @@ void __fastcall CalcPlrScrolls(int p) } // 52571C: using guessed type int drawpanflag; -//----- (0041FA4A) -------------------------------------------------------- void __fastcall CalcPlrStaff(int pnum) { int v1; // esi @@ -1189,7 +1182,6 @@ void __fastcall CalcPlrStaff(int pnum) } } -//----- (0041FA97) -------------------------------------------------------- void __fastcall CalcSelfItems(int pnum) { PlayerStruct *v1; // ecx @@ -1266,7 +1258,6 @@ void __fastcall CalcSelfItems(int pnum) while ( v9 ); } -//----- (0041FB91) -------------------------------------------------------- void __fastcall CalcPlrItemMin(int pnum) { PlayerStruct *v1; // ecx @@ -1304,7 +1295,6 @@ void __fastcall CalcPlrItemMin(int pnum) while ( v7 ); } -//----- (0041FBF6) -------------------------------------------------------- bool __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x) { if ( p->_pStrength < x->_iMinStr || p->_pMagic < x->_iMinMag || p->_pDexterity < x->_iMinDex ) @@ -1313,7 +1303,6 @@ bool __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x) return 1; } -//----- (0041FC2C) -------------------------------------------------------- void __fastcall CalcPlrBookVals(int p) { int v1; // esi @@ -1385,7 +1374,6 @@ void __fastcall CalcPlrBookVals(int p) } } -//----- (0041FD3E) -------------------------------------------------------- void __fastcall CalcPlrInv(int p, bool Loadgfx) { CalcPlrItemMin(p); @@ -1402,7 +1390,6 @@ void __fastcall CalcPlrInv(int p, bool Loadgfx) } } -//----- (0041FD98) -------------------------------------------------------- void __fastcall SetPlrHandItem(ItemStruct *h, int idata) { ItemDataStruct *pAllItem; // edi @@ -1438,13 +1425,11 @@ void __fastcall SetPlrHandItem(ItemStruct *h, int idata) h->IDidx = idata; } -//----- (0041FE98) -------------------------------------------------------- void __fastcall GetPlrHandSeed(ItemStruct *h) { h->_iSeed = GetRndSeed(); } -//----- (0041FEA4) -------------------------------------------------------- void __fastcall GetGoldSeed(int pnum, ItemStruct *h) { int v3; // edi @@ -1485,13 +1470,11 @@ void __fastcall GetGoldSeed(int pnum, ItemStruct *h) h->_iSeed = v5; } -//----- (0041FF16) -------------------------------------------------------- void __fastcall SetPlrHandSeed(ItemStruct *h, int iseed) { h->_iSeed = iseed; } -//----- (0041FF19) -------------------------------------------------------- void __fastcall SetPlrHandGoldCurs(ItemStruct *h) { int v1; // eax @@ -1510,7 +1493,6 @@ void __fastcall SetPlrHandGoldCurs(ItemStruct *h) } } -//----- (0041FF4E) -------------------------------------------------------- void __fastcall CreatePlrItems(int p) { int v1; // ebx @@ -1592,7 +1574,6 @@ LABEL_14: CalcPlrItemVals(player_numa, 0); } -//----- (004200F8) -------------------------------------------------------- bool __fastcall ItemSpaceOk(int i, int j) { int v2; // eax @@ -1643,7 +1624,6 @@ bool __fastcall ItemSpaceOk(int i, int j) return 0; } -//----- (004201F2) -------------------------------------------------------- bool __fastcall GetItemSpace(int x, int y, char inum) { int v3; // eax @@ -1740,7 +1720,6 @@ bool __fastcall GetItemSpace(int x, int y, char inum) return 1; } -//----- (004202E8) -------------------------------------------------------- void __fastcall GetSuperItemSpace(int x, int y, char inum) { signed int v4; // edi @@ -1795,7 +1774,6 @@ void __fastcall GetSuperItemSpace(int x, int y, char inum) } } -//----- (00420376) -------------------------------------------------------- void __fastcall GetSuperItemLoc(int x, int y, int *xx, int *yy) { signed int v4; // edi @@ -1840,7 +1818,6 @@ LABEL_3: } } -//----- (004203E0) -------------------------------------------------------- void __fastcall CalcItemValue(int i) { int v1; // ecx @@ -1864,7 +1841,6 @@ void __fastcall CalcItemValue(int i) item[v1]._iIvalue = v4; } -//----- (0042042C) -------------------------------------------------------- void __fastcall GetBookSpell(int i, int lvl) { int v2; // edi @@ -1924,7 +1900,6 @@ LABEL_13: } // 679660: using guessed type char gbMaxPlayers; -//----- (00420514) -------------------------------------------------------- void __fastcall GetStaffPower(int i, int lvl, int bs, unsigned char onlygood) { int v4; // esi @@ -2004,7 +1979,6 @@ void __fastcall GetStaffPower(int i, int lvl, int bs, unsigned char onlygood) } // 420514: using guessed type int var_484[256]; -//----- (004206E5) -------------------------------------------------------- void __fastcall GetStaffSpell(int i, int lvl, unsigned char onlygood) { int l; // esi @@ -2066,7 +2040,6 @@ LABEL_15: } // 679660: using guessed type char gbMaxPlayers; -//----- (0042084A) -------------------------------------------------------- void __fastcall GetItemAttrs(int i, int idata, int lvl) { int rndv; // eax @@ -2153,13 +2126,11 @@ void __fastcall GetItemAttrs(int i, int idata, int lvl) } // 5BB1ED: using guessed type char leveltype; -//----- (00420B17) -------------------------------------------------------- int __fastcall RndPL(int param1, int param2) { return param1 + random(22, param2 - param1 + 1); } -//----- (00420B28) -------------------------------------------------------- int __fastcall PLVal(int pv, int p1, int p2, int minv, int maxv) { if ( p1 == p2 ) @@ -2169,7 +2140,6 @@ int __fastcall PLVal(int pv, int p1, int p2, int minv, int maxv) return minv + (maxv - minv) * (100 * (pv - p1) / (p2 - p1)) / 100; } -//----- (00420B68) -------------------------------------------------------- void __fastcall SaveItemPower(int i, int power, int param1, int param2, int minval, int maxval, int multval) { int v7; // edi @@ -2562,7 +2532,6 @@ LABEL_62: } } -//----- (004215EF) -------------------------------------------------------- void __fastcall GetItemPower(int i, int minlvl, int maxlvl, int flgs, int onlygood) { //int v6; // ecx @@ -2686,7 +2655,6 @@ void __fastcall GetItemPower(int i, int minlvl, int maxlvl, int flgs, int onlygo } // 4215EF: using guessed type int var_494[256]; -//----- (0042191C) -------------------------------------------------------- void __fastcall GetItemBonus(int i, int idata, int minlvl, int maxlvl, int onlygood) { if ( item[i]._iClass != ICLASS_GOLD ) @@ -2726,7 +2694,6 @@ void __fastcall GetItemBonus(int i, int idata, int minlvl, int maxlvl, int onlyg } } -//----- (004219C1) -------------------------------------------------------- void __fastcall SetupItem(int i) { int it; // eax @@ -2756,7 +2723,6 @@ void __fastcall SetupItem(int i) item[i]._iAnimFrame = il; } -//----- (00421A4B) -------------------------------------------------------- int __fastcall RndItem(int m) { int ri; // esi @@ -2797,7 +2763,6 @@ int __fastcall RndItem(int m) // 679660: using guessed type char gbMaxPlayers; // 421A4B: using guessed type int var_800[512]; -//----- (00421B32) -------------------------------------------------------- int __fastcall RndUItem(int m) { int ri; // edx @@ -2853,7 +2818,6 @@ int __fastcall RndUItem(int m) // 679660: using guessed type char gbMaxPlayers; // 421B32: using guessed type int var_800[512]; -//----- (00421C2A) -------------------------------------------------------- int __cdecl RndAllItems() { int ri; // esi @@ -2884,7 +2848,6 @@ int __cdecl RndAllItems() // 679660: using guessed type char gbMaxPlayers; // 421C2A: using guessed type int var_800[512]; -//----- (00421CB7) -------------------------------------------------------- int __fastcall RndTypeItems(int itype, int imid) { int i; // edi @@ -2919,7 +2882,6 @@ int __fastcall RndTypeItems(int itype, int imid) } // 421CB7: using guessed type int var_80C[512]; -//----- (00421D41) -------------------------------------------------------- int __fastcall CheckUnique(int i, int lvl, int uper, bool recreate) { int numu; // ebx @@ -2969,7 +2931,6 @@ int __fastcall CheckUnique(int i, int lvl, int uper, bool recreate) // 679660: using guessed type char gbMaxPlayers; // 421D41: using guessed type char var_84[128]; -//----- (00421E11) -------------------------------------------------------- void __fastcall GetUniqueItem(int i, int uid) { UniqueItemFlag[uid] = 1; @@ -2997,7 +2958,6 @@ void __fastcall GetUniqueItem(int i, int uid) item[i]._iMagical = 2; } -//----- (00421F5C) -------------------------------------------------------- void __fastcall SpawnUnique(int uid, int x, int y) { int ii; // esi @@ -3027,14 +2987,12 @@ void __fastcall SpawnUnique(int uid, int x, int y) } // 421F5C: could not find valid save-restore pair for esi -//----- (00421FE6) -------------------------------------------------------- void __fastcall ItemRndDur(int ii) { if ( item[ii]._iDurability && item[ii]._iDurability != 255 ) item[ii]._iDurability = random(0, item[ii]._iMaxDur >> 1) + (item[ii]._iMaxDur >> 2) + 1; } -//----- (00422024) -------------------------------------------------------- void __fastcall SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, int onlygood, int recreate, int pregen) { int iblvl; // edi @@ -3098,7 +3056,6 @@ void __fastcall SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, int SetupItem(ii); } -//----- (0042217A) -------------------------------------------------------- void __fastcall SpawnItem(int m, int x, int y, unsigned char sendmsg) { int ii; // edi @@ -3150,7 +3107,6 @@ LABEL_13: } // 679660: using guessed type char gbMaxPlayers; -//----- (00422290) -------------------------------------------------------- void __fastcall CreateItem(int uid, int x, int y) { int ii; // esi @@ -3181,7 +3137,6 @@ void __fastcall CreateItem(int uid, int x, int y) } // 422290: could not find valid save-restore pair for esi -//----- (0042232B) -------------------------------------------------------- void __fastcall CreateRndItem(int x, int y, unsigned char onlygood, unsigned char sendmsg, int delta) { int idx; // edi @@ -3209,7 +3164,6 @@ void __fastcall CreateRndItem(int x, int y, unsigned char onlygood, unsigned cha } } -//----- (004223D0) -------------------------------------------------------- void __fastcall SetupAllUseful(int ii, int iseed, int lvl) { int idx; // esi @@ -3229,7 +3183,6 @@ void __fastcall SetupAllUseful(int ii, int iseed, int lvl) SetupItem(ii); } -//----- (0042243D) -------------------------------------------------------- void __fastcall CreateRndUseful(int pnum, int x, int y, unsigned char sendmsg) { int ii; // esi @@ -3249,7 +3202,6 @@ void __fastcall CreateRndUseful(int pnum, int x, int y, unsigned char sendmsg) } } -//----- (004224A6) -------------------------------------------------------- void __fastcall CreateTypeItem(int x, int y, unsigned char onlygood, int itype, int imisc, int sendmsg, int delta) { int idx; // edi @@ -3277,7 +3229,6 @@ void __fastcall CreateTypeItem(int x, int y, unsigned char onlygood, int itype, } } -//----- (0042254A) -------------------------------------------------------- void __fastcall RecreateItem(int ii, int idx, unsigned short ic, int iseed, int ivalue) { int uper; // esi @@ -3342,7 +3293,6 @@ void __fastcall RecreateItem(int ii, int idx, unsigned short ic, int iseed, int } } -//----- (0042265C) -------------------------------------------------------- void __fastcall RecreateEar(int ii, unsigned short ic, int iseed, unsigned char Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff) { SetPlrHandItem(&item[ii], IDI_EAR); @@ -3370,7 +3320,6 @@ void __fastcall RecreateEar(int ii, unsigned short ic, int iseed, unsigned char item[ii]._iSeed = iseed; } -//----- (00422795) -------------------------------------------------------- void __fastcall SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag) { int i; // ebx @@ -3437,7 +3386,6 @@ LABEL_13: } } -//----- (004228B1) -------------------------------------------------------- void __cdecl SpawnRock() { BOOL v0; // edx @@ -3491,7 +3439,6 @@ void __cdecl SpawnRock() } } -//----- (00422989) -------------------------------------------------------- void __fastcall RespawnItem(int i, bool FlipFlag) { int it; // ecx @@ -3531,7 +3478,6 @@ void __fastcall RespawnItem(int i, bool FlipFlag) item[i]._iSelFlag = 1; } -//----- (00422A50) -------------------------------------------------------- void __fastcall DeleteItem(int ii, int i) { int v2; // eax @@ -3547,7 +3493,6 @@ void __fastcall DeleteItem(int ii, int i) itemactive[i] = itemactive[v2]; } -//----- (00422A84) -------------------------------------------------------- void __cdecl ItemDoppel() { int idoppelx; // esi @@ -3572,7 +3517,6 @@ void __cdecl ItemDoppel() // 492EAC: using guessed type int idoppely; // 679660: using guessed type char gbMaxPlayers; -//----- (00422ADE) -------------------------------------------------------- void __cdecl ProcessItems() { int i; // edi @@ -3608,7 +3552,6 @@ void __cdecl ProcessItems() ItemDoppel(); } -//----- (00422BB2) -------------------------------------------------------- void __cdecl FreeItemGFX() { int i; // esi @@ -3622,13 +3565,11 @@ void __cdecl FreeItemGFX() } } -//----- (00422BCF) -------------------------------------------------------- void __fastcall GetItemFrm(int i) { item[i]._iAnimData = Item2Frm[ItemCAnimTbl[item[i]._iCurs]]; } -//----- (00422BF0) -------------------------------------------------------- void __fastcall GetItemStr(int i) { int nGold; // esi @@ -3653,7 +3594,6 @@ void __fastcall GetItemStr(int i) } // 4B883C: using guessed type int infoclr; -//----- (00422C63) -------------------------------------------------------- void __fastcall CheckIdentify(int pnum, int cii) { ItemStruct *pi; // esi @@ -3667,7 +3607,6 @@ void __fastcall CheckIdentify(int pnum, int cii) SetCursor(CURSOR_HAND); } -//----- (00422C9C) -------------------------------------------------------- void __fastcall DoRepair(int pnum, int cii) { PlayerStruct *p; // eax @@ -3684,7 +3623,6 @@ void __fastcall DoRepair(int pnum, int cii) SetCursor(CURSOR_HAND); } -//----- (00422CF6) -------------------------------------------------------- void __fastcall RepairItem(ItemStruct *i, int lvl) { int rep; // edi @@ -3720,7 +3658,6 @@ void __fastcall RepairItem(ItemStruct *i, int lvl) } } -//----- (00422D6C) -------------------------------------------------------- void __fastcall DoRecharge(int pnum, int cii) { PlayerStruct *p; // eax @@ -3739,7 +3676,6 @@ void __fastcall DoRecharge(int pnum, int cii) SetCursor(CURSOR_HAND); } -//----- (00422DDD) -------------------------------------------------------- void __fastcall RechargeItem(ItemStruct *i, int r) { if ( i->_iCharges != i->_iMaxCharges ) @@ -3761,7 +3697,6 @@ void __fastcall RechargeItem(ItemStruct *i, int r) } } -//----- (00422E14) -------------------------------------------------------- void __fastcall PrintItemOil(char IDidx) { switch ( IDidx ) @@ -3819,7 +3754,6 @@ void __fastcall PrintItemOil(char IDidx) AddPanelString(tempstr, 1); } -//----- (00422EF4) -------------------------------------------------------- void __fastcall PrintItemPower(char plidx, ItemStruct *x) { ItemStruct *v2; // esi @@ -4097,7 +4031,6 @@ LABEL_104: } } -//----- (00423530) -------------------------------------------------------- void __cdecl DrawUBack() { char *v0; // edi @@ -4147,7 +4080,6 @@ void __cdecl DrawUBack() *v0 = 0; } -//----- (0042358C) -------------------------------------------------------- void __fastcall PrintUString(int x, int y, int cjustflag, char *str, int col) { char *v5; // edi @@ -4208,7 +4140,6 @@ LABEL_16: } } -//----- (0042365B) -------------------------------------------------------- void __fastcall DrawULine(int y) { char *v1; // esi @@ -4231,7 +4162,6 @@ void __fastcall DrawULine(int y) while ( v3 ); } -//----- (004236A6) -------------------------------------------------------- void __cdecl DrawUniqueInfo() { int v0; // esi @@ -4277,7 +4207,6 @@ void __cdecl DrawUniqueInfo() } // 69BD04: using guessed type int questlog; -//----- (004237DC) -------------------------------------------------------- void __fastcall PrintItemMisc(ItemStruct *x) { if ( x->_iMiscId == IMISC_SCROLL ) @@ -4315,7 +4244,6 @@ void __fastcall PrintItemMisc(ItemStruct *x) } } -//----- (004238D4) -------------------------------------------------------- void __fastcall PrintItemDetails(ItemStruct *x) { ItemStruct *v1; // ebp @@ -4385,7 +4313,6 @@ void __fastcall PrintItemDetails(ItemStruct *x) } // 4B8824: using guessed type int pinfoflag; -//----- (00423AE1) -------------------------------------------------------- void __fastcall PrintItemDur(ItemStruct *x) { ItemStruct *v1; // esi @@ -4447,7 +4374,6 @@ void __fastcall PrintItemDur(ItemStruct *x) } // 4B8824: using guessed type int pinfoflag; -//----- (00423CE0) -------------------------------------------------------- void __fastcall UseItem(int p, int Mid, int spl) { int v3; // esi @@ -4785,7 +4711,6 @@ LABEL_71: } } -//----- (004241D7) -------------------------------------------------------- bool __fastcall StoreStatOk(ItemStruct *h) { bool sf; // al @@ -4798,7 +4723,6 @@ bool __fastcall StoreStatOk(ItemStruct *h) return sf; } -//----- (0042421C) -------------------------------------------------------- bool __fastcall SmithItemOk(int i) { unsigned char v1; // cl @@ -4811,7 +4735,6 @@ bool __fastcall SmithItemOk(int i) return rv; } -//----- (00424252) -------------------------------------------------------- int __fastcall RndSmithItem(int lvl) { int ri; // edx @@ -4838,7 +4761,6 @@ int __fastcall RndSmithItem(int lvl) } // 424252: using guessed type int var_804[512]; -//----- (004242C1) -------------------------------------------------------- void __fastcall BubbleSwapItem(ItemStruct *a, ItemStruct *b) { ItemStruct h; // [esp+8h] [ebp-170h] @@ -4848,7 +4770,6 @@ void __fastcall BubbleSwapItem(ItemStruct *a, ItemStruct *b) qmemcpy(b, &h, sizeof(ItemStruct)); } -//----- (004242F5) -------------------------------------------------------- void __cdecl SortSmith() { int v0; // esi @@ -4894,7 +4815,6 @@ void __cdecl SortSmith() } } -//----- (00424351) -------------------------------------------------------- void __fastcall SpawnSmith(int lvl) { int v3; // ebp @@ -4936,7 +4856,6 @@ void __fastcall SpawnSmith(int lvl) SortSmith(); } -//----- (00424420) -------------------------------------------------------- bool __fastcall PremiumItemOk(int i) { unsigned char v1; // cl @@ -4954,7 +4873,6 @@ bool __fastcall PremiumItemOk(int i) } // 679660: using guessed type char gbMaxPlayers; -//----- (0042445F) -------------------------------------------------------- int __fastcall RndPremiumItem(int minlvl, int maxlvl) { int ri; // edx @@ -4983,7 +4901,6 @@ int __fastcall RndPremiumItem(int minlvl, int maxlvl) } // 42445F: using guessed type int ril[512]; -//----- (004244C6) -------------------------------------------------------- void __fastcall SpawnOnePremium(int i, int plvl) { int itype; // esi @@ -5010,7 +4927,6 @@ void __fastcall SpawnOnePremium(int i, int plvl) qmemcpy(item, &holditem, sizeof(ItemStruct)); } -//----- (004245A0) -------------------------------------------------------- void __fastcall SpawnPremium(int lvl) { int i; // eax @@ -5037,7 +4953,6 @@ void __fastcall SpawnPremium(int lvl) } // 69FB38: using guessed type int talker; -//----- (0042466C) -------------------------------------------------------- bool __fastcall WitchItemOk(int i) { bool rv; // eax @@ -5071,7 +4986,6 @@ bool __fastcall WitchItemOk(int i) } // 679660: using guessed type char gbMaxPlayers; -//----- (004246D2) -------------------------------------------------------- int __fastcall RndWitchItem(int lvl) { int ri; // ebx @@ -5094,7 +5008,6 @@ int __fastcall RndWitchItem(int lvl) } // 4246D2: using guessed type int var_804[512]; -//----- (00424735) -------------------------------------------------------- void __cdecl SortWitch() { signed int v0; // esi @@ -5140,7 +5053,6 @@ void __cdecl SortWitch() } } -//----- (00424795) -------------------------------------------------------- void __fastcall WitchBookLevel(int ii) { int slvl; // edi @@ -5166,7 +5078,6 @@ void __fastcall WitchBookLevel(int ii) } } -//----- (00424815) -------------------------------------------------------- void __fastcall SpawnWitch(int lvl) { int v2; // ebp @@ -5233,7 +5144,6 @@ void __fastcall SpawnWitch(int lvl) SortWitch(); } -//----- (004249A4) -------------------------------------------------------- int __fastcall RndBoyItem(int lvl) { int ri; // edx @@ -5256,7 +5166,6 @@ int __fastcall RndBoyItem(int lvl) } // 4249A4: using guessed type int var_800[512]; -//----- (00424A03) -------------------------------------------------------- void __fastcall SpawnBoy(int lvl) { int itype; // esi @@ -5281,7 +5190,6 @@ void __fastcall SpawnBoy(int lvl) } // 6A8A3C: using guessed type int boylevel; -//----- (00424A9B) -------------------------------------------------------- bool __fastcall HealerItemOk(int i) { int v1; // ecx @@ -5339,7 +5247,6 @@ LABEL_21: } // 679660: using guessed type char gbMaxPlayers; -//----- (00424B49) -------------------------------------------------------- int __fastcall RndHealerItem(int lvl) { int ri; // ebx @@ -5362,7 +5269,6 @@ int __fastcall RndHealerItem(int lvl) } // 424B49: using guessed type int var_804[512]; -//----- (00424BAC) -------------------------------------------------------- void __cdecl SortHealer() { signed int v0; // esi @@ -5408,7 +5314,6 @@ void __cdecl SortHealer() } } -//----- (00424C0C) -------------------------------------------------------- void __fastcall SpawnHealer(int lvl) { int v3; // eax @@ -5468,7 +5373,6 @@ void __fastcall SpawnHealer(int lvl) } // 679660: using guessed type char gbMaxPlayers; -//----- (00424D57) -------------------------------------------------------- void __cdecl SpawnStoreGold() { GetItemAttrs(0, IDI_GOLD, 1); @@ -5476,7 +5380,6 @@ void __cdecl SpawnStoreGold() golditem._iStatFlag = 1; } -//----- (00424D80) -------------------------------------------------------- void __fastcall RecreateSmithItem(int ii, int idx, int plvl, int iseed) { SetRndSeed(iseed); @@ -5486,7 +5389,6 @@ void __fastcall RecreateSmithItem(int ii, int idx, int plvl, int iseed) item[ii]._iIdentified = 1; } -//----- (00424DD1) -------------------------------------------------------- void __fastcall RecreatePremiumItem(int ii, int idx, int lvl, int iseed) { int itype; // edi @@ -5500,7 +5402,6 @@ void __fastcall RecreatePremiumItem(int ii, int idx, int lvl, int iseed) item[ii]._iIdentified = 1; } -//----- (00424E3C) -------------------------------------------------------- void __fastcall RecreateBoyItem(int ii, int idx, int lvl, int iseed) { int itype; // edi @@ -5514,7 +5415,6 @@ void __fastcall RecreateBoyItem(int ii, int idx, int lvl, int iseed) item[ii]._iIdentified = 1; } -//----- (00424EA1) -------------------------------------------------------- void __fastcall RecreateWitchItem(int ii, int idx, int lvl, int iseed) { int itype; // edi @@ -5540,7 +5440,6 @@ void __fastcall RecreateWitchItem(int ii, int idx, int lvl, int iseed) item[ii]._iIdentified = 1; } -//----- (00424F52) -------------------------------------------------------- void __fastcall RecreateHealerItem(int ii, int idx, int lvl, int iseed) { if ( idx != IDI_HEAL && idx != IDI_FULLHEAL && idx != IDI_RESURRECT ) @@ -5554,7 +5453,6 @@ void __fastcall RecreateHealerItem(int ii, int idx, int lvl, int iseed) item[ii]._iIdentified = 1; } -//----- (00424FB8) -------------------------------------------------------- void __fastcall RecreateTownItem(int ii, int idx, unsigned short icreateinfo, int iseed, int ivalue) { if ( icreateinfo & 0x400 ) @@ -5569,7 +5467,6 @@ void __fastcall RecreateTownItem(int ii, int idx, unsigned short icreateinfo, in RecreateHealerItem(ii, idx, icreateinfo & 0x3F, iseed); } -//----- (0042501F) -------------------------------------------------------- void __cdecl RecalcStoreStats() { int i; @@ -5595,7 +5492,6 @@ void __cdecl RecalcStoreStats() // 6A6BB8: using guessed type int stextscrl; // 6AA700: using guessed type int stextdown; -//----- (004250C0) -------------------------------------------------------- int __cdecl ItemNoFlippy() { int r; // ecx @@ -5608,7 +5504,6 @@ int __cdecl ItemNoFlippy() return r; } -//----- (004250EF) -------------------------------------------------------- void __fastcall CreateSpellBook(int x, int y, int ispell, bool sendmsg, int delta) { int ii; // edi @@ -5638,7 +5533,6 @@ void __fastcall CreateSpellBook(int x, int y, int ispell, bool sendmsg, int delt } } -//----- (004251B8) -------------------------------------------------------- void __fastcall CreateMagicItem(int x, int y, int imisc, int icurs, int sendmsg, int delta) { int ii; // esi @@ -5668,7 +5562,6 @@ void __fastcall CreateMagicItem(int x, int y, int imisc, int icurs, int sendmsg, } } -//----- (0042526E) -------------------------------------------------------- bool __fastcall GetItemRecord(int dwSeed, int CI, int indx) { int v3; // edi @@ -5712,7 +5605,6 @@ LABEL_8: return 0; } -//----- (00425311) -------------------------------------------------------- void __fastcall NextItemRecord(int i) { int v1; // eax @@ -5727,7 +5619,6 @@ void __fastcall NextItemRecord(int i) } } -//----- (00425357) -------------------------------------------------------- void __fastcall SetItemRecord(int dwSeed, int CI, int indx) { int i; // ecx @@ -5742,7 +5633,6 @@ void __fastcall SetItemRecord(int dwSeed, int CI, int indx) } } -//----- (0042539E) -------------------------------------------------------- void __fastcall PutItemRecord(int seed, int ci, int index) { int v3; // edi diff --git a/Source/items.h b/Source/items.h index 30b1655..14f1796 100644 --- a/Source/items.h +++ b/Source/items.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __ITEMS_H__ +#define __ITEMS_H__ -//items extern int itemactive[127]; extern int uitemflag; extern int itemavail[127]; @@ -142,3 +143,5 @@ extern int ItemDropSnds[35]; extern int ItemInvSnds[35]; extern int idoppely; // weak extern int premiumlvladd[6]; + +#endif /* __ITEMS_H__ */ diff --git a/Source/lighting.cpp b/Source/lighting.cpp index 16e35b5..30a6940 100644 --- a/Source/lighting.cpp +++ b/Source/lighting.cpp @@ -479,7 +479,6 @@ unsigned char byte_49463C[18][18] = /* unused */ unsigned char RadiusAdj[23] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 4, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0 }; -//----- (00425443) -------------------------------------------------------- void __fastcall SetLightFX(int *x, int *y, short *s_r, short *s_g, int *s_b, int *d_r, int *d_g, int *d_b) { short *v8; // eax @@ -511,7 +510,6 @@ void __fastcall SetLightFX(int *x, int *y, short *s_r, short *s_g, int *s_b, int } } -//----- (004254BA) -------------------------------------------------------- void __fastcall DoLighting(int nXPos, int nYPos, int nRadius, int Lnum) { int v4; // edi @@ -794,7 +792,6 @@ void __fastcall DoLighting(int nXPos, int nYPos, int nRadius, int Lnum) } } -//----- (004258B0) -------------------------------------------------------- void __fastcall DoUnLight(int nXPos, int nYPos, int nRadius) { int max_y; // ebx @@ -835,7 +832,6 @@ void __fastcall DoUnLight(int nXPos, int nYPos, int nRadius) } } -//----- (00425930) -------------------------------------------------------- void __fastcall DoUnVision(int nXPos, int nYPos, int nRadius) { int y2; // edi @@ -873,7 +869,6 @@ void __fastcall DoUnVision(int nXPos, int nYPos, int nRadius) } } -//----- (0042598A) -------------------------------------------------------- void __fastcall DoVision(int nXPos, int nYPos, int nRadius, unsigned char doautomap, int visible) { char *v5; // esi @@ -1037,7 +1032,6 @@ void __fastcall DoVision(int nXPos, int nYPos, int nRadius, unsigned char doauto while ( v27 < 4 ); } -//----- (00425C13) -------------------------------------------------------- void __cdecl FreeLightTable() { char *v0; // ecx @@ -1047,13 +1041,11 @@ void __cdecl FreeLightTable() mem_free_dbg(v0); } -//----- (00425C25) -------------------------------------------------------- void __cdecl InitLightTable() { pLightTbl = (char *)DiabloAllocPtr(6912); } -//----- (00425C35) -------------------------------------------------------- void __cdecl MakeLightTable() { char *v0; // ebx @@ -1399,7 +1391,6 @@ void __cdecl MakeLightTable() // 525728: using guessed type int light4flag; // 5BB1ED: using guessed type char leveltype; -//----- (00425FB8) -------------------------------------------------------- void __cdecl InitLightMax() { lightmax = light4flag == 0 ? 15 : 3; @@ -1407,7 +1398,6 @@ void __cdecl InitLightMax() // 525728: using guessed type int light4flag; // 642A14: using guessed type char lightmax; -//----- (00425FCE) -------------------------------------------------------- void __cdecl InitLighting() { signed int v0; // eax @@ -1426,7 +1416,6 @@ void __cdecl InitLighting() // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (00425FEC) -------------------------------------------------------- int __fastcall AddLight(int x, int y, int r) { int lid; // eax @@ -1449,7 +1438,6 @@ int __fastcall AddLight(int x, int y, int r) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (00426056) -------------------------------------------------------- void __fastcall AddUnLight(int i) { if ( !lightflag && i != -1 ) @@ -1461,7 +1449,6 @@ void __fastcall AddUnLight(int i) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (00426076) -------------------------------------------------------- void __fastcall ChangeLightRadius(int i, int r) { if ( !lightflag && i != -1 ) @@ -1477,7 +1464,6 @@ void __fastcall ChangeLightRadius(int i, int r) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (004260C5) -------------------------------------------------------- void __fastcall ChangeLightXY(int i, int x, int y) { if ( !lightflag && i != -1 ) @@ -1494,7 +1480,6 @@ void __fastcall ChangeLightXY(int i, int x, int y) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (00426120) -------------------------------------------------------- void __fastcall ChangeLightOff(int i, int x, int y) { if ( !lightflag && i != -1 ) @@ -1511,7 +1496,6 @@ void __fastcall ChangeLightOff(int i, int x, int y) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (0042617B) -------------------------------------------------------- void __fastcall ChangeLight(int i, int x, int y, int r) { if ( !lightflag && i != -1 ) @@ -1529,7 +1513,6 @@ void __fastcall ChangeLight(int i, int x, int y, int r) // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (004261E7) -------------------------------------------------------- void __cdecl ProcessLightList() { int v0; // ebp @@ -1600,13 +1583,11 @@ void __cdecl ProcessLightList() // 642A18: using guessed type int dolighting; // 646A28: using guessed type int lightflag; -//----- (004262E0) -------------------------------------------------------- void __cdecl SavePreLighting() { memcpy(dTransVal2, dTransVal, 0x3100u); } -//----- (004262F8) -------------------------------------------------------- void __cdecl InitVision() { numvision = 0; @@ -1618,7 +1599,6 @@ void __cdecl InitVision() // 5A5590: using guessed type char TransVal; // 642A0C: using guessed type int dovision; -//----- (00426333) -------------------------------------------------------- int __fastcall AddVision(int x, int y, int r, bool mine) { int vid; // eax @@ -1643,7 +1623,6 @@ int __fastcall AddVision(int x, int y, int r, bool mine) } // 642A0C: using guessed type int dovision; -//----- (004263A0) -------------------------------------------------------- void __fastcall ChangeVisionRadius(int id, int r) { int i; // esi @@ -1666,7 +1645,6 @@ void __fastcall ChangeVisionRadius(int id, int r) } // 642A0C: using guessed type int dovision; -//----- (004263E1) -------------------------------------------------------- void __fastcall ChangeVisionXY(int id, int x, int y) { int i; // esi @@ -1690,7 +1668,6 @@ void __fastcall ChangeVisionXY(int id, int x, int y) } // 642A0C: using guessed type int dovision; -//----- (0042642B) -------------------------------------------------------- void __cdecl ProcessVisionList() { bool delflag; // ecx @@ -1742,7 +1719,6 @@ void __cdecl ProcessVisionList() // 5A5590: using guessed type char TransVal; // 642A0C: using guessed type int dovision; -//----- (0042651F) -------------------------------------------------------- void __cdecl lighting_color_cycling() { char *v0; // eax diff --git a/Source/lighting.h b/Source/lighting.h index 3c7c835..3bb9bae 100644 --- a/Source/lighting.h +++ b/Source/lighting.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __LIGHTING_H__ +#define __LIGHTING_H__ -//lighting extern LightListStruct VisionList[32]; extern char lightactive[32]; extern LightListStruct LightList[32]; @@ -47,3 +48,5 @@ extern void *pCrawlTable[19]; extern unsigned char vCrawlTable[23][30]; extern unsigned char byte_49463C[18][18]; extern unsigned char RadiusAdj[23]; + +#endif /* __LIGHTING_H__ */ diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index ebe0964..52ef145 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -4,7 +4,6 @@ void *tbuff; -//----- (00426564) -------------------------------------------------------- void __fastcall LoadGame(bool firstflag) { int v1; // esi @@ -390,7 +389,6 @@ void __fastcall LoadGame(bool firstflag) // 5CCB10: using guessed type char setlvlnum; // 5CF31D: using guessed type char setlevel; -//----- (00426AE2) -------------------------------------------------------- char __cdecl BLoad() { char result; // al @@ -400,7 +398,6 @@ char __cdecl BLoad() return result; } -//----- (00426AF0) -------------------------------------------------------- int __cdecl ILoad() { int v0; // eax @@ -420,7 +417,6 @@ int __cdecl ILoad() return result; } -//----- (00426B2C) -------------------------------------------------------- int __cdecl ILoad_2() { int v0; // eax @@ -440,7 +436,6 @@ int __cdecl ILoad_2() return result; } -//----- (00426B68) -------------------------------------------------------- bool __cdecl OLoad() { char v0; // cl @@ -454,14 +449,12 @@ bool __cdecl OLoad() return result; } -//----- (00426B7F) -------------------------------------------------------- void __fastcall LoadPlayer(int i) { memcpy(&plr[i], tbuff, 0x54B0u); tbuff = (char *)tbuff + 21680; } -//----- (00426BA9) -------------------------------------------------------- void __fastcall LoadMonster(int i) { int v1; // edi @@ -472,21 +465,18 @@ void __fastcall LoadMonster(int i) SyncMonsterAnim(v1); } -//----- (00426BDE) -------------------------------------------------------- void __fastcall LoadMissile(int i) { memcpy(&missile[i], tbuff, 0xB0u); tbuff = (char *)tbuff + 176; } -//----- (00426C08) -------------------------------------------------------- void __fastcall LoadObject(int i) { memcpy(&object[i], tbuff, 0x78u); tbuff = (char *)tbuff + 120; } -//----- (00426C2A) -------------------------------------------------------- void __fastcall LoadItem(int i) { int v1; // edi @@ -497,14 +487,12 @@ void __fastcall LoadItem(int i) GetItemFrm(v1); } -//----- (00426C5F) -------------------------------------------------------- void __fastcall LoadPremium(int i) { memcpy(&premiumitem[i], tbuff, 0x170u); tbuff = (char *)tbuff + 368; } -//----- (00426C89) -------------------------------------------------------- void __fastcall LoadQuest(int i) { memcpy(&quests[i], tbuff, 0x18u); @@ -516,28 +504,24 @@ void __fastcall LoadQuest(int i) DoomQuestState = ILoad(); } -//----- (00426CDE) -------------------------------------------------------- void __fastcall LoadLighting(int i) { memcpy(&LightList[i], tbuff, 0x34u); tbuff = (char *)tbuff + 52; } -//----- (00426D00) -------------------------------------------------------- void __fastcall LoadVision(int i) { memcpy(&VisionList[i], tbuff, 0x34u); tbuff = (char *)tbuff + 52; } -//----- (00426D22) -------------------------------------------------------- void __fastcall LoadPortal(int i) { memcpy(&portal[i], tbuff, 0x18u); tbuff = (char *)tbuff + 24; } -//----- (00426D45) -------------------------------------------------------- void __cdecl SaveGame() { int v0; // eax @@ -896,14 +880,12 @@ void __cdecl SaveGame() // 5CCB10: using guessed type char setlvlnum; // 5CF31D: using guessed type char setlevel; -//----- (00427203) -------------------------------------------------------- void __fastcall BSave(char v) { *(_BYTE *)tbuff = v; tbuff = (char *)tbuff + 1; } -//----- (00427211) -------------------------------------------------------- void __fastcall ISave(int v) { *(_BYTE *)tbuff = _HIBYTE(v); @@ -916,7 +898,6 @@ void __fastcall ISave(int v) tbuff = (char *)tbuff + 1; } -//----- (00427258) -------------------------------------------------------- void __fastcall ISave_2(int v) { *(_BYTE *)tbuff = _HIBYTE(v); @@ -929,7 +910,6 @@ void __fastcall ISave_2(int v) tbuff = (char *)tbuff + 1; } -//----- (0042729F) -------------------------------------------------------- void __fastcall OSave(unsigned char v) { if ( v ) @@ -939,49 +919,42 @@ void __fastcall OSave(unsigned char v) tbuff = (char *)tbuff + 1; } -//----- (004272B7) -------------------------------------------------------- void __fastcall SavePlayer(int i) { memcpy(tbuff, &plr[i], 0x54B0u); tbuff = (char *)tbuff + 21680; } -//----- (004272E1) -------------------------------------------------------- void __fastcall SaveMonster(int i) { memcpy(tbuff, &monster[i], 0xD8u); tbuff = (char *)tbuff + 216; } -//----- (0042730B) -------------------------------------------------------- void __fastcall SaveMissile(int i) { memcpy(tbuff, &missile[i], 0xB0u); tbuff = (char *)tbuff + 176; } -//----- (00427335) -------------------------------------------------------- void __fastcall SaveObject(int i) { memcpy(tbuff, &object[i], 0x78u); tbuff = (char *)tbuff + 120; } -//----- (00427357) -------------------------------------------------------- void __fastcall SaveItem(int i) { memcpy(tbuff, &item[i], 0x170u); tbuff = (char *)tbuff + 368; } -//----- (00427381) -------------------------------------------------------- void __fastcall SavePremium(int i) { memcpy(tbuff, &premiumitem[i], 0x170u); tbuff = (char *)tbuff + 368; } -//----- (004273AB) -------------------------------------------------------- void __fastcall SaveQuest(int i) { memcpy(tbuff, &quests[i], 0x18u); @@ -993,28 +966,24 @@ void __fastcall SaveQuest(int i) ISave(DoomQuestState); } -//----- (00427404) -------------------------------------------------------- void __fastcall SaveLighting(int i) { memcpy(tbuff, &LightList[i], 0x34u); tbuff = (char *)tbuff + 52; } -//----- (00427426) -------------------------------------------------------- void __fastcall SaveVision(int i) { memcpy(tbuff, &VisionList[i], 0x34u); tbuff = (char *)tbuff + 52; } -//----- (00427448) -------------------------------------------------------- void __fastcall SavePortal(int i) { memcpy(tbuff, &portal[i], 0x18u); tbuff = (char *)tbuff + 24; } -//----- (0042746B) -------------------------------------------------------- void __cdecl SaveLevel() { int v0; // eax @@ -1153,7 +1122,6 @@ void __cdecl SaveLevel() // 5CCB10: using guessed type char setlvlnum; // 5CF31D: using guessed type char setlevel; -//----- (0042772F) -------------------------------------------------------- void __cdecl LoadLevel() { int i; // esi diff --git a/Source/loadsave.h b/Source/loadsave.h index 5ebc25b..797e805 100644 --- a/Source/loadsave.h +++ b/Source/loadsave.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __LOADSAVE_H__ +#define __LOADSAVE_H__ -//loadsave extern void *tbuff; void __fastcall LoadGame(bool firstflag); @@ -34,4 +35,6 @@ void __fastcall SaveLighting(int i); void __fastcall SaveVision(int i); void __fastcall SavePortal(int i); void __cdecl SaveLevel(); -void __cdecl LoadLevel(); \ No newline at end of file +void __cdecl LoadLevel(); + +#endif /* __LOADSAVE_H__ */ diff --git a/Source/logging.cpp b/Source/logging.cpp index 0e441e5..19f4259 100644 --- a/Source/logging.cpp +++ b/Source/logging.cpp @@ -16,7 +16,6 @@ int log_inf = 0x7F800000; // weak int log_not_created = 1; // weak HANDLE log_file = (HANDLE)0xFFFFFFFF; // idb -//----- (004279F7) -------------------------------------------------------- struct log_cpp_init_1 { log_cpp_init_1() @@ -27,7 +26,6 @@ struct log_cpp_init_1 // 47F070: using guessed type int log_inf; // 646A30: using guessed type int log_cpp_init_value; -//----- (00427A02) -------------------------------------------------------- struct log_cpp_init_2 { log_cpp_init_2() @@ -37,25 +35,21 @@ struct log_cpp_init_2 } } _log_cpp_init_2; -//----- (00427A0C) -------------------------------------------------------- void __cdecl log_init_mutex() { InitializeCriticalSection(&sgMemCrit); } -//----- (00427A18) -------------------------------------------------------- void __cdecl j_log_cleanup_mutex() { atexit(log_cleanup_mutex); } -//----- (00427A24) -------------------------------------------------------- void __cdecl log_cleanup_mutex() { DeleteCriticalSection(&sgMemCrit); } -//----- (00427A30) -------------------------------------------------------- void __cdecl log_flush(bool force_close) { void *v1; // eax @@ -86,7 +80,6 @@ void __cdecl log_flush(bool force_close) LeaveCriticalSection(&sgMemCrit); } -//----- (00427AC2) -------------------------------------------------------- void *__cdecl log_create() { char *v0; // eax @@ -142,7 +135,6 @@ void *__cdecl log_create() } // 4947D4: using guessed type int log_not_created; -//----- (00427C18) -------------------------------------------------------- void __fastcall log_get_version(VS_FIXEDFILEINFO *file_info) { DWORD v1; // eax @@ -176,7 +168,6 @@ void __fastcall log_get_version(VS_FIXEDFILEINFO *file_info) } } -//----- (00427CC9) -------------------------------------------------------- void log_printf(char *pszFmt, ...) { size_t v1; // edi @@ -203,7 +194,6 @@ void log_printf(char *pszFmt, ...) LeaveCriticalSection(&sgMemCrit); } -//----- (00427D75) -------------------------------------------------------- void __cdecl log_dump_computer_info() { char Buffer[64]; // [esp+0h] [ebp-88h] diff --git a/Source/logging.h b/Source/logging.h index f79d81c..e90b547 100644 --- a/Source/logging.h +++ b/Source/logging.h @@ -1,6 +1,7 @@ //HEADER_GOES_HERE +#ifndef __LOGGING_H__ +#define __LOGGING_H__ -//logging extern int log_cpp_init_value; // weak extern CHAR FileName[260]; // idb extern char log_buffer[388]; @@ -26,3 +27,5 @@ extern int log_inf; // weak extern int log_not_created; // weak extern HANDLE log_file; // idb + +#endif /* __LOGGING_H__ */