mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use "BOOLEAN" instead of "bool" 

bool is not defined in C
pull/25/head
Anders Jenbo 7 years ago
parent
cd2c434c15
commit
ab3a6208d2
62 changed files with 402 additions and 402 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/capture.cpp
  2. 14
      Source/control.cpp
  3. 4
      Source/control.h
  4. 2
      Source/cursor.cpp
  5. 4
      Source/debug.cpp
  6. 2
      Source/debug.h
  7. 10
      Source/diablo.cpp
  8. 6
      Source/diablo.h
  9. 2
      Source/drlg_l1.cpp
  10. 2
      Source/drlg_l1.h
  11. 26
      Source/drlg_l2.cpp
  12. 8
      Source/drlg_l2.h
  13. 34
      Source/drlg_l3.cpp
  14. 12
      Source/drlg_l3.h
  15. 22
      Source/drlg_l4.cpp
  16. 10
      Source/drlg_l4.h
  17. 4
      Source/engine.cpp
  18. 2
      Source/error.cpp
  19. 2
      Source/gamemenu.cpp
  20. 6
      Source/gendung.cpp
  21. 4
      Source/gendung.h
  22. 4
      Source/gmenu.cpp
  23. 4
      Source/gmenu.h
  24. 16
      Source/init.cpp
  25. 10
      Source/init.h
  26. 4
      Source/inv.cpp
  27. 48
      Source/items.cpp
  28. 20
      Source/items.h
  29. 6
      Source/lighting.cpp
  30. 2
      Source/logging.cpp
  31. 2
      Source/logging.h
  32. 76
      Source/missiles.cpp
  33. 10
      Source/missiles.h
  34. 62
      Source/monster.cpp
  35. 6
      Source/monster.h
  36. 32
      Source/mpqapi.cpp
  37. 22
      Source/mpqapi.h
  38. 10
      Source/msg.cpp
  39. 6
      Source/msgcmd.cpp
  40. 4
      Source/msgcmd.h
  41. 6
      Source/multi.cpp
  42. 4
      Source/nthread.cpp
  43. 2
      Source/nthread.h
  44. 88
      Source/objects.cpp
  45. 6
      Source/objects.h
  46. 2
      Source/pack.cpp
  47. 2
      Source/pack.h
  48. 6
      Source/palette.cpp
  49. 6
      Source/palette.h
  50. 2
      Source/path.cpp
  51. 2
      Source/quests.cpp
  52. 2
      Source/quests.h
  53. 8
      Source/scrollrt.cpp
  54. 2
      Source/scrollrt.h
  55. 52
      Source/stores.cpp
  56. 14
      Source/stores.h
  57. 2
      Source/sync.cpp
  58. 34
      Source/themes.cpp
  59. 28
      Source/themes.h
  60. 6
      Source/town.cpp
  61. 6
      Source/towners.cpp
  62. 2
      Source/towners.h

2
Source/capture.cpp
Unescape View File

@ -126,7 +126,7 @@ BYTE *__fastcall CaptureEnc(BYTE *src, BYTE *dst, int width)
HANDLE __fastcall CaptureFile(char *dst_path)
{
bool num_used[100];
BOOLEAN num_used[100];
int free_num;
_finddata_t finder;

14
Source/control.cpp
Unescape View File

@ -354,7 +354,7 @@ void __cdecl DrawSpellList()
int v5; // eax
int v6; // esi
int v7; // eax
bool v8; // sf
BOOLEAN v8; // sf
int v9; // esi
int v10; // eax
int v11; // ebp
@ -1619,7 +1619,7 @@ LABEL_33:
// 4B8CC1: using guessed type char pcursobj;
// 4B8CC2: using guessed type char pcursplr;
void __fastcall control_print_info_str(int y, char *str, bool center, int lines)
void __fastcall control_print_info_str(int y, char *str, BOOLEAN center, int lines)
{
int v4; // edi
char *v5; // ebx
@ -1693,7 +1693,7 @@ void __cdecl DrawChr()
int v2; // ecx
int v3; // eax
int v4; // eax
bool v5; // zf
BOOLEAN v5; // zf
int v6; // eax
int v7; // edi
int v8; // edi
@ -2039,7 +2039,7 @@ void __cdecl CheckChrBtns()
int v2; // ebx
int v3; // edi
int v4; // edx
bool v5; // sf
BOOLEAN v5; // sf
unsigned char v6; // of
int v7; // edx
int v8; // edx
@ -2367,7 +2367,7 @@ void __cdecl DrawSpellBook()
}
// 4B8950: using guessed type int sbooktab;
void __fastcall PrintSBookStr(int x, int y, bool cjustflag, char *pszStr, int bright)
void __fastcall PrintSBookStr(int x, int y, BOOLEAN cjustflag, char *pszStr, int bright)
{
char *v5; // ebx
signed int v6; // eax
@ -2576,8 +2576,8 @@ void __fastcall control_set_gold_curs(int pnum)
int v1; // ecx
int v2; // eax
int *v3; // eax
bool v4; // zf
bool v5; // sf
BOOLEAN v4; // zf
BOOLEAN v5; // sf
unsigned char v6; // of
v1 = pnum;

4
Source/control.h
Unescape View File

@ -89,7 +89,7 @@ void __cdecl CheckBtnUp();
void __cdecl FreeControlPan();
int __fastcall control_WriteStringToBuffer(char *str);
void __cdecl DrawInfoBox();
void __fastcall control_print_info_str(int y, char *str, bool center, int lines);
void __fastcall control_print_info_str(int y, char *str, BOOLEAN center, int lines);
void __fastcall PrintGameStr(int x, int y, char *str, int color);
void __cdecl DrawChr();
void __fastcall ADD_PlrStringXY(int x, int y, int width, char *pszStr, char col);
@ -104,7 +104,7 @@ int __fastcall DrawDurIcon4Item(ItemStruct *pItem, int x, int c);
void __cdecl RedBack();
char __fastcall GetSBookTrans(int ii, BOOL townok);
void __cdecl DrawSpellBook();
void __fastcall PrintSBookStr(int x, int y, bool cjustflag, char *pszStr, int bright);
void __fastcall PrintSBookStr(int x, int y, BOOLEAN cjustflag, char *pszStr, int bright);
void __cdecl CheckSBook();
char *__fastcall get_pieces_str(int nGold);
void __fastcall DrawGoldSplit(int amount);

2
Source/cursor.cpp
Unescape View File

@ -548,7 +548,7 @@ void __cdecl CheckCursMove()
int v13; // ebx
int v14; // ebx
int v15; // eax
bool v16; // zf
BOOLEAN v16; // zf
int v17; // ecx
int v18; // eax
int v19; // ecx

4
Source/debug.cpp
Unescape View File

@ -135,7 +135,7 @@ void __cdecl SetAllSpellsCheat()
SetSpellLevelCheat(SPL_BONESPIRIT, 1);
}
void __fastcall PrintDebugPlayer(bool bNextPlayer)
void __fastcall PrintDebugPlayer(BOOLEAN bNextPlayer)
{
char dstr[128]; // [esp+Ch] [ebp-80h]
@ -171,7 +171,7 @@ void __cdecl PrintDebugQuest()
void __fastcall PrintDebugMonster(int m)
{
bool bActive; // ecx
BOOLEAN bActive; // ecx
int i; // eax
char dstr[128]; // [esp+Ch] [ebp-80h]

2
Source/debug.h
Unescape View File

@ -16,7 +16,7 @@ void __cdecl TakeGoldCheat();
void __cdecl MaxSpellsCheat();
void __fastcall SetSpellLevelCheat(char spl, int spllvl);
void __cdecl SetAllSpellsCheat();
void __fastcall PrintDebugPlayer(bool bNextPlayer);
void __fastcall PrintDebugPlayer(BOOLEAN bNextPlayer);
void __cdecl PrintDebugQuest();
void __fastcall PrintDebugMonster(int m);
void __cdecl GetDebugMonster();

10
Source/diablo.cpp
Unescape View File

@ -147,7 +147,7 @@ BOOL __fastcall StartGame(BOOL bNewGame, BOOL bSinglePlayer)
void __fastcall run_game_loop(unsigned int uMsg)
{
//int v3; // eax
bool v5; // zf
BOOLEAN v5; // zf
//int v6; // eax
signed int v7; // [esp+8h] [ebp-24h]
WNDPROC saveProc; // [esp+Ch] [ebp-20h]
@ -852,7 +852,7 @@ BOOL __fastcall LeftMouseDown(int a1)
BOOL __fastcall LeftMouseCmd(BOOL a1)
{
bool v2; // zf
BOOLEAN v2; // zf
BOOL v3; // ecx
unsigned char v4; // dl
unsigned char v6; // dl
@ -947,7 +947,7 @@ LABEL_49:
return 0;
}
bool __cdecl TryIconCurs()
BOOLEAN __cdecl TryIconCurs()
{
unsigned char v0; // dl
int v1; // edx
@ -1936,7 +1936,7 @@ void __fastcall LoadGameLevel(BOOL firstflag, int lvldir)
// 5CF31D: using guessed type char setlevel;
// 679660: using guessed type char gbMaxPlayers;
void __fastcall game_loop(bool bStartup)
void __fastcall game_loop(BOOLEAN bStartup)
{
int v1; // ecx
int v2; // esi
@ -2011,7 +2011,7 @@ void __cdecl game_logic()
// 525740: using guessed type int PauseMode;
// 679660: using guessed type char gbMaxPlayers;
void __fastcall timeout_cursor(bool bTimeout)
void __fastcall timeout_cursor(BOOLEAN bTimeout)
{
if (bTimeout) {
if (sgnTimeoutCurs == CURSOR_NONE && !sgbMouseDown) {

6
Source/diablo.h
Unescape View File

@ -52,7 +52,7 @@ LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL __fastcall LeftMouseDown(int a1);
BOOL __fastcall LeftMouseCmd(BOOL a1);
bool __cdecl TryIconCurs();
BOOLEAN __cdecl TryIconCurs();
void __cdecl LeftMouseUp();
void __cdecl RightMouseDown();
void __fastcall j_gmenu_on_mouse_move(LPARAM lParam);
@ -66,9 +66,9 @@ void __cdecl LoadLvlGFX();
void __cdecl LoadAllGFX();
void __fastcall CreateLevel(int lvldir);
void __fastcall LoadGameLevel(BOOL firstflag, int lvldir);
void __fastcall game_loop(bool bStartup);
void __fastcall game_loop(BOOLEAN bStartup);
void __cdecl game_logic();
void __fastcall timeout_cursor(bool bTimeout);
void __fastcall timeout_cursor(BOOLEAN bTimeout);
void __cdecl diablo_color_cyc_logic();
/* data */

2
Source/drlg_l1.cpp
Unescape View File

@ -1573,7 +1573,7 @@ void __cdecl L5FillChambers()
}
// 5276A4: using guessed type int setloadflag;
void __fastcall DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftflag, bool rightflag)
void __fastcall DRLG_L5GChamber(int sx, int sy, BOOLEAN topflag, BOOLEAN bottomflag, BOOLEAN leftflag, BOOLEAN rightflag)
{
int v6; // eax
int v7; // edx

2
Source/drlg_l1.h
Unescape View File

@ -43,7 +43,7 @@ void __fastcall L5VertWall(int i, int j, char p, int dy);
void __cdecl L5tileFix();
void __cdecl DRLG_L5Subs();
void __cdecl L5FillChambers();
void __fastcall DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool leftflag, bool rightflag);
void __fastcall DRLG_L5GChamber(int sx, int sy, BOOLEAN topflag, BOOLEAN bottomflag, BOOLEAN leftflag, BOOLEAN rightflag);
void __fastcall DRLG_L5GHall(int x1, int y1, int x2, int y2);
void __fastcall DRLG_L5SetRoom(int rx1, int ry1);
void __cdecl DRLG_L5FloodTVal();

26
Source/drlg_l2.cpp
Unescape View File

@ -963,7 +963,7 @@ void __fastcall DRLG_L2(int entry)
}
// 5B50D8: using guessed type int setloadflag_2;
bool __fastcall DRLG_L2PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir)
BOOLEAN __fastcall DRLG_L2PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, BOOLEAN setview, int ldir)
{
int v7; // ebx
int v8; // esi
@ -983,7 +983,7 @@ bool __fastcall DRLG_L2PlaceMiniSet(unsigned char *miniset, int tmin, int tmax,
int v25; // edi
char *v26; // edx
unsigned char v27; // bl
bool result; // al
BOOLEAN result; // al
unsigned char *v29; // [esp+Ch] [ebp-28h]
int v30; // [esp+10h] [ebp-24h]
int v31; // [esp+14h] [ebp-20h]
@ -1452,7 +1452,7 @@ void __cdecl L2TileFix()
} while (v0 < 40);
}
bool __cdecl CreateDungeon()
BOOLEAN __cdecl CreateDungeon()
{
int v0; // esi
int v1; // edx
@ -1461,8 +1461,8 @@ bool __cdecl CreateDungeon()
char *v4; // eax
signed int v5; // ebx
_BYTE *v6; // ecx
bool v7; // zf
bool v8; // eax
BOOLEAN v7; // zf
BOOLEAN v8; // eax
int v9; // edi
int v10; // esi
signed int v12; // [esp-4h] [ebp-20h]
@ -1760,7 +1760,7 @@ void __fastcall DefineRoom(int nX1, int nY1, int nX2, int nY2, int ForceHW)
int v6; // edi
int v7; // eax
int i; // eax
bool v9; // zf
BOOLEAN v9; // zf
int v10; // ecx
char *v11; // eax
char *v12; // ebx
@ -1892,7 +1892,7 @@ void __fastcall ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd)
//int v21; // ST04_4
int v23; // ebx
int v24; // ebx
bool v25; // zf
BOOLEAN v25; // zf
signed int v26; // [esp-4h] [ebp-34h]
signed int v27; // [esp-4h] [ebp-34h]
signed int v28; // [esp-4h] [ebp-34h]
@ -2115,9 +2115,9 @@ void __fastcall DoPatternCheck(int i, int j)
signed int v4; // ebp
int v5; // esi
int v6; // ecx
bool v7; // zf
BOOLEAN v7; // zf
char v8; // bl
bool v9; // zf
BOOLEAN v9; // zf
char v10; // bl
int *v11; // [esp+0h] [ebp-10h]
int v12; // [esp+4h] [ebp-Ch]
@ -2204,7 +2204,7 @@ void __fastcall DoPatternCheck(int i, int j)
}
}
bool __cdecl DL2_FillVoids()
BOOLEAN __cdecl DL2_FillVoids()
{
int i; // eax
int v2; // eax
@ -2214,7 +2214,7 @@ bool __cdecl DL2_FillVoids()
int v7; // eax
int v8; // ecx
char v9; // dl
bool v10; // eax
BOOLEAN v10; // eax
int v11; // esi
signed int v12; // ecx
signed int v13; // edi
@ -2569,9 +2569,9 @@ bool __cdecl DL2_FillVoids()
return DL2_NumNoChar() <= 700;
}
bool __fastcall DL2_Cont(bool x1f, bool y1f, bool x2f, bool y2f)
BOOLEAN __fastcall DL2_Cont(BOOLEAN x1f, BOOLEAN y1f, BOOLEAN x2f, BOOLEAN y2f)
{
bool v4; // zf
BOOLEAN v4; // zf
if (x1f && x2f) {
if (!y1f)

8
Source/drlg_l2.h
Unescape View File

@ -21,13 +21,13 @@ void __fastcall CreateL2Dungeon(int rseed, int entry);
void __cdecl DRLG_LoadL2SP();
void __cdecl DRLG_FreeL2SP();
void __fastcall DRLG_L2(int entry);
bool __fastcall DRLG_L2PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir);
BOOLEAN __fastcall DRLG_L2PlaceMiniSet(unsigned char *miniset, int tmin, int tmax, int cx, int cy, BOOLEAN setview, int ldir);
void __fastcall DRLG_L2PlaceRndSet(unsigned char *miniset, int rndper);
void __cdecl DRLG_L2Subs();
void __cdecl DRLG_L2Shadows();
void __fastcall DRLG_L2SetRoom(int rx1, int ry1);
void __cdecl L2TileFix();
bool __cdecl CreateDungeon();
BOOLEAN __cdecl CreateDungeon();
void __fastcall CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir, int ForceHW, int nH, int nW);
void __fastcall DefineRoom(int nX1, int nY1, int nX2, int nY2, int ForceHW);
void __fastcall AddHall(int nX1, int nY1, int nX2, int nY2, int nHd);
@ -36,8 +36,8 @@ void __fastcall ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd);
void __fastcall CreateDoorType(int nX, int nY);
void __fastcall PlaceHallExt(int nX, int nY);
void __fastcall DoPatternCheck(int i, int j);
bool __cdecl DL2_FillVoids();
bool __fastcall DL2_Cont(bool x1f, bool y1f, bool x2f, bool y2f);
BOOLEAN __cdecl DL2_FillVoids();
BOOLEAN __fastcall DL2_Cont(BOOLEAN x1f, BOOLEAN y1f, BOOLEAN x2f, BOOLEAN y2f);
int __cdecl DL2_NumNoChar();
void __fastcall DL2_DrawRoom(int x1, int y1, int x2, int y2);
void __fastcall DL2_KnockWalls(int x1, int y1, int x2, int y2);

34
Source/drlg_l3.cpp
Unescape View File

@ -365,7 +365,7 @@ void __fastcall DRLG_L3LockRec(int x, int y)
}
// 528380: using guessed type int lockoutcnt;
bool __cdecl DRLG_L3Lockout()
BOOLEAN __cdecl DRLG_L3Lockout()
{
int v0; // esi
signed int v1; // edx
@ -450,7 +450,7 @@ void __fastcall DRLG_L3(int entry)
int genok; // eax
signed int i; // ecx
signed int j; // esi
bool v24; // [esp-8h] [ebp-20h]
BOOLEAN v24; // [esp-8h] [ebp-20h]
lavapool = 0;
do {
@ -700,8 +700,8 @@ void __fastcall DRLG_L3CreateBlock(int x, int y, int obs, int dir)
int v5; // edi
int v6; // eax
int v9; // ebx
bool v10; // zf
bool v11; // zf
BOOLEAN v10; // zf
BOOLEAN v11; // zf
int y2; // [esp+Ch] [ebp-14h]
int x2; // [esp+10h] [ebp-10h]
int i; // [esp+14h] [ebp-Ch]
@ -1120,7 +1120,7 @@ void __cdecl DRLG_L3River()
char *v11; // eax
signed int v12; // eax
int v13; // ecx
bool v14; // zf
BOOLEAN v14; // zf
int v15; // eax
signed int v16; // eax
int v17; // eax
@ -1139,7 +1139,7 @@ void __cdecl DRLG_L3River()
int v30; // edx
int v31; // ecx
int v32; // edx
bool v33; // sf
BOOLEAN v33; // sf
unsigned char v34; // of
int river[3][100]; // [esp+Ch] [ebp-4E8h]
int v36; // [esp+4BCh] [ebp-38h]
@ -1682,7 +1682,7 @@ void __cdecl DRLG_L3PoolFix()
char v7; // cl
char v8; // cl
char v9; // al
bool v10; // zf
BOOLEAN v10; // zf
signed int v11; // [esp+10h] [ebp-4h]
v0 = 0;
@ -1721,7 +1721,7 @@ void __cdecl DRLG_L3PoolFix()
} while (v0 < 40);
}
int __fastcall DRLG_L3PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir)
int __fastcall DRLG_L3PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, BOOLEAN setview, int ldir)
{
int v7; // ebx
int v8; // esi
@ -1868,7 +1868,7 @@ void __fastcall DRLG_L3PlaceRndSet(const unsigned char *miniset, int rndper)
int v15; // esi
unsigned char *v16; // eax
unsigned char v17; // cl
bool v18; // zf
BOOLEAN v18; // zf
int v19; // [esp+8h] [ebp-30h]
int v20; // [esp+10h] [ebp-28h]
char *v21; // [esp+14h] [ebp-24h]
@ -2236,14 +2236,14 @@ void __cdecl DRLG_L3Wood()
FenceDoorFix();
}
bool __fastcall WoodVertU(int i, int y)
BOOLEAN __fastcall WoodVertU(int i, int y)
{
int v2; // eax
char v3; // cl
char *v4; // eax
unsigned char v5; // cl
char v6; // al
bool result; // eax
BOOLEAN result; // eax
v2 = i;
v3 = dungeon[i + 1][y];
@ -2260,14 +2260,14 @@ bool __fastcall WoodVertU(int i, int y)
return result;
}
bool __fastcall WoodVertD(int i, int y)
BOOLEAN __fastcall WoodVertD(int i, int y)
{
int v2; // eax
char v3; // cl
char *v4; // eax
unsigned char v5; // cl
char v6; // al
bool result; // eax
BOOLEAN result; // eax
v2 = i;
v3 = dungeon[i + 1][y];
@ -2284,14 +2284,14 @@ bool __fastcall WoodVertD(int i, int y)
return result;
}
bool __fastcall WoodHorizL(int x, int j)
BOOLEAN __fastcall WoodHorizL(int x, int j)
{
int v2; // eax
char v3; // cl
char *v4; // eax
unsigned char v5; // cl
char v6; // al
bool result; // eax
BOOLEAN result; // eax
v2 = x;
v3 = dungeon[x][j + 1];
@ -2308,14 +2308,14 @@ bool __fastcall WoodHorizL(int x, int j)
return result;
}
bool __fastcall WoodHorizR(int x, int j)
BOOLEAN __fastcall WoodHorizR(int x, int j)
{
int v2; // eax
char v3; // cl
char *v4; // eax
unsigned char v5; // cl
char v6; // al
bool result; // eax
BOOLEAN result; // eax
v2 = x;
v3 = dungeon[x][j + 1];

12
Source/drlg_l3.h
Unescape View File

@ -13,7 +13,7 @@ int __cdecl DRLG_L3Anvil();
void __cdecl FixL3Warp();
void __cdecl FixL3HallofHeroes();
void __fastcall DRLG_L3LockRec(int x, int y);
bool __cdecl DRLG_L3Lockout();
BOOLEAN __cdecl DRLG_L3Lockout();
void __fastcall CreateL3Dungeon(int rseed, int entry);
void __fastcall DRLG_L3(int entry);
void __cdecl InitL3Dungeon();
@ -31,13 +31,13 @@ void __cdecl DRLG_L3Pool();
int __fastcall DRLG_L3SpawnEdge(int x, int y, int *totarea);
int __fastcall DRLG_L3Spawn(int x, int y, int *totarea);
void __cdecl DRLG_L3PoolFix();
int __fastcall DRLG_L3PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, bool setview, int ldir);
int __fastcall DRLG_L3PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, BOOLEAN setview, int ldir);
void __fastcall DRLG_L3PlaceRndSet(const unsigned char *miniset, int rndper);
void __cdecl DRLG_L3Wood();
bool __fastcall WoodVertU(int i, int y);
bool __fastcall WoodVertD(int i, int y);
bool __fastcall WoodHorizL(int x, int j);
bool __fastcall WoodHorizR(int x, int j);
BOOLEAN __fastcall WoodVertU(int i, int y);
BOOLEAN __fastcall WoodVertD(int i, int y);
BOOLEAN __fastcall WoodHorizL(int x, int j);
BOOLEAN __fastcall WoodHorizR(int x, int j);
void __cdecl DRLG_L3Pass3();
void __fastcall LoadL3Dungeon(char *sFileName, int vx, int vy);
void __fastcall LoadPreL3Dungeon(char *sFileName, int vx, int vy);

