MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up types used in gamemenu.cpp

Browse source
This commit is contained in:
Anders Jenbo 2018-10-21 03:38:45 +02:00
commit 6576954831
25 changed files with 27 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/automap.cpp
View file

@ -139,7 +139,6 @@ void __cdecl InitAutomap()
}
while ( v13 < 112 );
}
// 5BB1ED: using guessed type char leveltype;
void __cdecl StartAutomap()
{
@ -304,7 +303,6 @@ void __cdecl DrawAutomap()
DrawAutomapGame();
}
// 4B8968: using guessed type int sbookflag;
// 5BB1ED: using guessed type char leveltype;
// 69BD04: using guessed type int questlog;
// 69CF0C: using guessed type int gpBufEnd;

2
Source/control.cpp
View file

@ -1786,7 +1786,6 @@ LABEL_33:
// 4B8CC0: using guessed type char pcursitem;
// 4B8CC1: using guessed type char pcursobj;
// 4B8CC2: using guessed type char pcursplr;
// 5BB1ED: using guessed type char leveltype;
void __fastcall control_print_info_str(int y, char *str, bool center, int lines)
{
@ -2516,7 +2515,6 @@ void __cdecl RedBack()
}
}
// 525728: using guessed type int light4flag;
// 5BB1ED: using guessed type char leveltype;
char __fastcall GetSBookTrans(int ii, BOOL townok)
{

1
Source/cursor.cpp
View file

@ -1295,5 +1295,4 @@ LABEL_172:
// 4B8CCC: using guessed type int dword_4B8CCC;
// 52569C: using guessed type int zoomflag;
// 52575C: using guessed type int doomflag;
// 5BB1ED: using guessed type char leveltype;
// 69BD04: using guessed type int questlog;

20
Source/diablo.cpp
View file

@ -13,7 +13,7 @@ bool gbGameLoopStartup; // idb
int glSeedTbl[NUMLEVELS];
BOOL gbRunGame;
int glMid3Seed[NUMLEVELS];
int gbRunGameResult; // weak
BOOL gbRunGameResult;
int zoomflag; // weak
BOOL gbProcessPlayers;
int glEndSeed[NUMLEVELS];
@ -143,7 +143,6 @@ LABEL_11:
SNetDestroy();
return gbRunGameResult;
}
// 525698: using guessed type int gbRunGameResult;
// 5256E8: using guessed type int dword_5256E8;
// 678640: using guessed type char byte_678640;
@ -163,7 +162,7 @@ void __fastcall run_game_loop(int uMsg)
msg_process_net_packets();
gbRunGame = TRUE;
gbProcessPlayers = TRUE;
gbRunGameResult = 1;
gbRunGameResult = TRUE;
drawpanflag = 255;
DrawAndBlit();
PaletteFadeIn(8);
@ -180,7 +179,7 @@ void __fastcall run_game_loop(int uMsg)
{
if ( msg.message == WM_QUIT )
{
gbRunGameResult = 0;
gbRunGameResult = FALSE;
gbRunGame = FALSE;
break;
}
@ -225,7 +224,6 @@ void __fastcall run_game_loop(int uMsg)
DoEnding();
}
}
// 525698: using guessed type int gbRunGameResult;
// 525718: using guessed type char cineflag;
// 52571C: using guessed type int drawpanflag;
// 679660: using guessed type char gbMaxPlayers;
@ -817,7 +815,7 @@ LRESULT __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if ( wParam == SC_CLOSE )
{
gbRunGame = FALSE;
gbRunGameResult = 0;
gbRunGameResult = FALSE;
return 0;
}
return MainWndProc(hWnd, uMsg, wParam, lParam);
@ -829,7 +827,6 @@ LRESULT __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
gmenu_on_mouse_move((unsigned short)lParam);
return 0;
}
// 525698: using guessed type int gbRunGameResult;
// 52571C: using guessed type int drawpanflag;
// 525748: using guessed type char sgbMouseDown;
// 679660: using guessed type char gbMaxPlayers;
@ -1032,7 +1029,6 @@ LABEL_98:
// 4B8CC2: using guessed type char pcursplr;
// 525740: using guessed type int PauseMode;
// 52575C: using guessed type int doomflag;
// 5BB1ED: using guessed type char leveltype;
// 646D00: using guessed type char qtextflag;
// 69BD04: using guessed type int questlog;
// 6AA705: using guessed type char stextflag;
@ -1448,7 +1444,6 @@ LABEL_101:
// 4B8C98: using guessed type int spselflag;
// 525740: using guessed type int PauseMode;
// 52B9F0: using guessed type char msgdelay;
// 5BB1ED: using guessed type char leveltype;
// 646D00: using guessed type char qtextflag;
// 69BD04: using guessed type int questlog;
// 6AA705: using guessed type char stextflag;
@ -1851,7 +1846,6 @@ void __cdecl LoadLvlGFX()
return;
}
}
// 5BB1ED: using guessed type char leveltype;
void __cdecl LoadAllGFX()
{
@ -1906,7 +1900,6 @@ void __fastcall CreateLevel(int lvldir)
LoadRndLvlPal(hnd);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall LoadGameLevel(BOOL firstflag, int lvldir)
{
@ -2132,7 +2125,7 @@ LABEL_72:
ProcessLightList();
ProcessVisionList();
}
music_start((unsigned char)leveltype);
music_start(leveltype);
//do
// _LOBYTE(v19) = IncProgress();
while ( !IncProgress() );
@ -2140,7 +2133,6 @@ LABEL_72:
PlaySFX(USFX_SKING1);
}
// 525738: using guessed type int setseed;
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
// 679660: using guessed type char gbMaxPlayers;
@ -2231,7 +2223,6 @@ void __cdecl game_logic()
// 525718: using guessed type char cineflag;
// 52571C: using guessed type int drawpanflag;
// 525740: using guessed type int PauseMode;
// 5BB1ED: using guessed type char leveltype;
// 679660: using guessed type char gbMaxPlayers;
void __fastcall timeout_cursor(bool bTimeout)
@ -2285,4 +2276,3 @@ void __cdecl diablo_color_cyc_logic()
}
// 484364: using guessed type int fullscreen;
// 52574C: using guessed type int color_cycle_timer;
// 5BB1ED: using guessed type char leveltype;

2
Source/diablo.h
View file

@ -13,7 +13,7 @@ extern bool gbGameLoopStartup; // idb
extern int glSeedTbl[NUMLEVELS];
extern BOOL gbRunGame;
extern int glMid3Seed[NUMLEVELS];
extern int gbRunGameResult; // weak
extern BOOL gbRunGameResult;
extern int zoomflag; // weak
extern BOOL gbProcessPlayers;
extern int glEndSeed[NUMLEVELS];

8
Source/gendung.cpp
View file

@ -29,7 +29,7 @@ char block_lvid[2049];
//char byte_5B78EB;
char dung_map[MAXDUNX][MAXDUNY];
char nTrapTable[2049];
char leveltype; // weak
BYTE leveltype;
unsigned char currlevel; // idb
char TransList[256];
UCHAR nSolidTable[2049];
@ -134,7 +134,6 @@ LABEL_13:
}
mem_free_dbg(v0);
}
// 5BB1ED: using guessed type char leveltype;
void __cdecl gendung_418D91()
{
@ -492,7 +491,6 @@ LABEL_66:
}
// 525728: using guessed type int light4flag;
// 53CD4C: using guessed type int nlevel_frames;
// 5BB1ED: using guessed type char leveltype;
void __fastcall gendung_4191BF(int frames)
{
@ -666,7 +664,6 @@ void __cdecl SetDungeonMicros()
}
}
// 52569C: using guessed type int zoomflag;
// 5BB1ED: using guessed type char leveltype;
// 5C2FF8: using guessed type int dword_5C2FF8;
// 5C2FFC: using guessed type int dword_5C2FFC;
// 5C3000: using guessed type int scr_pix_width;
@ -1250,7 +1247,6 @@ LABEL_53:
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int freq, int rndSize)
{
@ -1341,7 +1337,6 @@ void __fastcall DRLG_PlaceThemeRooms(int minSize, int maxSize, int floor, int fr
while ( v5 < 40 );
}
// 5A5590: using guessed type char TransVal;
// 5BB1ED: using guessed type char leveltype;
void __cdecl DRLG_HoldThemeRooms()
{
@ -1435,5 +1430,4 @@ void __cdecl InitLevels()
}
}
// 52572C: using guessed type int leveldebug;
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;

2
Source/gendung.h
View file

@ -29,7 +29,7 @@ extern char block_lvid[2049];
//char byte_5B78EB;
extern char dung_map[MAXDUNX][MAXDUNY];
extern char nTrapTable[2049];
extern char leveltype; // weak
extern BYTE leveltype;
extern unsigned char currlevel; // idb
extern char TransList[256];
extern UCHAR nSolidTable[2049];