22
Source/drlg_l4.cpp
Unescape View File

@ -440,9 +440,9 @@ void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1)
}
}
void __fastcall DRLG_LoadDiabQuads(bool preflag)
void __fastcall DRLG_LoadDiabQuads(BOOLEAN preflag)
{
bool v1; // esi
BOOLEAN v1; // esi
unsigned char *v2; // edi
char *v3; // ecx
unsigned char *v4; // edi
@ -487,9 +487,9 @@ void __fastcall DRLG_LoadDiabQuads(bool preflag)
// 528A34: using guessed type int l4holdx;
// 528A38: using guessed type int l4holdy;
bool __fastcall IsDURWall(char d)
BOOLEAN __fastcall IsDURWall(char d)
{
bool result; // al
BOOLEAN result; // al
if (d == 25 || d == 28)
result = 1;
@ -498,9 +498,9 @@ bool __fastcall IsDURWall(char d)
return result;
}
bool __fastcall IsDLLWall(char dd)
BOOLEAN __fastcall IsDLLWall(char dd)
{
bool result; // al
BOOLEAN result; // al
if (dd == 27 || dd == 26)
result = 1;
@ -1075,7 +1075,7 @@ void __fastcall L4HorizWall(int i, int j, int dx)
int v8; // edx
char *v9; // eax
int v10; // eax
bool v11; // zf
BOOLEAN v11; // zf
char *v12; // eax
v3 = i;
@ -1128,7 +1128,7 @@ void __fastcall L4VertWall(int i, int j, int dy)
int v8; // edx
int v9; // eax
char *v10; // ecx
bool v11; // zf
BOOLEAN v11; // zf
int v12; // [esp+8h] [ebp-4h]
v3 = j;
@ -2470,7 +2470,7 @@ void __fastcall L4roomGen(int x, int y, int w, int h, int dir)
}
}
bool __fastcall L4checkRoom(int x, int y, int width, int height)
BOOLEAN __fastcall L4checkRoom(int x, int y, int width, int height)
{
int v4; // esi
int v5; // ebx
@ -2502,7 +2502,7 @@ bool __fastcall L4checkRoom(int x, int y, int width, int height)
return 0;
}
bool __fastcall DRLG_L4PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, int setview, int ldir)
BOOLEAN __fastcall DRLG_L4PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, int setview, int ldir)
{
int v7; // ebx
int v8; // esi
@ -2519,7 +2519,7 @@ bool __fastcall DRLG_L4PlaceMiniSet(const unsigned char *miniset, int tmin, int
int v19; // edi
int v20; // edx
char v21; // bl
bool result; // al
BOOLEAN result; // al
const unsigned char *v23; // [esp+Ch] [ebp-28h]
int v24; // [esp+10h] [ebp-24h]
int v25; // [esp+14h] [ebp-20h]

10
Source/drlg_l4.h
Unescape View File

@ -26,9 +26,9 @@ void __cdecl DRLG_FreeL4SP();
void __fastcall DRLG_L4SetSPRoom(int rx1, int ry1);
void __cdecl L4SaveQuads();
void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1);
void __fastcall DRLG_LoadDiabQuads(bool preflag);
bool __fastcall IsDURWall(char d);
bool __fastcall IsDLLWall(char dd);
void __fastcall DRLG_LoadDiabQuads(BOOLEAN preflag);
BOOLEAN __fastcall IsDURWall(char d);
BOOLEAN __fastcall IsDLLWall(char dd);
void __cdecl L4FixRim();
void __cdecl DRLG_L4GeneralFix();
void __fastcall CreateL4Dungeon(int rseed, int entry);
@ -49,8 +49,8 @@ int __cdecl GetArea();
void __cdecl L4firstRoom();
void __fastcall L4drawRoom(int x, int y, int width, int height);
void __fastcall L4roomGen(int x, int y, int w, int h, int dir);
bool __fastcall L4checkRoom(int x, int y, int width, int height);
bool __fastcall DRLG_L4PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, int setview, int ldir);
BOOLEAN __fastcall L4checkRoom(int x, int y, int width, int height);
BOOLEAN __fastcall DRLG_L4PlaceMiniSet(const unsigned char *miniset, int tmin, int tmax, int cx, int cy, int setview, int ldir);
void __cdecl DRLG_L4FloodTVal();
void __fastcall DRLG_L4FTVR(int i, int j, int x, int y, int d);
void __cdecl DRLG_L4TransFix();

4
Source/engine.cpp
Unescape View File

@ -4,13 +4,13 @@
int engine_cpp_init_value; // weak
char gbPixelCol; // automap pixel color 8-bit (palette entry)
int dword_52B970; // bool flip - if y < x
int dword_52B970; // BOOLEAN flip - if y < x
int orgseed; // weak
int sgnWidth;
int sglGameSeed; // weak
static CRITICAL_SECTION sgMemCrit;
int SeedCount; // weak
int dword_52B99C; // bool valid - if x/y are in bounds
int dword_52B99C; // BOOLEAN valid - if x/y are in bounds
const int engine_inf = 0x7F800000; // weak
const int rand_increment = 1; // unused

2
Source/error.cpp
Unescape View File

@ -89,7 +89,7 @@ void __cdecl DrawDiabloMsg()
int v12; // esi
signed int v13; // esi
unsigned char v14; // bl
bool v15; // zf
BOOLEAN v15; // zf
signed int v16; // [esp+Ch] [ebp-8h]
signed int v17; // [esp+Ch] [ebp-8h]
signed int screen_x; // [esp+10h] [ebp-4h]

2
Source/gamemenu.cpp
Unescape View File