2
Source/gmenu.cpp
View file

@ -117,7 +117,7 @@ void __cdecl gmenu_init_menu()
// 634478: using guessed type char byte_634478;
// 63448C: using guessed type int dword_63448C;
bool __cdecl gmenu_exception()
BOOL __cdecl gmenu_exception()
{
return dword_634480 != 0;
}

2
Source/gmenu.h
View file

@ -19,7 +19,7 @@ void __cdecl gmenu_draw_pause();
void __fastcall gmenu_print_text(int x, int y, char *pszStr);
void __cdecl FreeGMenu();
void __cdecl gmenu_init_menu();
bool __cdecl gmenu_exception();
BOOL __cdecl gmenu_exception();
void __fastcall gmenu_call_proc(TMenuItem *pItem, void (__cdecl *gmFunc)());
void __fastcall gmenu_up_down(int a1);
void __cdecl gmenu_draw();

1
Source/interfac.cpp
View file

@ -233,7 +233,6 @@ LABEL_41:
PrepDoEnding();
gbSomebodyWonGameKludge = 0;
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31C: using guessed type char setlvltype;
// 5CF31D: using guessed type char setlevel;
// 6761B8: using guessed type char gbSomebodyWonGameKludge;

1
Source/inv.cpp
View file

@ -2976,7 +2976,6 @@ LABEL_11:
}
return TRUE;
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall UseStaffCharge(int pnum)
{

2
Source/lighting.cpp
View file

@ -1363,7 +1363,6 @@ void __cdecl MakeLightTable()
while ( (signed int)v43 < (signed int)&dung_map_rgba[16384] );
}
// 525728: using guessed type int light4flag;
// 5BB1ED: using guessed type char leveltype;
#ifdef _DEBUG
void __cdecl ToggleLighting()
@ -1750,4 +1749,3 @@ void __cdecl lighting_color_cycling()
}
}
// 525728: using guessed type int light4flag;
// 5BB1ED: using guessed type char leveltype;

4
Source/loadsave.cpp
View file

@ -171,7 +171,6 @@ void __fastcall LoadGame(BOOL firstflag)
SetCursor(CURSOR_HAND);
gbProcessPlayers = TRUE;
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
char __cdecl BLoad()
@ -416,7 +415,6 @@ void __cdecl SaveGame()
pfile_rename_temp_to_perm();
pfile_write_hero();
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
void __fastcall BSave(char v)
@ -602,7 +600,6 @@ void __cdecl SaveLevel()
else
plr[myplr]._pSLvlVisited[setlvlnum] = 1;
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
void __cdecl LoadLevel()
@ -697,5 +694,4 @@ void __cdecl LoadLevel()
mem_free_dbg(LoadBuff);
}
// 5BB1ED: using guessed type char leveltype;
// 642A18: using guessed type int dolighting;

6
Source/missiles.cpp
View file

@ -3017,20 +3017,19 @@ LABEL_14:
{
if ( setlevel )
{
_LOWORD(v21) = (unsigned char)leveltype;
_LOWORD(v21) = leveltype;
v22 = v21;
_LOWORD(v21) = setlvlnum;
NetSendCmdLocParam3(TRUE, CMD_ACTIVATEPORTAL, v9, v11, v21, v22, 1);
}
else
{
_LOWORD(v20) = (unsigned char)leveltype;
_LOWORD(v20) = leveltype;
_LOWORD(v21) = currlevel;
NetSendCmdLocParam3(TRUE, CMD_ACTIVATEPORTAL, v9, v11, v21, v20, 0);
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
void __fastcall AddFlash(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
@ -6232,7 +6231,6 @@ void __fastcall MI_Teleport(int i)
missile[v1]._miDelFlag = 1;
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall MI_Stone(int i)
{

1
Source/multi.cpp
View file

@ -982,7 +982,6 @@ void __cdecl SetupLocalCoords()
plr[myplr].destAction = ACTION_NONE;
}
// 52572C: using guessed type int leveldebug;
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
// 679660: using guessed type char gbMaxPlayers;

29
Source/objects.cpp
View file

@ -457,7 +457,6 @@ bool __fastcall RndLocOk(int xp, int yp)
}
return result;
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall InitRndLocObj(int min, int max, int objtype)
{
@ -1141,7 +1140,6 @@ void __cdecl AddChestTraps()
}
while ( v0 < 112 );
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall LoadMapObjects(unsigned char *pMap, int startx, int starty, int x1, int y1, int w, int h, int leveridx)
{
@ -1592,12 +1590,11 @@ void __cdecl InitObjects()
InitRndLocObj(1, 5, 7);
if ( leveltype != 4 )
AddObjTraps();
if ( (unsigned char)leveltype > 1u )
if ( leveltype > 1u )
AddChestTraps();
InitObjFlag = 0;
}
}
// 5BB1ED: using guessed type char leveltype;
// 5CF330: using guessed type int setpc_h;
// 5CF334: using guessed type int setpc_w;
// 679660: using guessed type char gbMaxPlayers;
@ -1707,7 +1704,6 @@ void __fastcall SetMapObjects(unsigned char *pMap, int startx, int starty)
}
InitObjFlag = 0;
}
// 5BB1ED: using guessed type char leveltype;
// 67D7C0: using guessed type int InitObjFlag;
// 67D7C4: using guessed type int numobjfiles;
// 4427C5: using guessed type int var_10C[56];
@ -2820,10 +2816,10 @@ void __fastcall Obj_BCrossDamage(int i)
{
v3 = plr[v1]._pFireResist;
if ( v3 > 0 )
damage[(unsigned char)leveltype-1] -= v3 * damage[(unsigned char)leveltype-1] / 100;
damage[leveltype-1] -= v3 * damage[leveltype-1] / 100;
if ( plr[v1].WorldX == object[v8]._ox && plr[v1].WorldY == object[v8]._oy - 1 )
{
v4 = damage[(unsigned char)leveltype-1];
v4 = damage[leveltype-1];
plr[v1]._pHitPoints -= v4;
plr[v1]._pHPBase -= v4;
if ( plr[v1]._pHitPoints >> 6 <= 0 )
@ -2844,7 +2840,6 @@ void __fastcall Obj_BCrossDamage(int i)
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __cdecl ProcessObjects()
{
@ -3021,7 +3016,6 @@ void __fastcall ObjSetMicro(int dx, int dy, int pn)
while ( v6 < 10 );
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall objects_set_door_piece(int x, int y)
{
@ -3838,7 +3832,6 @@ void __fastcall ObjChangeMap(int x1, int y1, int x2, int y2)
AddL2Objs(2 * v6 + 16, v9, v8, y_end); /* v10 */
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall ObjChangeMapResync(int x1, int y1, int x2, int y2)
{
@ -3876,7 +3869,6 @@ void __fastcall ObjChangeMapResync(int x1, int y1, int x2, int y2)
if ( leveltype == DTYPE_CATACOMBS )
ObjL2Special(2 * v6 + 16, 2 * v5 + 16, 2 * x2 + 17, 2 * v4 + 17);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall OperateL1Door(int pnum, int i, unsigned char sendflag)
{
@ -5050,7 +5042,7 @@ LABEL_47:
-1,
arglist,
0,
2 * (unsigned char)leveltype);
2 * leveltype);
if ( arglist != myplr )
return;
_LOBYTE(v7) = EMSG_SHRINE_MAGICAL;
@ -5247,7 +5239,7 @@ LABEL_47:
-1,
arglist,
0,
2 * (unsigned char)leveltype);
2 * leveltype);
if ( arglist != myplr )
return;
_LOBYTE(v7) = EMSG_SHRINE_CRYPTIC;
@ -5385,7 +5377,7 @@ LABEL_47:
-1,
arglist,
0,
2 * (unsigned char)leveltype);
2 * leveltype);
if ( arglist != myplr )
return;
_LOBYTE(v7) = EMSG_SHRINE_HOLY;
@ -5435,7 +5427,7 @@ LABEL_47:
{
if ( !plr[v106].InvGrid[sfx_idd] )
{
v107 = 5 * (unsigned char)leveltype + random(160, 10 * (unsigned char)leveltype);
v107 = 5 * leveltype + random(160, 10 * leveltype);
v108 = plr[v106]._pNumInv;
v109 = v106 * 21720 + 368 * v108;
qmemcpy((char *)plr[0].InvList + v109, &golditem, 0x170u);
@ -5657,7 +5649,6 @@ LABEL_280:
}
// 4B84DC: using guessed type int dropGoldFlag;
// 52571C: using guessed type int drawpanflag;
// 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload;
void __fastcall OperateSkelBook(int pnum, int i, unsigned char sendmsg)
@ -5987,7 +5978,7 @@ LABEL_38:
-1,
v4,
0,
2 * (unsigned char)leveltype);
2 * leveltype);
v5 = 1;
if ( v4 == myplr )
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, v2);
@ -6055,7 +6046,6 @@ LABEL_38:
return v5;
}
// 52571C: using guessed type int drawpanflag;
// 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload;
void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg)
@ -6114,7 +6104,7 @@ LABEL_12:
{
v11 = object[v4]._ox;
v12 = object[v4]._oy;
if ( (unsigned char)leveltype <= 1u )
if ( leveltype <= 1u )
CreateTypeItem(v11, v12, 0, v9, 0, sendmsg, 0);
else
CreateTypeItem(v11, v12, 1u, v9, 0, sendmsg, 0);
@ -6122,7 +6112,6 @@ LABEL_12:
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, v3);
}
}
// 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload;
void __fastcall OperateStoryBook(int pnum, int i)