@ -56,7 +56,7 @@ void __cdecl gamemenu_previous()
void __cdecl gamemenu_enable_single()
{
bool v0; // dl
BOOLEAN v0; // dl
gmenu_enable(&sgSingleMenu[3], gbValidSaveFile);
v0 = 0;

6
Source/gendung.cpp
Unescape View File

@ -155,7 +155,7 @@ void __cdecl gendung_418D91()
int v22; // edi
int v23; // eax
int v24; // eax
bool v25; // zf
BOOLEAN v25; // zf
int v26; // edx
char *v27; // esi
char *v28; // edi
@ -759,7 +759,7 @@ void __fastcall Make_SetPC(int x, int y, int w, int h)
}
}
bool __fastcall DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height)
BOOLEAN __fastcall DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height)
{
int v7; // esi
int v8; // edi
@ -1208,7 +1208,7 @@ void __cdecl DRLG_HoldThemeRooms()
}
}
bool __fastcall SkipThemeRoom(int x, int y)
BOOLEAN __fastcall SkipThemeRoom(int x, int y)
{
int i; // ebx
THEME_LOC *v3; // eax

4
Source/gendung.h
Unescape View File

@ -85,11 +85,11 @@ void __fastcall DRLG_AreaTrans(int num, unsigned char *List);
void __cdecl DRLG_InitSetPC();
void __cdecl DRLG_SetPC();
void __fastcall Make_SetPC(int x, int y, int w, int h);
bool __fastcall DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height);
BOOLEAN __fastcall DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, int *width, int *height);
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);
BOOLEAN __fastcall SkipThemeRoom(int x, int y);
void __cdecl InitLevels();
#endif /* __GENDUNG_H__ */

4
Source/gmenu.cpp
Unescape View File