6
Source/palette.cpp
View file

@ -13,7 +13,7 @@ const int palette_inf = 0x7F800000; // weak
/* data */
int gamma_correction = 100; // idb
int color_cycling_enabled = 1; // idb
BOOL color_cycling_enabled = TRUE;
bool sgbFadedIn = 1;
struct palette_cpp_init
@ -29,7 +29,7 @@ struct palette_cpp_init
void __cdecl SaveGamma()
{
SRegSaveValue("Diablo", "Gamma Correction", 0, gamma_correction);
SRegSaveValue("Diablo", "Color Cycling", 0, color_cycling_enabled);
SRegSaveValue("Diablo", "Color Cycling", FALSE, color_cycling_enabled);
}
void __cdecl palette_init()
@ -69,7 +69,7 @@ void __cdecl LoadGamma()
if ( SRegLoadValue("Diablo", "Color Cycling", 0, &value) )
v3 = value;
else
v3 = 1;
v3 = TRUE;
color_cycling_enabled = v3;
}

2
Source/palette.h
View file

@ -37,7 +37,7 @@ extern const int palette_inf; // weak
/* data */
extern int gamma_correction; // idb
extern int color_cycling_enabled; // idb
extern BOOL color_cycling_enabled;
extern bool sgbFadedIn;
#endif /* __PALETTE_H__ */

12
Source/player.cpp
View file

@ -232,7 +232,6 @@ void __fastcall LoadPlrGFX(int pnum, player_graphic gfxflag)
p->_pGFXLoad |= i;
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall InitPlayerGFX(int pnum)
{
@ -491,7 +490,6 @@ void __fastcall SetPlrAnims(int pnum)
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall ClearPlrRVars(PlayerStruct *p)
{
@ -1035,7 +1033,6 @@ void __fastcall PlrDoTrans(int x, int y)
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall SetPlayerOld(int pnum)
{
@ -1404,7 +1401,6 @@ void __fastcall StartWalk3(int pnum, int xvel, int yvel, int xoff, int yoff, int
}
}
// 52569C: using guessed type int zoomflag;
// 5BB1ED: using guessed type char leveltype;
void __fastcall StartAttack(int pnum, int d)
{
@ -1518,7 +1514,6 @@ void __fastcall StartSpell(int pnum, int d, int cx, int cy)
plr[pnum]._pVar4 = GetSpellLevel(pnum, plr[pnum]._pSpell);
plr[pnum]._pVar8 = 1;
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall FixPlrWalkTags(int pnum)
{
@ -1991,8 +1986,6 @@ void __fastcall StartNewLvl(int pnum, int fom, int lvl)
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall RestartTownLvl(int pnum)
{
InitLevelChange(pnum);
@ -2092,7 +2085,6 @@ BOOL __fastcall PM_DoWalk(int pnum)
PM_ChangeOffset(pnum);
return FALSE;
}
// 5BB1ED: using guessed type char leveltype;
BOOL __fastcall PM_DoWalk2(int pnum)
{
@ -2141,7 +2133,6 @@ BOOL __fastcall PM_DoWalk2(int pnum)
PM_ChangeOffset(pnum);
return FALSE;
}
// 5BB1ED: using guessed type char leveltype;
BOOL __fastcall PM_DoWalk3(int pnum)
{
@ -2195,7 +2186,6 @@ BOOL __fastcall PM_DoWalk3(int pnum)
PM_ChangeOffset(pnum);
return FALSE;
}
// 5BB1ED: using guessed type char leveltype;
BOOL __fastcall WeaponDur(int pnum, int durrnd)
{
@ -2806,7 +2796,6 @@ BOOL __fastcall PM_DoSpell(int pnum)
return FALSE;
}
// 52571C: using guessed type int drawpanflag;
// 5BB1ED: using guessed type char leveltype;
BOOL __fastcall PM_DoGotHit(int pnum)
{
@ -3636,7 +3625,6 @@ void __fastcall CheckPlrSpell()
}
}
// 4B8CC2: using guessed type char pcursplr;
// 5BB1ED: using guessed type char leveltype;
void __fastcall SyncPlrAnim(int pnum)
{

1
Source/portal.cpp
View file

@ -153,7 +153,6 @@ void __cdecl GetPortalLevel()
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
void __cdecl GetPortalLvlPos()

4
Source/scrollrt.cpp
View file

@ -898,7 +898,6 @@ LABEL_23:
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 69BEF8: using guessed type int light_table_index;
// 69CF14: using guessed type int level_cel_block;
// 69CF20: using guessed type char arch_draw_type;
@ -2958,7 +2957,7 @@ void __cdecl EnableFrameCount()
}
#endif
void __fastcall scrollrt_draw_game_screen(bool draw_cursor)
void __fastcall scrollrt_draw_game_screen(BOOL draw_cursor)
{
int dwHgt; // edi
@ -3389,4 +3388,3 @@ void __cdecl DrawAndBlit()
}
// 4B8960: using guessed type int talkflag;
// 52571C: using guessed type int drawpanflag;
// 5BB1ED: using guessed type char leveltype;

2
Source/scrollrt.h
View file

@ -51,7 +51,7 @@ void __cdecl ClearScreenBuffer();
void __cdecl ScrollView();
void __cdecl EnableFrameCount();
#endif
void __fastcall scrollrt_draw_game_screen(bool draw_cursor);
void __fastcall scrollrt_draw_game_screen(BOOL draw_cursor);
void __cdecl scrollrt_draw_cursor_back_buffer();
void __cdecl scrollrt_draw_cursor_item();
void __fastcall DrawMain(int dwHgt, int draw_desc, int draw_hp, int draw_mana, int draw_sbar, int draw_btn);

3
Source/stores.cpp
View file

@ -2322,7 +2322,6 @@ LABEL_18:
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 646D00: using guessed type char qtextflag;
// 69F110: using guessed type int stextlhold;
// 6A8A24: using guessed type int stextvhold;
@ -4127,7 +4126,6 @@ void __cdecl STextEnter()
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 646D00: using guessed type char qtextflag;
// 69F110: using guessed type int stextlhold;
// 6A8A24: using guessed type int stextvhold;
@ -4218,7 +4216,6 @@ void __cdecl CheckStoreBtn()
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 646D00: using guessed type char qtextflag;
// 6A09E0: using guessed type char stextsize;
// 6A6BB8: using guessed type int stextscrl;

23
Source/themes.cpp
View file

@ -198,7 +198,6 @@ bool __fastcall TFit_SkelRoom(int t)
themeVar1 = i;
return TFit_Obj5(t);
}
// 5BB1ED: using guessed type char leveltype;
bool __fastcall TFit_GoatShrine(int t)
{
@ -278,7 +277,6 @@ bool __fastcall TFit_Obj3(int t)
}
return 0;
}
// 5BB1ED: using guessed type char leveltype;
bool __fastcall CheckThemeReqs(int t)
{
@ -361,7 +359,6 @@ LABEL_16:
}
return 0;
}
// 5BB1ED: using guessed type char leveltype;
// 6AAA58: using guessed type int mFountainFlag;
// 6AAA5C: using guessed type int cauldronFlag;
// 6AAA60: using guessed type int tFountainFlag;
@ -534,7 +531,6 @@ LABEL_16:
}
return 0;
}
// 5BB1ED: using guessed type char leveltype;
void __cdecl InitThemes()
{
@ -653,7 +649,6 @@ LABEL_23:
}
}
}
// 5BB1ED: using guessed type char leveltype;
// 6AAA3C: using guessed type int armorFlag;
// 6AAA50: using guessed type int weaponFlag;
// 6AAA54: using guessed type int treasureFlag;
@ -706,7 +701,6 @@ void __cdecl HoldThemeRooms()
}
}
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall PlaceThemeMonsts(int t, int f)
{
@ -778,7 +772,6 @@ void __fastcall Theme_Barrel(int t)
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_Shrine(int t)
{
@ -803,7 +796,6 @@ void __fastcall Theme_Shrine(int t)
}
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_MonstPit(int t)
{
@ -839,7 +831,6 @@ void __fastcall Theme_MonstPit(int t)
ItemNoFlippy();
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_SkelRoom(int t)
{
@ -895,7 +886,6 @@ void __fastcall Theme_SkelRoom(int t)
if ( !dObject[xp][yp + 3] )
AddObject(OBJ_SKELBOOK, xp, yp + 2);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_Treasure(int t)
{
@ -938,7 +928,6 @@ void __fastcall Theme_Treasure(int t)
}
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_Library(int t)
{
@ -1015,7 +1004,6 @@ void __fastcall Theme_Library(int t)
if ( !QuestStatus(QTYPE_ZHAR) || ta != zharlib )
PlaceThemeMonsts(ta, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
// 6AAA64: using guessed type int zharlib;
void __fastcall Theme_Torture(int t)
@ -1068,7 +1056,6 @@ void __fastcall Theme_Torture(int t)
while ( (signed int)v8 < (signed int)&dPiece[1][111] );
PlaceThemeMonsts(v1, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_BloodFountain(int t)
{
@ -1082,7 +1069,6 @@ void __fastcall Theme_BloodFountain(int t)
AddObject(OBJ_BLOODFTN, themex, themey);
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_Decap(int t)
{
@ -1134,7 +1120,6 @@ void __fastcall Theme_Decap(int t)
while ( (signed int)v8 < (signed int)&dPiece[1][111] );
PlaceThemeMonsts(v1, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_PurifyingFountain(int t)
{
@ -1148,7 +1133,6 @@ void __fastcall Theme_PurifyingFountain(int t)
AddObject(OBJ_PURIFYINGFTN, themex, themey);
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_ArmorStand(int t)
{
@ -1206,7 +1190,6 @@ void __fastcall Theme_ArmorStand(int t)
PlaceThemeMonsts(ta, monstrnd[leveltype-1]);
armorFlag = 0;
}
// 5BB1ED: using guessed type char leveltype;
// 6AAA3C: using guessed type int armorFlag;
void __fastcall Theme_GoatShrine(int t)
@ -1266,7 +1249,6 @@ void __fastcall Theme_Cauldron(int t)
AddObject(OBJ_CAULDRON, themex, themey);
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_MurkyFountain(int t)
{
@ -1280,7 +1262,6 @@ void __fastcall Theme_MurkyFountain(int t)
AddObject(OBJ_MURKYFTN, themex, themey);
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_TearFountain(int t)
{
@ -1294,7 +1275,6 @@ void __fastcall Theme_TearFountain(int t)
AddObject(OBJ_TEARFTN, themex, themey);
PlaceThemeMonsts(t, monstrnd[leveltype-1]);
}
// 5BB1ED: using guessed type char leveltype;
void __fastcall Theme_BrnCross(int t)
{
@ -1347,7 +1327,6 @@ void __fastcall Theme_BrnCross(int t)
PlaceThemeMonsts(ta, monstrnd[leveltype-1]);
bCrossFlag = 1;
}
// 5BB1ED: using guessed type char leveltype;
// 6AAC10: using guessed type int bCrossFlag;
void __fastcall Theme_WeaponRack(int t)
@ -1406,7 +1385,6 @@ void __fastcall Theme_WeaponRack(int t)
PlaceThemeMonsts(ta, monstrnd[leveltype-1]);
weaponFlag = 0;
}
// 5BB1ED: using guessed type char leveltype;
// 6AAA50: using guessed type int weaponFlag;
void __cdecl UpdateL4Trans()
@ -1497,5 +1475,4 @@ void __cdecl CreateThemeRooms()
UpdateL4Trans();
}
}
// 5BB1ED: using guessed type char leveltype;
// 67D7C0: using guessed type int InitObjFlag;

1
Source/trigs.cpp
View file

@ -1252,7 +1252,6 @@ LABEL_24:
goto LABEL_14;
}
}
// 5BB1ED: using guessed type char leveltype;
// 5CF31D: using guessed type char setlevel;
void __cdecl CheckTriggers()