@ -3,7 +3,7 @@
#include "../types.h"
void *optbar_cel;
bool byte_634464; // weak
BOOLEAN byte_634464; // weak
void *PentSpin_cel;
TMenuItem *sgpCurrItem;
void *BigTGold_cel;
@ -373,7 +373,7 @@ 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;
bool __fastcall gmenu_valid_mouse_pos(int *plOffset)
BOOLEAN __fastcall gmenu_valid_mouse_pos(int *plOffset)
{
*plOffset = 282;
if (MouseX < 282) {

4
Source/gmenu.h
Unescape View File

@ -3,7 +3,7 @@
#define __GMENU_H__
extern void *optbar_cel;
extern bool byte_634464; // weak
extern BOOLEAN byte_634464; // weak
extern void *PentSpin_cel;
extern TMenuItem *sgpCurrItem;
extern void *BigTGold_cel;
@ -29,7 +29,7 @@ int __fastcall gmenu_get_lfont(TMenuItem *pItem);
int __fastcall gmenu_presskeys(int a1);
void __fastcall gmenu_left_right(int a1);
int __fastcall gmenu_on_mouse_move(LPARAM lParam);
bool __fastcall gmenu_valid_mouse_pos(int *plOffset);
BOOLEAN __fastcall gmenu_valid_mouse_pos(int *plOffset);
int __fastcall gmenu_left_mouse(int a1);
void __fastcall gmenu_enable(TMenuItem *pMenuItem, BOOL enable);
void __fastcall gmenu_slider_1(TMenuItem *pItem, int min, int max, int gamma);

16
Source/init.cpp
Unescape View File

@ -13,7 +13,7 @@ void *diabdat_mpq;
char diabdat_mpq_path[260];
void *patch_rt_mpq;
int killed_mom_parent; // weak
bool screensaver_enabled_prev;
BOOLEAN screensaver_enabled_prev;
const int init_inf = 0x7F800000; // weak
@ -31,7 +31,7 @@ struct init_cpp_init {
// 47AE20: using guessed type int init_inf;
// 63497C: using guessed type int init_cpp_init_value;
void __fastcall init_cleanup(bool show_cursor)
void __fastcall init_cleanup(BOOLEAN show_cursor)
{
int v1; // edi
@ -88,7 +88,7 @@ void __fastcall init_run_office(char *dir)
{
char *v1; // esi
HANDLE v2; // ebx
bool v3; // zf
BOOLEAN v3; // zf
HWND v4; // eax
char Directory[260]; // [esp+8h] [ebp-348h]
char FileName[260]; // [esp+10Ch] [ebp-244h]
@ -125,14 +125,14 @@ void __fastcall init_run_office(char *dir)
}
}
void __fastcall init_disable_screensaver(bool disable)
void __fastcall init_disable_screensaver(BOOLEAN disable)
{
bool v1; // al
BOOLEAN v1; // al
char Data[16]; // [esp+4h] [ebp-20h]
DWORD Type; // [esp+14h] [ebp-10h]
DWORD cbData; // [esp+18h] [ebp-Ch]
HKEY phkResult; // [esp+1Ch] [ebp-8h]
bool v6; // [esp+20h] [ebp-4h]
BOOLEAN v6; // [esp+20h] [ebp-4h]
// BUGFIX: this is probably the worst possible way to do this. Alternatives: ExtEscape() with SETPOWERMANAGEMENT,
// SystemParametersInfo() with SPI_SETSCREENSAVEACTIVE/SPI_SETPOWEROFFACTIVE/SPI_SETLOWPOWERACTIVE
@ -269,7 +269,7 @@ void __cdecl init_archives()
patch_rt_mpq = init_test_access(patch_rt_mpq_path, "\\patch_rt.mpq", "DiabloInstall", 2000, 0);
}
void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, bool on_cd)
void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, BOOLEAN on_cd)
{
char *v5; // esi
char *v7; // eax
@ -442,7 +442,7 @@ LRESULT __stdcall MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
}
// 52571C: using guessed type int drawpanflag;
void __fastcall init_activate_window(HWND hWnd, bool bActive)
void __fastcall init_activate_window(HWND hWnd, BOOLEAN bActive)
{
LONG dwNewLong; // eax

10
Source/init.h
Unescape View File

@ -13,24 +13,24 @@ extern void *diabdat_mpq;
extern char diabdat_mpq_path[260];
extern void *patch_rt_mpq;
extern int killed_mom_parent; // weak
extern bool screensaver_enabled_prev;
extern BOOLEAN screensaver_enabled_prev;
void __cdecl init_cpp_init();
void __fastcall init_cleanup(bool show_cursor);
void __fastcall init_cleanup(BOOLEAN show_cursor);
void __cdecl init_run_office_from_start_menu();
void __fastcall init_run_office(char *dir);
void __fastcall init_disable_screensaver(bool disable);
void __fastcall init_disable_screensaver(BOOLEAN disable);
void __fastcall init_create_window(int nCmdShow);
void __cdecl init_kill_mom_parent();
HWND __cdecl init_find_mom_parent();
void __cdecl init_await_mom_parent_exit();
void __cdecl init_archives();
void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, bool on_cd);
void *__fastcall init_test_access(char *mpq_path, char *mpq_name, char *reg_loc, int flags, BOOLEAN on_cd);
char *__fastcall init_strip_trailing_slash(char *path);
int __fastcall init_read_test_file(char *mpq_path, char *mpq_name, int flags, void **archive);
void __cdecl init_get_file_info();
LRESULT __stdcall MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
void __fastcall init_activate_window(HWND hWnd, bool bActive);
void __fastcall init_activate_window(HWND hWnd, BOOLEAN bActive);
LRESULT __stdcall WindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
WNDPROC __fastcall SetWindowProc(WNDPROC NewProc);

4
Source/inv.cpp
Unescape View File

@ -400,7 +400,7 @@ void __cdecl DrawInvBelt()
int v4; // edi
char v5; // cl
int v6; // edx
bool v7; // zf
BOOLEAN v7; // zf
int v8; // ecx
int v9; // eax
unsigned char v10; // edx
@ -2097,7 +2097,7 @@ int __fastcall CanPut(int i, int j)
char v4; // al
int v5; // eax
char v6; // al
bool v7; // sf
BOOLEAN v7; // sf
char v8; // al
char v9; // cl

48
Source/items.cpp
Unescape View File

@ -649,11 +649,11 @@ void __cdecl InitItemGFX()
memset(UniqueItemFlag, 0, sizeof(UniqueItemFlag));
}
bool __fastcall ItemPlace(int xp, int yp)
BOOLEAN __fastcall ItemPlace(int xp, int yp)
{
int v2; // ecx
int v3; // eax
bool result; // al
BOOLEAN result; // al
v2 = xp;
v3 = v2 * 112 + yp;
@ -1101,7 +1101,7 @@ void __fastcall CalcSelfItems(int pnum)
int v4; // edi
int *v5; // eax
signed int v6; // ebx
bool v7; // zf
BOOLEAN v7; // zf
char *v8; // eax
signed int v9; // [esp+Ch] [ebp-10h]
signed int v10; // [esp+10h] [ebp-Ch]
@ -1189,7 +1189,7 @@ void __fastcall CalcPlrItemMin(int pnum)
} while (v7);
}
bool __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x)
BOOLEAN __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x)
{
if (p->_pStrength < x->_iMinStr || p->_pMagic < x->_iMinMag || p->_pDexterity < x->_iMinDex)
return 0;
@ -1458,7 +1458,7 @@ BOOL __fastcall ItemSpaceOk(int i, int j)
char v4; // cl
int v5; // ecx
char v6; // cl
bool v7; // sf
BOOLEAN v7; // sf
char v8; // cl
char v9; // al
@ -1498,7 +1498,7 @@ BOOL __fastcall ItemSpaceOk(int i, int j)
return 0;
}
bool __fastcall GetItemSpace(int x, int y, char inum)
BOOLEAN __fastcall GetItemSpace(int x, int y, char inum)
{
int v3; // eax
int v4; // edx
@ -1671,7 +1671,7 @@ void __fastcall CalcItemValue(int i)
{
int v1; // ecx
int v2; // esi
bool v3; // sf
BOOLEAN v3; // sf
int v4; // esi
v1 = i;
@ -2564,7 +2564,7 @@ int __fastcall RndUItem(int m)
{
int ri; // edx
int i; // ebp
bool okflag; // edi
BOOLEAN okflag; // edi
int ril[512]; // [esp+0h] [ebp-800h]
if (m != -1) {
@ -2638,7 +2638,7 @@ int __cdecl RndAllItems()
int __fastcall RndTypeItems(int itype, int imid)
{
int i; // edi
bool okflag; // esi
BOOLEAN okflag; // esi
int ril[512]; // [esp+4h] [ebp-80Ch]
int ri; // [esp+80Ch] [ebp-4h]
@ -2666,7 +2666,7 @@ int __fastcall RndTypeItems(int itype, int imid)
}
// 421CB7: using guessed type int var_80C[512];
int __fastcall CheckUnique(int i, int lvl, int uper, bool recreate)
int __fastcall CheckUnique(int i, int lvl, int uper, BOOLEAN recreate)
{
int numu; // ebx
int j; // esi
@ -3208,8 +3208,8 @@ void __fastcall RespawnItem(int i, BOOL FlipFlag)
void __fastcall DeleteItem(int ii, int i)
{
int v2; // eax
bool v3; // zf
bool v4; // sf
BOOLEAN v3; // zf
BOOLEAN v4; // sf
v2 = numitems - 1;
v3 = numitems == 1;
@ -4159,9 +4159,9 @@ void __fastcall UseItem(int p, int Mid, int spl)
}
}
bool __fastcall StoreStatOk(ItemStruct *h)
BOOLEAN __fastcall StoreStatOk(ItemStruct *h)
{
bool sf; // al
BOOLEAN sf; // al
sf = 1;
if (plr[myplr]._pStrength < h->_iMinStr
@ -4171,10 +4171,10 @@ bool __fastcall StoreStatOk(ItemStruct *h)
return sf;
}
bool __fastcall SmithItemOk(int i)
BOOLEAN __fastcall SmithItemOk(int i)
{
unsigned char v1; // cl
bool rv; // eax
BOOLEAN rv; // eax
v1 = AllItemsList[i].itype;
rv = 1;
@ -4285,10 +4285,10 @@ void __fastcall SpawnSmith(int lvl)
SortSmith();
}
bool __fastcall PremiumItemOk(int i)
BOOLEAN __fastcall PremiumItemOk(int i)
{
unsigned char v1; // cl
bool rv; // eax
BOOLEAN rv; // eax
v1 = AllItemsList[i].itype;
rv = 1;
@ -4371,9 +4371,9 @@ void __fastcall SpawnPremium(int lvl)
}
// 69FB38: using guessed type int talker;
bool __fastcall WitchItemOk(int i)
BOOLEAN __fastcall WitchItemOk(int i)
{
bool rv; // eax
BOOLEAN rv; // eax
unsigned char v3; // dl
int v4; // edx
int v5; // ecx
@ -4579,10 +4579,10 @@ void __fastcall SpawnBoy(int lvl)
}
// 6A8A3C: using guessed type int boylevel;
bool __fastcall HealerItemOk(int i)
BOOLEAN __fastcall HealerItemOk(int i)
{
int v1; // ecx
bool result; // eax
BOOLEAN result; // eax
int v3; // esi
v1 = i;
@ -4864,11 +4864,11 @@ int __cdecl ItemNoFlippy()
return r;
}
void __fastcall CreateSpellBook(int x, int y, int ispell, bool sendmsg, int delta)
void __fastcall CreateSpellBook(int x, int y, int ispell, BOOLEAN sendmsg, int delta)
{
int ii; // edi
int idx; // [esp+8h] [ebp-8h]
bool done; // [esp+Ch] [ebp-4h]
BOOLEAN done; // [esp+Ch] [ebp-4h]
done = 0;
idx = RndTypeItems(0, 24);

20
Source/items.h
Unescape View File

@ -15,7 +15,7 @@ extern int numitems;
extern int gnNumGetRecords;
void __cdecl InitItemGFX();
bool __fastcall ItemPlace(int xp, int yp);
BOOLEAN __fastcall ItemPlace(int xp, int yp);
void __cdecl AddInitItems();
void __cdecl InitItems();
void __fastcall CalcPlrItemVals(int p, BOOL Loadgfx);
@ -23,7 +23,7 @@ void __fastcall CalcPlrScrolls(int p);
void __fastcall CalcPlrStaff(int pnum);
void __fastcall CalcSelfItems(int pnum);
void __fastcall CalcPlrItemMin(int pnum);
bool __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x);
BOOLEAN __fastcall ItemMinStats(PlayerStruct *p, ItemStruct *x);
void __fastcall CalcPlrBookVals(int p);
void __fastcall CalcPlrInv(int p, BOOL Loadgfx);
void __fastcall SetPlrHandItem(ItemStruct *h, int idata);
@ -33,7 +33,7 @@ void __fastcall SetPlrHandSeed(ItemStruct *h, int iseed);
void __fastcall SetPlrHandGoldCurs(ItemStruct *h);
void __fastcall CreatePlrItems(int p);
BOOL __fastcall ItemSpaceOk(int i, int j);
bool __fastcall GetItemSpace(int x, int y, char inum);
BOOLEAN __fastcall GetItemSpace(int x, int y, char inum);
void __fastcall GetSuperItemSpace(int x, int y, char inum);
void __fastcall GetSuperItemLoc(int x, int y, int *xx, int *yy);
void __fastcall CalcItemValue(int i);
@ -51,7 +51,7 @@ int __fastcall RndItem(int m);
int __fastcall RndUItem(int m);
int __cdecl RndAllItems();
int __fastcall RndTypeItems(int itype, int imid);
int __fastcall CheckUnique(int i, int lvl, int uper, bool recreate);
int __fastcall CheckUnique(int i, int lvl, int uper, BOOLEAN recreate);
void __fastcall GetUniqueItem(int i, int uid);
void __fastcall SpawnUnique(int uid, int x, int y);
void __fastcall ItemRndDur(int ii);
@ -88,24 +88,24 @@ void __fastcall PrintItemMisc(ItemStruct *x);
void __fastcall PrintItemDetails(ItemStruct *x);
void __fastcall PrintItemDur(ItemStruct *x);
void __fastcall UseItem(int p, int Mid, int spl);
bool __fastcall StoreStatOk(ItemStruct *h);
bool __fastcall SmithItemOk(int i);
BOOLEAN __fastcall StoreStatOk(ItemStruct *h);
BOOLEAN __fastcall SmithItemOk(int i);
int __fastcall RndSmithItem(int lvl);
void __fastcall BubbleSwapItem(ItemStruct *a, ItemStruct *b);
void __cdecl SortSmith();
void __fastcall SpawnSmith(int lvl);
bool __fastcall PremiumItemOk(int i);
BOOLEAN __fastcall PremiumItemOk(int i);
int __fastcall RndPremiumItem(int minlvl, int maxlvl);
void __fastcall SpawnOnePremium(int i, int plvl);
void __fastcall SpawnPremium(int lvl);
bool __fastcall WitchItemOk(int i);
BOOLEAN __fastcall WitchItemOk(int i);
int __fastcall RndWitchItem(int lvl);
void __cdecl SortWitch();
void __fastcall WitchBookLevel(int ii);
void __fastcall SpawnWitch(int lvl);
int __fastcall RndBoyItem(int lvl);
void __fastcall SpawnBoy(int lvl);
bool __fastcall HealerItemOk(int i);
BOOLEAN __fastcall HealerItemOk(int i);
int __fastcall RndHealerItem(int lvl);
void __cdecl SortHealer();
void __fastcall SpawnHealer(int lvl);
@ -118,7 +118,7 @@ void __fastcall RecreateHealerItem(int ii, int idx, int lvl, int iseed);
void __fastcall RecreateTownItem(int ii, int idx, unsigned short icreateinfo, int iseed, int ivalue);
void __cdecl RecalcStoreStats();
int __cdecl ItemNoFlippy();
void __fastcall CreateSpellBook(int x, int y, int ispell, bool sendmsg, int delta);
void __fastcall CreateSpellBook(int x, int y, int ispell, BOOLEAN sendmsg, int delta);
void __fastcall CreateMagicArmor(int x, int y, int imisc, int icurs, int sendmsg, int delta);
void __fastcall CreateMagicWeapon(int x, int y, int imisc, int icurs, int sendmsg, int delta);
BOOL __fastcall GetItemRecord(int dwSeed, WORD CI, int indx);

6
Source/lighting.cpp
Unescape View File

@ -494,7 +494,7 @@ void __fastcall DoLighting(int nXPos, int nYPos, int nRadius, int Lnum)
int v13; // edx
_BYTE *v14; // ecx
int v15; // ebx
bool v16; // sf
BOOLEAN v16; // sf
unsigned char v17; // of
int v18; // esi
int v19; // ecx
@ -998,7 +998,7 @@ void __cdecl MakeLightTable()
double v41; // st6
int v42; // ecx
char *v43; // ecx
bool v44; // zf
BOOLEAN v44; // zf
char v45[16]; // [esp+14h] [ebp-2Ch] /* check */
int v46; // [esp+24h] [ebp-1Ch]
int v47; // [esp+28h] [ebp-18h]
@ -1512,7 +1512,7 @@ void __fastcall ChangeVisionXY(int id, int x, int y)
void __cdecl ProcessVisionList()
{
bool delflag; // ecx
BOOLEAN delflag; // ecx
int i;
if (dovision) {

2
Source/logging.cpp
Unescape View File

@ -48,7 +48,7 @@ void __cdecl log_cleanup_mutex()
DeleteCriticalSection(&sgMemCrit);
}
void __cdecl log_flush(bool force_close)
void __cdecl log_flush(BOOLEAN force_close)
{
void *v1; // eax
DWORD NumberOfBytesWritten; // [esp+8h] [ebp-4h]

2
Source/logging.h
Unescape View File

@ -13,7 +13,7 @@ void __cdecl log_cpp_init_2();
void __cdecl log_init_mutex();
void __cdecl j_log_cleanup_mutex();
void __cdecl log_cleanup_mutex();
void __cdecl log_flush(bool force_close);
void __cdecl log_flush(BOOLEAN force_close);
void *__cdecl log_create(); // should be HANDLE
void __fastcall log_get_version(VS_FIXEDFILEINFO *file_info);
void log_printf(const char *pszFmt, ...); // LogMessage

76
Source/missiles.cpp
Unescape View File

@ -661,8 +661,8 @@ void __fastcall DeleteMissile(int mi, int i)
int v3; // ebx
int v4; // esi
int v5; // eax
bool v6; // zf
bool v7; // sf
BOOLEAN v6; // zf
BOOLEAN v7; // sf
v2 = mi;
v3 = i;
@ -894,10 +894,10 @@ BOOL __fastcall MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, i
return 1;
}
bool __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, int shift)
BOOLEAN __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, int shift)
{
int v7; // edi
bool v8; // zf
BOOLEAN v8; // zf
short v9; // ax
int v10; // ecx
int v11; // eax
@ -1038,7 +1038,7 @@ bool __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, i
return 1;
}
bool __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag)
BOOLEAN __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag)
{
int v8; // ebx
int v9; // esi
@ -1230,7 +1230,7 @@ LABEL_50:
return 0;
}
bool __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift)
BOOLEAN __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift)
{
int v7; // edi
unsigned char v8; // al
@ -1240,7 +1240,7 @@ bool __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, i
int v12; // ecx
int v13; // eax
int v14; // ecx
bool v15; // sf
BOOLEAN v15; // sf
int v16; // ecx
int v17; // ebx
int v20; // eax
@ -1355,7 +1355,7 @@ LABEL_14:
return 0;
}
void __fastcall CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, int nodel)
void __fastcall CheckMissileCol(int i, int mindam, int maxdam, BOOLEAN shift, int mx, int my, int nodel)
{
int v7; // ebx
int v8; // esi
@ -1363,13 +1363,13 @@ void __fastcall CheckMissileCol(int i, int mindam, int maxdam, bool shift, int m
int v10; // ecx
int v11; // edi
int v12; // eax
bool v13; // eax
BOOLEAN v13; // eax
char v14; // al
int v15; // ecx
int v16; // edx
bool v17; // eax
BOOLEAN v17; // eax
int v18; // eax
bool v19; // eax
BOOLEAN v19; // eax
char v20; // al
int v21; // eax
int v22; // eax
@ -1879,7 +1879,7 @@ void __fastcall AddRndTeleport(int mi, int sx, int sy, int dx, int dy, int midir
int v12; // eax
int v14; // edi
int v16; // eax
bool v17; // zf
BOOLEAN v17; // zf
int v18; // ecx
int v19; // ecx
int v20; // [esp+Ch] [ebp-Ch]
@ -2302,7 +2302,7 @@ void __fastcall AddWeapexp(int mi, int sx, int sy, int dx, int dy, int midir, in
missile[v9]._mirange = missile[v9]._miAnimLen - 1;
}
bool __fastcall CheckIfTrig(int x, int y)
BOOLEAN __fastcall CheckIfTrig(int x, int y)
{
int v2; // edi
int v3; // ebx
@ -2741,7 +2741,7 @@ void __fastcall AddRhino(int mi, int sx, int sy, int dx, int dy, int midir, int
int v13; // eax
CMonster *v14; // ecx
char v15; // cl
bool v16; // zf
BOOLEAN v16; // zf
int i; // [esp+8h] [ebp-4h]
v9 = id;
@ -2787,7 +2787,7 @@ void __fastcall miss_null_32(int mi, int sx, int sy, int dx, int dy, int midir,
AnimStruct *v11; // edi
int v12; // eax
CMonster *v13; // ecx
bool v14; // zf
BOOLEAN v14; // zf
int v15; // ecx
v9 = id;
@ -3010,8 +3010,8 @@ void __fastcall AddGolem(int mi, int sx, int sy, int dx, int dy, int midir, int
int v10; // ebx
int v11; // edi
int v12; // ecx
bool v13; // zf
bool v14; // sf
BOOLEAN v13; // zf
BOOLEAN v14; // sf
int v15; // esi
int v16; // esi
int v17; // [esp+Ch] [ebp-8h]
@ -3870,7 +3870,7 @@ void __fastcall MI_Golem(int i)
int v1; // esi
int v2; // eax
int v3; // eax
bool v4; // zf
BOOLEAN v4; // zf
int v5; // eax
int v6; // ecx
char *v7; // eax
@ -4415,7 +4415,7 @@ void __fastcall MI_Firewall(int i)
void __fastcall MI_Fireball(int i)
{
int v1; // esi
bool v2; // zf
BOOLEAN v2; // zf
int v3; // eax
int v4; // ecx
int v5; // edi
@ -4711,7 +4711,7 @@ void __fastcall MI_Flash(int i)
int v2; // esi
int v3; // eax
int v4; // eax
bool v5; // zf
BOOLEAN v5; // zf
int v6; // esi
v1 = i;
@ -4747,7 +4747,7 @@ void __fastcall MI_Flash2(int i)
int v2; // esi
int v3; // eax
int v4; // eax
bool v5; // zf
BOOLEAN v5; // zf
int v6; // esi
v1 = i;
@ -4782,13 +4782,13 @@ void __fastcall MI_Manashield(int i)
int v4; // eax
int v5; // ecx
int v6; // edx
bool v7; // zf
BOOLEAN v7; // zf
int v8; // eax
int v9; // ecx
int v10; // edx
int v11; // ecx
int v12; // ecx
bool v13; // sf
BOOLEAN v13; // sf
int v14; // [esp+Ch] [ebp-10h]
int ia; // [esp+14h] [ebp-8h]
int arglist; // [esp+18h] [ebp-4h]
@ -4893,7 +4893,7 @@ void __fastcall MI_Etherealize(int i)
int v6; // eax
int v7; // ecx
int v8; // edx
bool v9; // zf
BOOLEAN v9; // zf
char v10; // al
v1 = i;
@ -5113,7 +5113,7 @@ void __fastcall MI_Chain(int i)
int v12; // ebx
int v13; // eax
int v14; // eax
bool v15; // zf
BOOLEAN v15; // zf
int CrawlNum[19]; // [esp+Ch] [ebp-68h]
int v2; // [esp+58h] [ebp-1Ch]
int v18; // [esp+5Ch] [ebp-18h]
@ -5186,7 +5186,7 @@ void __fastcall MI_Chain(int i)
void __fastcall mi_null_11(int i)
{
int v1; // eax
bool v2; // zf
BOOLEAN v2; // zf
v1 = i;
v2 = missile[i]._mirange == 1;
@ -5204,7 +5204,7 @@ void __fastcall MI_Weapexp(int i)
int v2; // ecx
int v3; // eax
int v4; // ecx
bool v5; // zf
BOOLEAN v5; // zf
int v6; // edx
int v7; // eax
int v8; // eax
@ -5260,7 +5260,7 @@ void __fastcall MI_Misexp(int i)
{
int v1; // edi
int v2; // esi
bool v3; // zf
BOOLEAN v3; // zf
int v4; // ecx
int v5; // eax
int ExpLight[10]; // [esp+8h] [ebp-28h]
@ -5343,7 +5343,7 @@ void __fastcall MI_Teleport(int i)
int v8; // edx
int v9; // edx
int v10; // eax
bool v11; // zf
BOOLEAN v11; // zf
v1 = i;
v2 = missile[i]._misource;
@ -5386,8 +5386,8 @@ void __fastcall MI_Stone(int i)
int v1; // esi
int v2; // edi
int v3; // edi
bool v4; // zf
bool v5; // sf
BOOLEAN v4; // zf
BOOLEAN v5; // sf
int ia; // [esp+Ch] [ebp-4h]
v1 = i;
@ -5444,7 +5444,7 @@ void __fastcall MI_Rhino(int i)
int v5; // eax
int v6; // eax
int v7; // ebx
bool v8; // zf
BOOLEAN v8; // zf
int x; // [esp+Ch] [ebp-1Ch]
int v10; // [esp+10h] [ebp-18h]
int y; // [esp+14h] [ebp-14h]
@ -5582,7 +5582,7 @@ void __fastcall MI_FirewallC(int i)
{
int v1; // esi
int v2; // edx
bool v3; // zf
BOOLEAN v3; // zf
int v4; // eax
int v5; // edi
int v6; // ecx
@ -5741,7 +5741,7 @@ void __fastcall MI_Wave(int i)
int v9; // ebx
int v10; // eax
int v11; // ebx
bool v12; // zf
BOOLEAN v12; // zf
int v13; // [esp+Ch] [ebp-2Ch]
int v14; // [esp+10h] [ebp-28h]
int v15; // [esp+14h] [ebp-24h]
@ -5817,7 +5817,7 @@ void __fastcall MI_Nova(int i)
int v4; // ebx
unsigned char *v5; // esi
int v6; // eax
bool v7; // zf
BOOLEAN v7; // zf
int v8; // [esp+Ch] [ebp-18h]
int sy; // [esp+10h] [ebp-14h]
int id; // [esp+14h] [ebp-10h]
@ -5955,7 +5955,7 @@ void __fastcall MI_Flamec(int i)
void __fastcall MI_Cbolt(int i)
{
int v1; // esi
bool v2; // zf
BOOLEAN v2; // zf
int v3; // eax
int v4; // edx
int v5; // eax
@ -6264,7 +6264,7 @@ void __fastcall MI_Bonespirit(int i)
void __fastcall MI_ResurrectBeam(int i)
{
int v1; // eax
bool v2; // zf
BOOLEAN v2; // zf
v1 = i;
v2 = missile[i]._mirange == 1;
@ -6413,7 +6413,7 @@ void __cdecl missiles_process_charge()
int i; // edi
int v2; // ecx
int v3; // esi
bool v4; // zf
BOOLEAN v4; // zf
CMonster *v5; // eax
char v6; // dl
AnimStruct *v7; // eax

10
Source/missiles.h
Unescape View File

@ -23,10 +23,10 @@ void __fastcall PutMissile(int i);
void __fastcall GetMissilePos(int i);
void __fastcall MoveMissilePos(int i);
BOOL __fastcall MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, int shift);
bool __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, int shift);
bool __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag);
bool __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift);
void __fastcall CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, int nodel);
BOOLEAN __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, int shift);
BOOLEAN __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag);
BOOLEAN __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift);
void __fastcall CheckMissileCol(int i, int mindam, int maxdam, BOOLEAN shift, int mx, int my, int nodel);
void __fastcall SetMissAnim(int mi, int animtype);
void __fastcall SetMissDir(int mi, int dir);
void __fastcall LoadMissileGFX(BYTE mi);
@ -50,7 +50,7 @@ void __fastcall AddLightctrl(int mi, int sx, int sy, int dx, int dy, int midir,
void __fastcall AddLightning(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);
void __fastcall AddMisexp(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);
void __fastcall AddWeapexp(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);
bool __fastcall CheckIfTrig(int x, int y);
BOOLEAN __fastcall CheckIfTrig(int x, int y);
void __fastcall AddTown(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);
void __fastcall AddFlash(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);
void __fastcall AddFlash2(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam);

62
Source/monster.cpp
Unescape View File

@ -2465,8 +2465,8 @@ void __fastcall M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam)
int v21; // eax
int v22; // edx
int v23; // eax
bool v24; // zf
bool v25; // sf
BOOLEAN v24; // zf
BOOLEAN v25; // sf
unsigned char v26; // of
int v27; // eax
int v29; // edi
@ -3228,7 +3228,7 @@ void __fastcall GroupUnity(int i)
int v2; // esi
int v3; // ebp
int v4; // edi
bool v5; // eax
BOOLEAN v5; // eax
int v6; // eax
unsigned char v8; // al
int v9; // ebp
@ -3310,7 +3310,7 @@ BOOL __fastcall M_CallWalk(int i, int md)
int v3; // edi
int v4; // ebp
//int v5; // eax
bool v7; // ebx
BOOLEAN v7; // ebx
int v9; // ebx
//int v10; // eax
int v11; // ebx
@ -3431,13 +3431,13 @@ BOOL __fastcall M_DumbWalk(int i, int md)
return ok;
}
bool __fastcall M_RoundWalk(int i, int md, int *dir)
BOOLEAN __fastcall M_RoundWalk(int i, int md, int *dir)
{
int *v3; // ebp
int v4; // ebx
int v5; // esi
//int v6; // eax
bool v7; // di
BOOLEAN v7; // di
int v8; // edi
//int v9; // eax
//int v10; // eax
@ -3623,7 +3623,7 @@ void __fastcall MAI_Snake(int i)
{
int esi1; // esi
MonsterStruct *esi3; // esi
bool v3; // zf
BOOLEAN v3; // zf
int v4; // ecx
int v5; // eax
int v6; // ST1C_4
@ -3800,7 +3800,7 @@ void __fastcall MAI_Bat(int i)
int v6; // ebx
int v7; // eax
int v10; // edx
bool v11; // eax
BOOLEAN v11; // eax
int v12; // ecx
CMonster *v14; // eax
int v15; // edi
@ -4290,7 +4290,7 @@ void __fastcall MAI_Round(int i, BOOL special)
int v15; // edi
int v16; // eax
int v17; // ecx
bool v18; // eax
BOOLEAN v18; // eax
//int v19; // eax
int v21; // eax
int v22; // eax
@ -4400,7 +4400,7 @@ void __fastcall MAI_Ranged(int i, int missile_type, unsigned char special)
int v7; // ecx
int v8; // ebx
int v9; // edi
bool v11; // zf
BOOLEAN v11; // zf
int v12; // eax
int v13; // eax
//int v14; // ST00_4
@ -4485,13 +4485,13 @@ void __fastcall MAI_Scav(int i)
signed int v7; // edi
int v8; // edx
int v9; // eax
bool v10; // eax
BOOLEAN v10; // eax
int v11; // ebx
int v12; // edi
signed int v13; // edi
int v14; // edx
int v15; // eax
bool v16; // eax
BOOLEAN v16; // eax
int v17; // eax
int v18; // eax
int arglist; // [esp+Ch] [ebp-8h]
@ -4662,9 +4662,9 @@ void __fastcall MAI_RoundRanged(int i, int missile_type, unsigned char checkdoor
int v19; // ebx
int v20; // eax
int v21; // ecx
bool v22; // eax
bool v23; // eax
bool v24; // eax
BOOLEAN v22; // eax
BOOLEAN v23; // eax
BOOLEAN v24; // eax
int v25; // eax
//int v26; // ST04_4
int v27; // eax
@ -4814,8 +4814,8 @@ void __fastcall MAI_RR2(int i, int mistype, int dam)
//int v18; // ST04_4
int v19; // ebx
int v20; // eax
bool v21; // eax
bool v22; // eax
BOOLEAN v21; // eax
BOOLEAN v22; // eax
int v23; // ecx
int v24; // eax
//int v25; // ST04_4
@ -5041,10 +5041,10 @@ void __fastcall MAI_SkelKing(int i)
int v13; // ebx
int v14; // eax
int v15; // ecx
bool v16; // eax
BOOLEAN v16; // eax
//int v17; // eax
int v19; // eax
bool v20; // eax
BOOLEAN v20; // eax
int v21; // edi
int v22; // ebx
int v23; // eax
@ -5175,7 +5175,7 @@ void __fastcall MAI_Rhino(int i)
int v15; // ecx
//int v16; // eax
int v18; // eax
bool v19; // eax
BOOLEAN v19; // eax
int v20; // ecx
int v21; // eax
//int v22; // ST1C_4
@ -5302,8 +5302,8 @@ void __fastcall MAI_Counselor(int i)
int v6; // ebp
char v9; // al
int v10; // ecx
bool v11; // zf
bool v12; // sf
BOOLEAN v11; // zf
BOOLEAN v12; // sf
unsigned char v13; // of
int v14; // edx
int v15; // ecx
@ -5809,14 +5809,14 @@ void __cdecl ProcessMonsters()
int v8; // eax
unsigned int v9; // eax
int v10; // eax
bool v11; // zf
BOOLEAN v11; // zf
char *v12; // ecx
char *v13; // eax
int v14; // ecx
int v15; // eax
char v16; // al
int v17; // ecx
bool v18; // eax
BOOLEAN v18; // eax
int v19; // eax
int v20; // ecx
int *v21; // eax
@ -6009,7 +6009,7 @@ BOOL __fastcall DirOK(int i, int mdir)
int v5; // edi
int v6; // esi
int v7; // edi
bool v8; // zf
BOOLEAN v8; // zf
int v9; // edx
unsigned char *v11; // ebx
unsigned char v12; // al
@ -6019,7 +6019,7 @@ BOOL __fastcall DirOK(int i, int mdir)
int v16; // ecx
signed int j; // esi
int v18; // eax
bool v19; // zf
BOOLEAN v19; // zf
int v20; // eax
int v21; // [esp+Ch] [ebp-14h]
int v22; // [esp+10h] [ebp-10h]
@ -6442,7 +6442,7 @@ void __fastcall M_FallenFear(int x, int y)
int v5; // esi
signed int v6; // eax
int v7; // eax
bool v8; // zf
BOOLEAN v8; // zf
int v9; // eax
int v10; // eax
signed int v11; // [esp-10h] [ebp-1Ch]
@ -6797,7 +6797,7 @@ BOOL __fastcall PosOkMonst3(int i, int x, int y)
int v7; // eax
int v8; // ecx
int v9; // ecx
bool result; // eax
BOOLEAN result; // eax
int v11; // ecx
signed int v12; // [esp+10h] [ebp-8h]
int v13; // [esp+14h] [ebp-4h]
@ -6862,7 +6862,7 @@ BOOL __fastcall IsSkel(int mt)
|| mt >= MT_WSKELSD && mt <= MT_XSKELSD;
}
bool __fastcall IsGoat(int mt)
BOOLEAN __fastcall IsGoat(int mt)
{
return mt >= MT_NGOATMC && mt <= MT_GGOATMC || mt >= MT_NGOATBW && mt <= MT_GGOATBW;
}
@ -6930,7 +6930,7 @@ void __fastcall ActivateSpawn(int i, int x, int y, int dir)
M_StartSpStand(i, dir);
}
bool __fastcall SpawnSkeleton(int ii, int x, int y)
BOOLEAN __fastcall SpawnSkeleton(int ii, int x, int y)
{
int v3; // esi
int v4; // ebx
@ -6938,7 +6938,7 @@ bool __fastcall SpawnSkeleton(int ii, int x, int y)
int v6; // ecx
int v7; // edi
int *v8; // esi
bool v9; // eax
BOOLEAN v9; // eax
int v11; // eax
int v12; // ecx
int v13; // edx

6
Source/monster.h
Unescape View File

@ -95,7 +95,7 @@ BOOL __fastcall M_CallWalk(int i, int md);
BOOL __fastcall M_PathWalk(int i);
BOOL __fastcall M_CallWalk2(int i, int md);
BOOL __fastcall M_DumbWalk(int i, int md);
bool __fastcall M_RoundWalk(int i, int md, int *dir);
BOOLEAN __fastcall M_RoundWalk(int i, int md, int *dir);
void __fastcall MAI_Zombie(int i);
void __fastcall MAI_SkelSd(int i);
BOOL __fastcall MAI_Path(int i);
@ -151,10 +151,10 @@ BOOL __fastcall PosOkMonst(int i, int x, int y);
BOOL __fastcall PosOkMonst2(int i, int x, int y);
BOOL __fastcall PosOkMonst3(int i, int x, int y);
BOOL __fastcall IsSkel(int mt);
bool __fastcall IsGoat(int mt);
BOOLEAN __fastcall IsGoat(int mt);
int __fastcall M_SpawnSkel(int x, int y, int dir);
void __fastcall ActivateSpawn(int i, int x, int y, int dir);
bool __fastcall SpawnSkeleton(int ii, int x, int y);
BOOLEAN __fastcall SpawnSkeleton(int ii, int x, int y);
int __cdecl PreSpawnSkeleton();
void __fastcall TalktoMonster(int i);
void __fastcall SpawnGolum(int i, int x, int y, int mi);

32
Source/mpqapi.cpp
Unescape View File

@ -6,9 +6,9 @@ int mpqapi_cpp_init_value; // weak
int sgdwMpqOffset; // idb
char mpq_buf[4096];
_HASHENTRY *sgpHashTbl;
bool save_archive_modified; // weak
BOOLEAN save_archive_modified; // weak
_BLOCKENTRY *sgpBlockTbl;
bool save_archive_open; // weak
BOOLEAN save_archive_open; // weak
const int mpqapi_inf = 0x7F800000; // weak
@ -27,12 +27,12 @@ struct mpqapi_cpp_init {
// 47F148: using guessed type int mpqapi_inf;
// 659B00: using guessed type int mpqapi_cpp_init_value;
bool __fastcall mpqapi_set_hidden(const char *pszArchive, bool hidden)
BOOLEAN __fastcall mpqapi_set_hidden(const char *pszArchive, BOOLEAN hidden)
{
const char *v2; // edi
BOOL v3; // esi
DWORD v4; // eax
bool result; // al
BOOLEAN result; // al
DWORD v6; // esi
v2 = pszArchive;
@ -73,7 +73,7 @@ void __fastcall mpqapi_store_creation_time(const char *pszArchive, int dwChar)
}
// 679660: using guessed type char gbMaxPlayers;
bool __fastcall mpqapi_reg_load_modification_time(char *dst, int size)
BOOLEAN __fastcall mpqapi_reg_load_modification_time(char *dst, int size)
{
unsigned int v2; // esi
char *v3; // edi
@ -119,7 +119,7 @@ void __fastcall mpqapi_update_multi_creation_time(DWORD dwChar)
{
}
bool __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen)
BOOLEAN __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen)
{
int v2; // ebx
char *v3; // ebp
@ -172,7 +172,7 @@ void __fastcall mpqapi_free_block(int block_offset, int block_size)
signed int v5; // edx
signed int v6; // ecx
int v7; // ecx
bool v8; // zf
BOOLEAN v8; // zf
_BLOCKENTRY *v9; // eax
v2 = block_size;
@ -355,7 +355,7 @@ _BLOCKENTRY *__fastcall mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk,
return v12;
}
bool __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk)
BOOLEAN __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk)
{
const char *v4; // esi
const char *v5; // eax
@ -457,7 +457,7 @@ int __fastcall mpqapi_find_free_block(int size, int *block_size)
signed int v3; // esi
int result; // eax
int v5; // esi
bool v6; // zf
BOOLEAN v6; // zf
v2 = sgpBlockTbl;
v3 = 2048;
@ -572,7 +572,7 @@ BOOL __fastcall mpqapi_open_archive(const char *pszArchive, BOOL hidden, int dwC
// 65AB14: using guessed type char save_archive_open;
// 679660: using guessed type char gbMaxPlayers;
bool __fastcall mpqapi_parse_archive_header(_FILEHEADER *pHdr, int *pdwNextFileStart) // ParseMPQHeader
BOOLEAN __fastcall mpqapi_parse_archive_header(_FILEHEADER *pHdr, int *pdwNextFileStart) // ParseMPQHeader
{
int *v2; // ebp
_FILEHEADER *v3; // esi
@ -686,9 +686,9 @@ void __fastcall mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, int d
}
// 65AB0C: using guessed type int save_archive_modified;
bool __cdecl mpqapi_write_header() // WriteMPQHeader
BOOLEAN __cdecl mpqapi_write_header() // WriteMPQHeader
{
bool result; // al
BOOLEAN result; // al
_FILEHEADER fhdr; // [esp+8h] [ebp-6Ch]
DWORD NumberOfBytesWritten; // [esp+70h] [ebp-4h]
@ -709,7 +709,7 @@ bool __cdecl mpqapi_write_header() // WriteMPQHeader
return result;
}
bool __cdecl mpqapi_write_block_table()
BOOLEAN __cdecl mpqapi_write_block_table()
{
int v1; // eax
BOOL v2; // ebx
@ -726,7 +726,7 @@ bool __cdecl mpqapi_write_block_table()
return v2 && NumberOfBytesWritten == 0x8000;
}
bool __cdecl mpqapi_write_hash_table()
BOOLEAN __cdecl mpqapi_write_hash_table()
{
int v1; // eax
BOOL v2; // ebx
@ -743,9 +743,9 @@ bool __cdecl mpqapi_write_hash_table()
return v2 && NumberOfBytesWritten == 0x8000;
}
bool __cdecl mpqapi_can_seek()
BOOLEAN __cdecl mpqapi_can_seek()
{
bool result; // al
BOOLEAN result; // al
if (SetFilePointer(sghArchive, sgdwMpqOffset, NULL, FILE_BEGIN) == -1)
result = 0;

22
Source/mpqapi.h
Unescape View File

@ -6,17 +6,17 @@ extern int mpqapi_cpp_init_value; // weak
extern int sgdwMpqOffset; // idb
extern char mpq_buf[4096];
extern _HASHENTRY *sgpHashTbl;
extern bool save_archive_modified; // weak
extern BOOLEAN save_archive_modified; // weak
extern _BLOCKENTRY *sgpBlockTbl;
extern bool save_archive_open; // weak
extern BOOLEAN save_archive_open; // weak
void __cdecl mpqapi_cpp_init();
bool __fastcall mpqapi_set_hidden(char *pszArchive, bool hidden);
BOOLEAN __fastcall mpqapi_set_hidden(char *pszArchive, BOOLEAN hidden);
void __fastcall mpqapi_store_creation_time(const char *pszArchive, int dwChar);
bool __fastcall mpqapi_reg_load_modification_time(char *dst, int size);
BOOLEAN __fastcall mpqapi_reg_load_modification_time(char *dst, int size);
void __fastcall mpqapi_xor_buf(char *pbData);
void __fastcall mpqapi_update_multi_creation_time(DWORD dwChar);
bool __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen);
BOOLEAN __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen);
_BLOCKENTRY *__fastcall j_mpqapi_remove_hash_entry(char *pszName);
void __fastcall mpqapi_remove_hash_entry(const char *pszName);
void __fastcall mpqapi_free_block(int block_offset, int block_size);
@ -26,19 +26,19 @@ int __fastcall mpqapi_get_hash_index(short index, int hash_a, int hash_b, int lo
void __fastcall mpqapi_remove_hash_entries(BOOL(__stdcall *fnGetName)(DWORD, char *));
BOOL __fastcall mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen);
_BLOCKENTRY *__fastcall mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int block_index);
bool __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk);
BOOLEAN __fastcall mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, int dwLen, _BLOCKENTRY *pBlk);
int __fastcall mpqapi_find_free_block(int size, int *block_size);
void __fastcall mpqapi_rename(char *pszOld, char *pszNew);
BOOL __fastcall mpqapi_has_file(const char *pszName);
BOOL __fastcall mpqapi_open_archive(const char *pszArchive, BOOL hidden, int dwChar);
bool __fastcall mpqapi_parse_archive_header(_FILEHEADER *pHdr, int *pdwNextFileStart);
BOOLEAN __fastcall mpqapi_parse_archive_header(_FILEHEADER *pHdr, int *pdwNextFileStart);
void __fastcall mpqapi_close_archive(const char *pszArchive, BOOL bFree, int dwChar);
void __fastcall mpqapi_store_modified_time(const char *pszArchive, int dwChar);
void __fastcall mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, int dwChar);
bool __cdecl mpqapi_write_header();
bool __cdecl mpqapi_write_block_table();
bool __cdecl mpqapi_write_hash_table();
bool __cdecl mpqapi_can_seek();
BOOLEAN __cdecl mpqapi_write_header();
BOOLEAN __cdecl mpqapi_write_block_table();
BOOLEAN __cdecl mpqapi_write_hash_table();
BOOLEAN __cdecl mpqapi_can_seek();
/* rdata */

10
Source/msg.cpp
Unescape View File

@ -437,7 +437,7 @@ void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, BYTE bLevel)
void __fastcall delta_leave_sync(BYTE bLevel)
{
unsigned char v1; // bl
bool v2; // zf
BOOLEAN v2; // zf
int v3; // eax
int i; // ebp
int v5; // ecx
@ -946,7 +946,7 @@ void __fastcall NetSendCmdQuest(BOOL bHiPri, BYTE q)
void __fastcall NetSendCmdGItem(BOOL bHiPri, BYTE bCmd, BYTE mast, BYTE pnum, int ii)
{
int v5; // eax
bool v6; // zf
BOOLEAN v6; // zf
short v7; // dx
short v8; // bx
int v9; // esi
@ -1065,7 +1065,7 @@ void __fastcall NetSendCmdPItem(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y)
{
int v4; // eax
short *v5; // edx
bool v6; // zf
BOOLEAN v6; // zf
short v7; // dx
short v8; // bx
int v9; // esi
@ -1151,7 +1151,7 @@ void __fastcall NetSendCmdDItem(BOOL bHiPri, int ii)
{
int v2; // eax
short *v3; // edx
bool v4; // zf
BOOLEAN v4; // zf
short v5; // dx
short v6; // bx
int v7; // esi
@ -1238,7 +1238,7 @@ void __fastcall RemovePlrPortal(int pnum)
int __fastcall ParseCmd(int pnum, TCmd *pCmd)
{
bool v2; // zf
BOOLEAN v2; // zf
TCmd *v3; // eax
char v4; // dl
unsigned char v5; // bl

6
Source/msgcmd.cpp
Unescape View File

@ -64,7 +64,7 @@ void __cdecl msgcmd_send_chat()
}
}
bool __fastcall msgcmd_add_server_cmd_W(char *chat_message)
BOOLEAN __fastcall msgcmd_add_server_cmd_W(char *chat_message)
{
if (*chat_message != '/')
return 0;
@ -119,11 +119,11 @@ void __fastcall msgcmd_free_event(ChatCmd *a1)
}
}
bool __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg)
BOOLEAN __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg)
{
char *v2; // eax
ServerCommand *v3; // eax
bool v4; // si
BOOLEAN v4; // si
ChatCmd *ptr; // [esp+Ch] [ebp+4h]
v2 = (char *)ptr;

4
Source/msgcmd.h
Unescape View File

@ -13,11 +13,11 @@ void __cdecl msgcmd_cleanup_chatcmd_atexit();
void __cdecl msgcmd_cleanup_chatcmd();
void __cdecl msgcmd_cmd_cleanup();
void __cdecl msgcmd_send_chat();
bool __fastcall msgcmd_add_server_cmd_W(char *chat_message);
BOOLEAN __fastcall msgcmd_add_server_cmd_W(char *chat_message);
void __fastcall msgcmd_add_server_cmd(char *command);
void __fastcall msgcmd_init_chatcmd(ChatCmd *chat_cmd);
void __fastcall msgcmd_free_event(ChatCmd *a1);
bool __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg);
BOOLEAN __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg);
ChatCmd *__fastcall msgcmd_alloc_event(ChatCmd *a1, int a2, int a3, int a4, int a5);
void __fastcall msgcmd_remove_event(ChatCmd *a1, int a2);
void __fastcall msgcmd_event_type(ChatCmd *a1, int a2, int *a3, int a4, int a5);

6
Source/multi.cpp
Unescape View File

@ -470,7 +470,7 @@ void __cdecl multi_process_network_packets()
TPktHdr *v1; // ecx
TPktHdr *v2; // edi
int v3; // eax
bool v4; // zf
BOOLEAN v4; // zf
unsigned char *v5; // esi
int v6; // ebx
int v7; // eax
@ -712,7 +712,7 @@ int __fastcall NetInit(int bSinglePlayer, int *pfExitProgram)
int v2; // ebx
int v4; // eax
//int v5; // ecx
bool v7; // zf
BOOLEAN v7; // zf
//int v9; // eax
//int v10; // eax
_SNETPROGRAMDATA ProgramData; // [esp+8h] [ebp-A8h]
@ -986,7 +986,7 @@ void __fastcall multi_player_joins(int pnum, TCmdPlrInfoHdr *cmd, int a3)
TCmdPlrInfoHdr *v4; // edi
short *v5; // esi
int v6; // esi
bool v7; // zf
BOOLEAN v7; // zf
char *v8; // eax
int v9; // ST08_4
unsigned char *v10; // edx

4
Source/nthread.cpp
Unescape View File

@ -112,7 +112,7 @@ int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta)
int __fastcall nthread_recv_turns(int *pfSendAsync)
{
bool hasCountedDown; // zf
BOOLEAN hasCountedDown; // zf
*pfSendAsync = 0;
if (--sgbPacketCountdown) {
@ -154,7 +154,7 @@ void __cdecl nthread_set_turn_upper_bit()
}
// 679754: using guessed type int turn_upper_bit;
void __fastcall nthread_start(bool set_turn_upper_bit)
void __fastcall nthread_start(BOOLEAN set_turn_upper_bit)
{
char *err; // eax
unsigned int largestMsgSize; // esi

2
Source/nthread.h
Unescape View File

@ -26,7 +26,7 @@ void __fastcall nthread_terminate_game(const char *pszFcn);
int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta);
int __fastcall nthread_recv_turns(int *pfSendAsync);
void __cdecl nthread_set_turn_upper_bit();
void __fastcall nthread_start(bool set_turn_upper_bit);
void __fastcall nthread_start(BOOLEAN set_turn_upper_bit);
unsigned int __stdcall nthread_handler(void *a1);
void __cdecl nthread_cleanup();
void __fastcall nthread_ignore_mutex(BOOL bStart);

88
Source/objects.cpp
Unescape View File

@ -423,12 +423,12 @@ void __cdecl FreeObjectGFX()
}
// 67D7C4: using guessed type int numobjfiles;
bool __fastcall RndLocOk(int xp, int yp)
BOOLEAN __fastcall RndLocOk(int xp, int yp)
{
int v2; // ecx
int v3; // eax
int v4; // eax
bool result; // eax
BOOLEAN result; // eax
v2 = xp;
v3 = v2 * 112 + yp;
@ -718,7 +718,7 @@ void __cdecl InitRndBarrels()
int v1; // esi
int v2; // edi
int v3; // eax
bool v4; // ebx
BOOLEAN v4; // ebx
int v5; // edx
int v6; // eax
int v7; // eax
@ -843,7 +843,7 @@ void __fastcall AddL3Objs(int x1, int y1, int x2, int y2)
}
}
bool __fastcall WallTrapLocOk(int xp, int yp)
BOOLEAN __fastcall WallTrapLocOk(int xp, int yp)
{
return (~dFlags[xp][yp] & DFLAG_POPULATED) >> 3;
}
@ -995,7 +995,7 @@ void __cdecl AddChestTraps()
_BYTE *v1; // ebx
int v2; // esi
int v3; // eax
bool v4; // zf
BOOLEAN v4; // zf
int v5; // eax
signed int v6; // [esp+10h] [ebp-4h]
@ -1525,8 +1525,8 @@ void __fastcall SetMapObjects(unsigned char *pMap, int startx, int starty)
void __fastcall DeleteObject(int oi, int i)
{
int v2; // eax
bool v3; // zf
bool v4; // sf
BOOLEAN v3; // zf
BOOLEAN v4; // sf
dObject[object[oi]._ox][object[oi]._oy] = 0;
v2 = nobjects - 1;
@ -1725,7 +1725,7 @@ void __fastcall AddSarc(int i)
char v2; // al
int v3; // ecx
int v4; // eax
bool v5; // sf
BOOLEAN v5; // sf
unsigned char v6; // of
v1 = i;
@ -1788,7 +1788,7 @@ void __fastcall AddBarrel(int i)
int v2; // eax
int v4; // eax
int v6; // eax
bool v7; // sf
BOOLEAN v7; // sf
unsigned char v8; // of
v1 = i;
@ -1811,7 +1811,7 @@ void __fastcall AddShrine(int i)
signed int v2; // edi
signed int v3; // eax
int *v4; // ecx
bool v5; // zf
BOOLEAN v5; // zf
int v6; // eax
int slist[26]; // [esp+8h] [ebp-68h]
@ -1984,7 +1984,7 @@ void __fastcall GetRndObjLoc(int randarea, int *xx, int *yy)
int v4; // eax
int v6; // eax
int v7; // esi
bool v8; // eax
BOOLEAN v8; // eax
int v9; // edi
int v10; // [esp+Ch] [ebp-Ch]
int v11; // [esp+10h] [ebp-8h]
@ -2370,8 +2370,8 @@ void __fastcall Obj_FlameTrap(int i)
int *v2; // esi
int v3; // eax
int v4; // ecx
bool v5; // zf
bool v6; // sf
BOOLEAN v5; // zf
BOOLEAN v6; // sf
unsigned char v7; // of
int v8; // edx
int v9; // eax
@ -2532,7 +2532,7 @@ LABEL_10:
void __fastcall Obj_BCrossDamage(int i)
{
int v1; // esi
bool v2; // zf
BOOLEAN v2; // zf
int v3; // ecx
int v4; // edx
int v6; // ecx
@ -3302,20 +3302,20 @@ void __fastcall MonstCheckDoors(int m)
int v9; // eax
int v10; // ebx
int v11; // eax
bool v12; // zf
bool v13; // sf
BOOLEAN v12; // zf
BOOLEAN v13; // sf
unsigned char v14; // of
int v15; // eax
int v16; // ebx
int v17; // eax
bool v18; // zf
bool v19; // sf
BOOLEAN v18; // zf
BOOLEAN v19; // sf
unsigned char v20; // of
int v21; // eax
int v22; // ebx
int v23; // eax
bool v24; // zf
bool v25; // sf
BOOLEAN v24; // zf
BOOLEAN v25; // sf
unsigned char v26; // of
int v27; // [esp+0h] [ebp-14h]
int v28; // [esp+4h] [ebp-10h]
@ -3508,8 +3508,8 @@ void __fastcall OperateL1Door(int pnum, int i, unsigned char sendflag)
int v5; // esi
int v6; // ST1C_4
int v7; // eax
bool v8; // zf
bool v9; // sf
BOOLEAN v8; // zf
BOOLEAN v9; // sf
unsigned char v10; // of
int v11; // [esp+Ch] [ebp-Ch]
int pnuma; // [esp+10h] [ebp-8h]
@ -3589,7 +3589,7 @@ void __fastcall OperateBook(int pnum, int i)
{
signed int v4; // ecx
int v5; // eax
bool v6; // zf
BOOLEAN v6; // zf
int j; // esi
signed int v11; // [esp+10h] [ebp-10h]
signed int v1; // [esp+14h] [ebp-Ch]
@ -3776,7 +3776,7 @@ void __fastcall OperateSChambBk(int pnum, int i)
void __fastcall OperateChest(int pnum, int i, unsigned char sendmsg)
{
int v3; // esi
bool v4; // zf
BOOLEAN v4; // zf
int v5; // edi
int v6; // eax
int v7; // eax
@ -3853,7 +3853,7 @@ void __fastcall OperateChest(int pnum, int i, unsigned char sendmsg)
void __fastcall OperateMushPatch(int pnum, int i)
{
int v2; // esi
bool v3; // zf
BOOLEAN v3; // zf
int v5; // ecx
int xx; // [esp+8h] [ebp-8h]
int yy; // [esp+Ch] [ebp-4h]
@ -3890,7 +3890,7 @@ void __fastcall OperateMushPatch(int pnum, int i)
void __fastcall OperateInnSignChest(int pnum, int i)
{
int v4; // esi
bool v5; // zf
BOOLEAN v5; // zf
int xx; // [esp+8h] [ebp-8h]
int yy; // [esp+Ch] [ebp-4h]
@ -3928,7 +3928,7 @@ void __fastcall OperateSlainHero(int pnum, int i, unsigned char sendmsg)
unsigned short v3; // di
int v4; // esi
int v5; // eax
bool v6; // zf
BOOLEAN v6; // zf
int v8; // ecx
v3 = i;
@ -4003,7 +4003,7 @@ void __fastcall OperateSarc(int pnum, int i, unsigned char sendmsg)
{
unsigned short v3; // bp
int v4; // esi
bool v5; // zf
BOOLEAN v5; // zf
int v6; // ecx
int v7; // [esp+Ch] [ebp-4h]
@ -4040,8 +4040,8 @@ void __fastcall OperateL2Door(int pnum, int i, unsigned char sendflag)
int v5; // esi
int v6; // ST1C_4
int v7; // eax
bool v8; // zf
bool v9; // sf
BOOLEAN v8; // zf
BOOLEAN v9; // sf
unsigned char v10; // of
int v11; // [esp+Ch] [ebp-Ch]
int pnuma; // [esp+10h] [ebp-8h]
@ -4081,8 +4081,8 @@ void __fastcall OperateL3Door(int pnum, int i, unsigned char sendflag)
int v5; // esi
int v6; // ST1C_4
int v7; // eax
bool v8; // zf
bool v9; // sf
BOOLEAN v8; // zf
BOOLEAN v9; // sf
unsigned char v10; // of
int v11; // [esp+Ch] [ebp-Ch]
int pnuma; // [esp+10h] [ebp-8h]
@ -4752,7 +4752,7 @@ void __fastcall OperateSkelBook(int pnum, int i, unsigned char sendmsg)
{
unsigned short v3; // di
int v4; // esi
bool v5; // zf
BOOLEAN v5; // zf
int v7; // eax
int v8; // ecx
int v9; // edx
@ -4788,7 +4788,7 @@ void __fastcall OperateBookCase(int pnum, int i, unsigned char sendmsg)
unsigned short v3; // di
int v4; // ebp
int v5; // esi
bool v6; // zf
BOOLEAN v6; // zf
//int v7; // eax
v3 = i;
@ -4826,7 +4826,7 @@ void __fastcall OperateDecap(int pnum, int i, unsigned char sendmsg)
int v4; // esi
int v5; // edi
int *v6; // eax
bool v7; // zf
BOOLEAN v7; // zf
v3 = i;
v4 = i;
@ -4850,7 +4850,7 @@ void __fastcall OperateArmorStand(int pnum, int i, unsigned char sendmsg)
unsigned short v3; // di
int v4; // esi
int *v5; // eax
bool v6; // zf
BOOLEAN v6; // zf
unsigned char v8; // al
int v9; // [esp-10h] [ebp-20h]
int v10; // [esp-8h] [ebp-18h]
@ -4896,9 +4896,9 @@ void __fastcall OperateArmorStand(int pnum, int i, unsigned char sendmsg)
int __fastcall FindValidShrine(int i)
{
bool done; // esi
BOOLEAN done; // esi
int rv; // eax
bool v3; // zf
BOOLEAN v3; // zf
do {
done = 0;
@ -4951,12 +4951,12 @@ void __fastcall OperateCauldron(int pnum, int i, int sType)
}
// 52571C: using guessed type int drawpanflag;
bool __fastcall OperateFountains(int pnum, int i)
BOOLEAN __fastcall OperateFountains(int pnum, int i)
{
unsigned short v2; // bx
int v3; // esi
int v4; // edi
bool v5; // bp
BOOLEAN v5; // bp
signed int v7; // ebx
int v8; // ebp
int v10; // eax
@ -5115,7 +5115,7 @@ void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg)
int v7; // eax
int v8; // eax
int v9; // eax
bool v10; // zf
BOOLEAN v10; // zf
int v11; // ecx
int v12; // edx
signed int v13; // [esp-4h] [ebp-14h]
@ -5212,7 +5212,7 @@ void __fastcall OperateObject(int pnum, int i, BOOL TeleFlag)
int v4; // edi
ObjectStruct *v5; // ebx
int v6; // ecx
bool sendmsg; // [esp+Ch] [ebp-4h]
BOOLEAN sendmsg; // [esp+Ch] [ebp-4h]
v3 = pnum;
v4 = i;
@ -5544,7 +5544,7 @@ void __fastcall BreakCrux(int i)
void __fastcall BreakBarrel(int pnum, int i, int dam, unsigned char forcebreak, int sendmsg)
{
int v5; // esi
bool v6; // zf
BOOLEAN v6; // zf
int v7; // eax
int v8; // edx
int v9; // eax
@ -5690,7 +5690,7 @@ void __fastcall SyncL1Doors(int i)
int v2; // eax
int v3; // esi
int v4; // edi
bool v5; // zf
BOOLEAN v5; // zf
v1 = i;
v2 = i;

6
Source/objects.h
Unescape View File

@ -16,7 +16,7 @@ extern int numobjfiles; // weak
void __cdecl InitObjectGFX();
void __cdecl FreeObjectGFX();
bool __fastcall RndLocOk(int xp, int yp);
BOOLEAN __fastcall RndLocOk(int xp, int yp);
void __fastcall InitRndLocObj(int min, int max, int objtype);
void __fastcall InitRndLocBigObj(int min, int max, int objtype);
void __fastcall InitRndLocObj5x5(int min, int max, int objtype);
@ -28,7 +28,7 @@ void __cdecl InitRndBarrels();
void __fastcall AddL1Objs(int x1, int y1, int x2, int y2);
void __fastcall AddL2Objs(int x1, int y1, int x2, int y2);
void __fastcall AddL3Objs(int x1, int y1, int x2, int y2);
bool __fastcall WallTrapLocOk(int xp, int yp);
BOOLEAN __fastcall WallTrapLocOk(int xp, int yp);
void __cdecl AddL2Torches();
BOOL __fastcall TorchLocOK(int xp, int yp);
void __cdecl AddObjTraps();
@ -123,7 +123,7 @@ void __fastcall OperateArmorStand(int pnum, int i, unsigned char sendmsg);
int __fastcall FindValidShrine(int i);
void __fastcall OperateGoatShrine(int pnum, int i, int sType);
void __fastcall OperateCauldron(int pnum, int i, int sType);
bool __fastcall OperateFountains(int pnum, int i);
BOOLEAN __fastcall OperateFountains(int pnum, int i);
void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg);
void __fastcall OperateStoryBook(int pnum, int i);
void __fastcall OperateLazStand(int pnum, int i);

2
Source/pack.cpp
Unescape View File

@ -138,7 +138,7 @@ void __fastcall VerifyGoldSeeds(PlayerStruct *pPlayer)
}
}
void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool killok)
void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOLEAN killok)
{
PlayerStruct *pPlayer; // esi
signed int v6; // eax

2
Source/pack.h
Unescape View File

@ -8,7 +8,7 @@ void __cdecl pack_cpp_init();
void __fastcall PackPlayer(PkPlayerStruct *pPack, int pnum, BOOL manashield);
void __fastcall PackItem(PkItemStruct *id, ItemStruct *is);
void __fastcall VerifyGoldSeeds(PlayerStruct *pPlayer);
void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool killok);
void __fastcall UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOLEAN killok);
void __fastcall UnPackItem(PkItemStruct *is, ItemStruct *id);
/* rdata */

6
Source/palette.cpp
Unescape View File

@ -14,7 +14,7 @@ const int palette_inf = 0x7F800000; // weak
int gamma_correction = 100; // idb
BOOL color_cycling_enabled = TRUE;
bool sgbFadedIn = 1;
BOOLEAN sgbFadedIn = 1;
struct palette_cpp_init {
palette_cpp_init()
@ -286,12 +286,12 @@ void __fastcall palette_update_quest_palette(int n)
palette_update();
}
bool __cdecl palette_get_colour_cycling()
BOOLEAN __cdecl palette_get_colour_cycling()
{
return color_cycling_enabled;
}
void __fastcall palette_set_color_cycling(bool enabled)
void __fastcall palette_set_color_cycling(BOOLEAN enabled)
{
color_cycling_enabled = enabled;
}

6
Source/palette.h
Unescape View File

@ -27,8 +27,8 @@ void __fastcall PaletteFadeIn(int fr);
void __fastcall PaletteFadeOut(int fr);
void __cdecl palette_update_caves();
void __fastcall palette_update_quest_palette(int n);
bool __cdecl palette_get_colour_cycling();
void __fastcall palette_set_color_cycling(bool enabled);
BOOLEAN __cdecl palette_get_colour_cycling();
void __fastcall palette_set_color_cycling(BOOLEAN enabled);
/* rdata */
@ -38,6 +38,6 @@ extern const int palette_inf; // weak
extern int gamma_correction; // idb
extern BOOL color_cycling_enabled;
extern bool sgbFadedIn;
extern BOOLEAN sgbFadedIn;
#endif /* __PALETTE_H__ */

2
Source/path.cpp
Unescape View File

@ -48,7 +48,7 @@ int __fastcall FindPath(BOOL(__fastcall *PosOk)(int, int, int), int PosOkArg, in
PATHNODE *current; // edx
PATHNODE **previous; // eax
int path_length; // edi
bool path_is_full; // zf
BOOLEAN path_is_full; // zf
int *step_ptr; // ecx
char step; // dl

2
Source/quests.cpp
Unescape View File

@ -240,7 +240,7 @@ LABEL_29:
// 679660: using guessed type char gbMaxPlayers;
// 69BE90: using guessed type int qline;
bool __cdecl ForceQuests()
BOOLEAN __cdecl ForceQuests()
{
QuestStruct *v0; // eax
int v1; // esi

2
Source/quests.h
Unescape View File

@ -18,7 +18,7 @@ extern int ReturnLvl; // idb
void __cdecl InitQuests();
void __cdecl CheckQuests();
bool __cdecl ForceQuests();
BOOLEAN __cdecl ForceQuests();
BOOL __fastcall QuestStatus(int i);
void __fastcall CheckQuestKill(int m, BOOL sendmsg);
void __cdecl DrawButcher();

8
Source/scrollrt.cpp
Unescape View File

@ -247,7 +247,7 @@ void __fastcall DrawClippedMissile(int x, int y, int sx, int sy, int a5, int a6,
}
}
void __fastcall DrawDeadPlayer(int x, int y, int sx, int sy, int a5, int a6, bool clipped)
void __fastcall DrawDeadPlayer(int x, int y, int sx, int sy, int a5, int a6, BOOLEAN clipped)
{
int v7; // ebx
int *v8; // esi
@ -1782,7 +1782,7 @@ void __fastcall scrollrt_draw_upper(int x, int y, int sx, int sy, int a5, int a6
int v27; // eax
int v28; // eax
int v29; // eax
bool v30; // zf
BOOLEAN v30; // zf
int v31; // ecx
int v32; // eax
unsigned char *v33; // esi
@ -2979,8 +2979,8 @@ void __fastcall DoBlitScreen(int dwX, int dwY, int dwWdt, int dwHgt)
void __cdecl DrawAndBlit()
{
bool ddsdesc; // ebp
bool ctrlPan; // esi
BOOLEAN ddsdesc; // ebp
BOOLEAN ctrlPan; // esi
int dwHgt; // edi
if (gbRunGame) {

2
Source/scrollrt.h
Unescape View File

@ -27,7 +27,7 @@ void __cdecl scrollrt_cpp_init();
void __cdecl ClearCursor();
void __fastcall DrawMissile(int x, int y, int sx, int sy, int a5, int a6, int del_flag);
void __fastcall DrawClippedMissile(int x, int y, int sx, int sy, int a5, int a6, int a7);
void __fastcall DrawDeadPlayer(int x, int y, int sx, int sy, int a5, int a6, bool clipped);
void __fastcall DrawDeadPlayer(int x, int y, int sx, int sy, int a5, int a6, BOOLEAN clipped);
void __fastcall DrawPlayer(int pnum, int x, int y, int px, int py, unsigned char *animdata, int animframe, int animwidth, int a9, int a10);
void __fastcall DrawClippedPlayer(int pnum, int x, int y, int px, int py, unsigned char *animdata, int animframe, int animwidth, int a9, int a10);
void __fastcall DrawView(int StartX, int StartY);

52
Source/stores.cpp
Unescape View File

@ -786,10 +786,10 @@ void __fastcall S_ScrollSPBuy(int idx)
// 6A8A28: using guessed type int stextsel;
// 6AA700: using guessed type int stextdown;
bool __cdecl S_StartSPBuy()
BOOLEAN __cdecl S_StartSPBuy()
{
int *v0; // eax
bool result; // al
BOOLEAN result; // al
int v2; // ST10_4
storenumh = 0;
@ -829,7 +829,7 @@ bool __cdecl S_StartSPBuy()
// 6A6BB8: using guessed type int stextscrl;
// 6A8A28: using guessed type int stextsel;
bool __fastcall SmithSellOk(int i)
BOOLEAN __fastcall SmithSellOk(int i)
{
if (plr[myplr].InvList[i]._itype != ITYPE_NONE
&& plr[myplr].InvList[i]._itype
@ -892,7 +892,7 @@ void __fastcall S_ScrollSSell(int idx)
void __cdecl S_StartSSell()
{
int i; // eax
bool sellok; // [esp+14h] [ebp-4h]
BOOLEAN sellok; // [esp+14h] [ebp-4h]
stextsize = 1;
sellok = 0;
@ -943,7 +943,7 @@ void __cdecl S_StartSSell()
// 6A09E4: using guessed type int stextsmax;
// 6A6BB8: using guessed type int stextscrl;
bool __fastcall SmithRepairOk(int i)
BOOLEAN __fastcall SmithRepairOk(int i)
{
if (plr[myplr].InvList[i]._itype != ITYPE_NONE
&& plr[myplr].InvList[i]._itype
@ -1166,9 +1166,9 @@ void __cdecl S_StartWBuy()
// 6A09E4: using guessed type int stextsmax;
// 6A6BB8: using guessed type int stextscrl;
bool __fastcall WitchSellOk(int i)
BOOLEAN __fastcall WitchSellOk(int i)
{
bool rv; // al
BOOLEAN rv; // al
ItemStruct *pI; // edx
rv = 0;
@ -1192,7 +1192,7 @@ bool __fastcall WitchSellOk(int i)
void __cdecl S_StartWSell()
{
int i; // eax
bool sellok; // [esp+18h] [ebp-8h]
BOOLEAN sellok; // [esp+18h] [ebp-8h]
stextsize = 1;
sellok = 0;
@ -1258,9 +1258,9 @@ void __cdecl S_StartWSell()
// 6A09E4: using guessed type int stextsmax;
// 6A6BB8: using guessed type int stextscrl;
bool __fastcall WitchRechargeOk(int i)
BOOLEAN __fastcall WitchRechargeOk(int i)
{
bool rv; // al
BOOLEAN rv; // al
rv = 0;
if (plr[myplr].InvList[i]._itype == ITYPE_STAFF
@ -1614,9 +1614,9 @@ void __cdecl S_StartStory()
// 6A09E0: using guessed type char stextsize;
// 6A6BB8: using guessed type int stextscrl;
bool __fastcall IdItemOk(ItemStruct *i)
BOOLEAN __fastcall IdItemOk(ItemStruct *i)
{
bool result; // al
BOOLEAN result; // al
result = 0;
if (i->_itype != -1) {
@ -1639,7 +1639,7 @@ void __fastcall AddStoreHoldId(ItemStruct itm, int i)
void __cdecl S_StartSIdentify()
{
ItemStruct itm; // [esp-170h] [ebp-18Ch]
bool idok; // [esp+10h] [ebp-Ch]
BOOLEAN idok; // [esp+10h] [ebp-Ch]
int i; // [esp+14h] [ebp-8h]
idok = 0;
@ -2428,7 +2428,7 @@ void __cdecl SmithBuyItem()
int idx; // eax
ItemStruct *v1; // edx
ItemStruct *v2; // edi
bool v3; // zf
BOOLEAN v3; // zf
TakePlrsMoney(plr[myplr].HoldItem._iIvalue);
if (plr[myplr].HoldItem._iMagical == ITEM_QUALITY_NORMAL)
@ -2507,7 +2507,7 @@ void __cdecl SmithBuyPItem()
{
int xx; // ecx
int idx; // eax
bool v2; // sf
BOOLEAN v2; // sf
int v3; // eax
int i; // edx
@ -2541,7 +2541,7 @@ void __cdecl SmithBuyPItem()
void __cdecl S_SPBuyEnter()
{
int v0; // eax
bool v1; // sf
BOOLEAN v1; // sf
int v2; // eax
int v3; // ecx
int v4; // edx
@ -2607,7 +2607,7 @@ void __cdecl S_SPBuyEnter()
// 6A8A24: using guessed type int stextvhold;
// 6A8A28: using guessed type int stextsel;
bool __fastcall StoreGoldFit(int idx)
BOOLEAN __fastcall StoreGoldFit(int idx)
{
int cost; // edi
int i; // ecx
@ -2650,7 +2650,7 @@ bool __fastcall StoreGoldFit(int idx)
void __fastcall PlaceStoreGold(int v)
{
bool done; // ecx
BOOLEAN done; // ecx
int ii; // ebp
int xx; // esi
int yy; // ST20_4
@ -2682,7 +2682,7 @@ void __cdecl StoreSellItem()
char v1; // al
int v2; // eax
int cost; // ebp
bool v4; // sf
BOOLEAN v4; // sf
unsigned char v5; // of
unsigned int v6; // eax
int v8; // edx
@ -2808,7 +2808,7 @@ void __cdecl S_SRepairEnter()
int idx; // eax
int v1; // edx
int v2; // ecx
bool v3; // sf
BOOLEAN v3; // sf
unsigned char v4; // of
char v5; // cl
@ -3006,7 +3006,7 @@ void __cdecl S_WRechargeEnter()
int idx; // eax
int v1; // edx
int v2; // ecx
bool v3; // sf
BOOLEAN v3; // sf
unsigned char v4; // of
char v5; // cl
@ -3085,16 +3085,16 @@ void __cdecl BoyBuyItem()
void __cdecl HealerBuyItem()
{
int idx; // esi
bool v1; // sf
BOOLEAN v1; // sf
unsigned char v2; // of
int v3; // eax
int v4; // ecx
bool v5; // sf
BOOLEAN v5; // sf
unsigned char v6; // of
int v7; // eax
ItemStruct *v8; // edx
ItemStruct *v9; // edi
bool v10; // zf
BOOLEAN v10; // zf
idx = stextvhold + ((stextlhold - stextup) >> 2);
if (gbMaxPlayers == 1) {
@ -3409,7 +3409,7 @@ void __cdecl S_SIDEnter()
int idx; // eax
int v1; // edx
int v2; // ecx
bool v3; // sf
BOOLEAN v3; // sf
unsigned char v4; // of
char v5; // cl
@ -3666,7 +3666,7 @@ void __cdecl STextEnter()
void __cdecl CheckStoreBtn()
{
bool v0; // sf
BOOLEAN v0; // sf
unsigned char v1; // of
int v2; // eax
int *v3; // ecx

14
Source/stores.h
Unescape View File

@ -55,19 +55,19 @@ void __fastcall S_ScrollSBuy(int idx);
void __fastcall PrintStoreItem(ItemStruct *x, int l, char iclr);
void __cdecl S_StartSBuy();
void __fastcall S_ScrollSPBuy(int idx);
bool __cdecl S_StartSPBuy();
bool __fastcall SmithSellOk(int i);
BOOLEAN __cdecl S_StartSPBuy();
BOOLEAN __fastcall SmithSellOk(int i);
void __fastcall S_ScrollSSell(int idx);
void __cdecl S_StartSSell();
bool __fastcall SmithRepairOk(int i);
BOOLEAN __fastcall SmithRepairOk(int i);
void __cdecl S_StartSRepair();
void __fastcall AddStoreHoldRepair(ItemStruct *itm, int i);
void __cdecl S_StartWitch();
void __fastcall S_ScrollWBuy(int idx);
void __cdecl S_StartWBuy();
bool __fastcall WitchSellOk(int i);
BOOLEAN __fastcall WitchSellOk(int i);
void __cdecl S_StartWSell();
bool __fastcall WitchRechargeOk(int i);
BOOLEAN __fastcall WitchRechargeOk(int i);
void __fastcall AddStoreHoldRecharge(ItemStruct itm, int i);
void __cdecl S_StartWRecharge();
void __cdecl S_StartNoMoney();
@ -79,7 +79,7 @@ void __cdecl S_StartHealer();
void __fastcall S_ScrollHBuy(int idx);
void __cdecl S_StartHBuy();
void __cdecl S_StartStory();
bool __fastcall IdItemOk(ItemStruct *i);
BOOLEAN __fastcall IdItemOk(ItemStruct *i);
void __fastcall AddStoreHoldId(ItemStruct itm, int i);
void __cdecl S_StartSIdentify();
void __cdecl S_StartIdShow();
@ -102,7 +102,7 @@ void __cdecl SmithBuyItem();
void __cdecl S_SBuyEnter();
void __cdecl SmithBuyPItem();
void __cdecl S_SPBuyEnter();
bool __fastcall StoreGoldFit(int idx);
BOOLEAN __fastcall StoreGoldFit(int idx);
void __fastcall PlaceStoreGold(int v);
void __cdecl StoreSellItem();
void __cdecl S_SSellEnter();

2
Source/sync.cpp
Unescape View File

@ -49,7 +49,7 @@ void __cdecl sync_one_monster()
int v2; // esi
short v3; // bp
short v4; // ax
bool v5; // zf
BOOLEAN v5; // zf
short *v6; // edx
short *v7; // eax

34
Source/themes.cpp
Unescape View File

@ -6,17 +6,17 @@ int numthemes; // idb
BOOL armorFlag;
int ThemeGoodIn[4];
BOOL weaponFlag;
bool treasureFlag; // weak
bool mFountainFlag; // weak
bool cauldronFlag; // weak
bool tFountainFlag; // weak
BOOLEAN treasureFlag; // weak
BOOLEAN mFountainFlag; // weak
BOOLEAN cauldronFlag; // weak
BOOLEAN tFountainFlag; // weak
int zharlib;
int themex; // idb
int themey; // idb
int themeVar1; // idb
ThemeStruct themes[MAXTHEMES];
bool pFountainFlag; // weak
bool bFountainFlag; // weak
BOOLEAN pFountainFlag; // weak
BOOLEAN bFountainFlag; // weak
BOOL bCrossFlag;
int ThemeGood[4] = { THEME_GOATSHRINE, THEME_SHRINE, THEME_SKELROOM, THEME_LIBRARY };
@ -49,7 +49,7 @@ int trm3y[9] = {
1, 1, 1
};
bool __fastcall TFit_Shrine(int i)
BOOLEAN __fastcall TFit_Shrine(int i)
{
int v1; // ecx
int v2; // esi
@ -110,7 +110,7 @@ bool __fastcall TFit_Shrine(int i)
return 1;
}
bool __fastcall TFit_Obj5(int t)
BOOLEAN __fastcall TFit_Obj5(int t)
{
int v2; // ebx
int v3; // esi
@ -177,7 +177,7 @@ bool __fastcall TFit_Obj5(int t)
}
}
bool __fastcall TFit_SkelRoom(int t)
BOOLEAN __fastcall TFit_SkelRoom(int t)
{
int i; // esi
@ -199,7 +199,7 @@ bool __fastcall TFit_SkelRoom(int t)
return TFit_Obj5(t);
}
bool __fastcall TFit_GoatShrine(int t)
BOOLEAN __fastcall TFit_GoatShrine(int t)
{
int i; // esi
@ -252,7 +252,7 @@ BOOL __fastcall CheckThemeObj3(int xp, int yp, int t, int f)
return 0;
}
bool __fastcall TFit_Obj3(int t)
BOOLEAN __fastcall TFit_Obj3(int t)
{
int yp; // edi
int xp; // esi
@ -281,14 +281,14 @@ bool __fastcall TFit_Obj3(int t)
return 0;
}
bool __fastcall CheckThemeReqs(int t)
BOOLEAN __fastcall CheckThemeReqs(int t)
{
bool rv; // al
BOOLEAN rv; // al
int v2; // ecx
int v3; // ecx
int v4; // ecx
int v5; // ecx
bool v6; // zf
BOOLEAN v6; // zf
int v7; // ecx
int v8; // ecx
int v9; // ecx
@ -358,9 +358,9 @@ bool __fastcall CheckThemeReqs(int t)
// 6AAC08: using guessed type int pFountainFlag;
// 6AAC0C: using guessed type int bFountainFlag;
bool __fastcall SpecialThemeFit(int i, int t)
BOOLEAN __fastcall SpecialThemeFit(int i, int t)
{
bool rv; // eax
BOOLEAN rv; // eax
rv = CheckThemeReqs(t);
switch (t) {
@ -447,7 +447,7 @@ bool __fastcall SpecialThemeFit(int i, int t)
// 6AAC08: using guessed type int pFountainFlag;
// 6AAC0C: using guessed type int bFountainFlag;
bool __fastcall CheckThemeRoom(int tv)
BOOLEAN __fastcall CheckThemeRoom(int tv)
{
int v1; // esi
int *v2; // edx

28
Source/themes.h
Unescape View File

@ -6,28 +6,28 @@ extern int numthemes; // idb
extern BOOL armorFlag;
extern int ThemeGoodIn[4];
extern BOOL weaponFlag;
extern bool treasureFlag; // weak
extern bool mFountainFlag; // weak
extern bool cauldronFlag; // weak
extern bool tFountainFlag; // weak
extern BOOLEAN treasureFlag; // weak
extern BOOLEAN mFountainFlag; // weak
extern BOOLEAN cauldronFlag; // weak
extern BOOLEAN tFountainFlag; // weak
extern int zharlib;
extern int themex; // idb
extern int themey; // idb
extern int themeVar1; // idb
extern ThemeStruct themes[MAXTHEMES];
extern bool pFountainFlag; // weak
extern bool bFountainFlag; // weak
extern BOOLEAN pFountainFlag; // weak
extern BOOLEAN bFountainFlag; // weak
extern BOOL bCrossFlag;
bool __fastcall TFit_Shrine(int i);
bool __fastcall TFit_Obj5(int t);
bool __fastcall TFit_SkelRoom(int t);
bool __fastcall TFit_GoatShrine(int t);
BOOLEAN __fastcall TFit_Shrine(int i);
BOOLEAN __fastcall TFit_Obj5(int t);
BOOLEAN __fastcall TFit_SkelRoom(int t);
BOOLEAN __fastcall TFit_GoatShrine(int t);
BOOL __fastcall CheckThemeObj3(int xp, int yp, int t, int f);
bool __fastcall TFit_Obj3(int t);
bool __fastcall CheckThemeReqs(int t);
bool __fastcall SpecialThemeFit(int i, int t);
bool __fastcall CheckThemeRoom(int tv);
BOOLEAN __fastcall TFit_Obj3(int t);
BOOLEAN __fastcall CheckThemeReqs(int t);
BOOLEAN __fastcall SpecialThemeFit(int i, int t);
BOOLEAN __fastcall CheckThemeRoom(int tv);
void __cdecl InitThemes();
void __cdecl HoldThemeRooms();
void __fastcall PlaceThemeMonsts(int t, int f);

6
Source/town.cpp
Unescape View File

@ -240,7 +240,7 @@ void __fastcall town_draw_lower(int x, int y, int sx, int sy, int a5, int some_f
char *v14; // edi
int v15; // eax
int v16; // eax
bool v17; // zf
BOOLEAN v17; // zf
int *v18; // ebx
unsigned char *v19; // esi
char *v20; // edi
@ -511,7 +511,7 @@ void __fastcall town_draw_lower_2(int x, int y, int sx, int sy, int a5, int a6,
int v16; // eax
int v17; // eax
int v18; // eax
bool v19; // zf
BOOLEAN v19; // zf
int *v20; // edi
short *v21; // ebx
int v22; // eax
@ -732,7 +732,7 @@ void __fastcall town_draw_upper(int x, int y, int sx, int sy, int a5, int a6, in
signed int v7; // ebx
int v8; // esi
int v9; // eax
bool v10; // zf
BOOLEAN v10; // zf
int v11; // eax
short *v12; // ebx
int v13; // eax

6
Source/towners.cpp
Unescape View File

@ -152,7 +152,7 @@ void __fastcall NewTownerAnim(int tnum, unsigned char *pAnim, int numFrames, int
towner[v4]._tAnimDelay = Delay;
}
void __fastcall InitTownerInfo(int i, int w, bool sel, int t, int x, int y, int ao, int tp)
void __fastcall InitTownerInfo(int i, int w, BOOLEAN sel, int t, int x, int y, int ao, int tp)
{
int v8; // ebx
int v9; // esi
@ -181,7 +181,7 @@ void __fastcall InitQstSnds(int i)
_BYTE *v2; // ecx
unsigned char *v3; // esi
QuestTalkData *v4; // eax
bool v5; // zf
BOOLEAN v5; // zf
v1 = i;
if (boyloadflag)
@ -752,7 +752,7 @@ void __fastcall TalkToTowner(int p, int t)
int v8; // eax
int v9; // ecx
//char v10; // cl
bool v11; // zf
BOOLEAN v11; // zf
int v12; // edi
//int v13; // eax
//int v14; // eax

2
Source/towners.h
Unescape View File

@ -14,7 +14,7 @@ extern TownerStruct towner[16];
int __fastcall GetActiveTowner(int t);
void __fastcall SetTownerGPtrs(void *pData, void **pAnim); /* unsigned char *+** */
void __fastcall NewTownerAnim(int tnum, unsigned char *pAnim, int numFrames, int Delay);
void __fastcall InitTownerInfo(int i, int w, bool sel, int t, int x, int y, int ao, int tp);
void __fastcall InitTownerInfo(int i, int w, BOOLEAN sel, int t, int x, int y, int ao, int tp);
void __fastcall InitQstSnds(int i);
void __cdecl InitSmith();
void __cdecl InitBarOwner();

Write Preview
Loading…
Cancel
Save