mirrors
/
devilution
1
0
Fork 0
Code Releases Activity

Add files via upload

pull/28/head
galaxyhaxz 2018-06-20 05:08:32 -05:00 committed by GitHub
parent 8004cfa0b3
commit 01f7667899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 44 additions and 664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/mainmenu.cpp
View File

@ -11,7 +11,6 @@ int mainmenu_inf = 0x7F800000; // weak
int menu_music_track_id = 5; // idb int menu_music_track_id = 5; // idb
//----- (00427E13) --------------------------------------------------------
struct mainmenu_cpp_init struct mainmenu_cpp_init
{ {
mainmenu_cpp_init() mainmenu_cpp_init()
@ -22,7 +21,6 @@ struct mainmenu_cpp_init
// 47F074: using guessed type int mainmenu_inf; // 47F074: using guessed type int mainmenu_inf;
// 646CE0: using guessed type int mainmenu_cpp_init_value; // 646CE0: using guessed type int mainmenu_cpp_init_value;
//----- (00427E1E) --------------------------------------------------------
void __cdecl mainmenu_refresh_music() void __cdecl mainmenu_refresh_music()
{ {
int v0; // eax int v0; // eax
@ -38,7 +36,6 @@ void __cdecl mainmenu_refresh_music()
menu_music_track_id = v0; menu_music_track_id = v0;
} }
//----- (00427E45) --------------------------------------------------------
void __stdcall mainmenu_create_hero(char *a1, char *a2) void __stdcall mainmenu_create_hero(char *a1, char *a2)
{ {
// char *v2; // [esp-14h] [ebp-14h] // char *v2; // [esp-14h] [ebp-14h]
@ -47,7 +44,6 @@ void __stdcall mainmenu_create_hero(char *a1, char *a2)
pfile_create_save_file(a1, a2); pfile_create_save_file(a1, a2);
} }
//----- (00427E62) --------------------------------------------------------
int __stdcall mainmenu_select_hero_dialog(int u1, int u2, int u3, int u4, int mode, char *cname, int clen, char *cdesc, int cdlen, int *multi) /* fix args */ int __stdcall mainmenu_select_hero_dialog(int u1, int u2, int u3, int u4, int mode, char *cname, int clen, char *cdesc, int cdlen, int *multi) /* fix args */
{ {
int v10; // eax int v10; // eax
@ -110,7 +106,6 @@ LABEL_6:
// 5256E8: using guessed type int dword_5256E8; // 5256E8: using guessed type int dword_5256E8;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (00427F76) --------------------------------------------------------
void __fastcall mainmenu_action(int option) void __fastcall mainmenu_action(int option)
{ {
int v1; // eax int v1; // eax
@ -156,7 +151,6 @@ LABEL_16:
} }
// 634980: using guessed type int window_activated; // 634980: using guessed type int window_activated;
//----- (00427FEC) --------------------------------------------------------
int __cdecl mainmenu_single_player() int __cdecl mainmenu_single_player()
{ {
gbMaxPlayers = 1; gbMaxPlayers = 1;
@ -164,7 +158,6 @@ int __cdecl mainmenu_single_player()
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (00427FFA) --------------------------------------------------------
int __fastcall mainmenu_init_menu(int a1) int __fastcall mainmenu_init_menu(int a1)
{ {
int v1; // esi int v1; // esi
@ -180,7 +173,6 @@ int __fastcall mainmenu_init_menu(int a1)
return v3; return v3;
} }
//----- (00428030) --------------------------------------------------------
int __cdecl mainmenu_multi_player() int __cdecl mainmenu_multi_player()
{ {
gbMaxPlayers = 4; gbMaxPlayers = 4;
@ -188,7 +180,6 @@ int __cdecl mainmenu_multi_player()
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0042803F) --------------------------------------------------------
void __cdecl mainmenu_play_intro() void __cdecl mainmenu_play_intro()
{ {
music_stop(); music_stop();

5
Source/mainmenu.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MAINMENU_H__
#define __MAINMENU_H__
//mainmenu
extern int mainmenu_cpp_init_value; // weak extern int mainmenu_cpp_init_value; // weak
extern char chr_name_str[16]; extern char chr_name_str[16];
@ -21,3 +22,5 @@ extern int mainmenu_inf; // weak
/* rdata */ /* rdata */
extern int menu_music_track_id; // idb extern int menu_music_track_id; // idb
#endif /* __MAINMENU_H__ */

6
Source/minitext.cpp
View File

@ -41,7 +41,6 @@ unsigned char mfontkern[56] =
int qscroll_spd_tbl[9] = { 2, 4, 6, 8, 0, -1, -2, -3, -4 }; int qscroll_spd_tbl[9] = { 2, 4, 6, 8, 0, -1, -2, -3, -4 };
//----- (00428056) --------------------------------------------------------
void __cdecl FreeQuestText() void __cdecl FreeQuestText()
{ {
void *v0; // ecx void *v0; // ecx
@ -55,7 +54,6 @@ void __cdecl FreeQuestText()
mem_free_dbg(v1); mem_free_dbg(v1);
} }
//----- (0042807A) --------------------------------------------------------
void __cdecl InitQuestText() void __cdecl InitQuestText()
{ {
unsigned char *v0; // eax unsigned char *v0; // eax
@ -67,7 +65,6 @@ void __cdecl InitQuestText()
} }
// 646D00: using guessed type char qtextflag; // 646D00: using guessed type char qtextflag;
//----- (004280A4) --------------------------------------------------------
void __fastcall InitQTextMsg(int m) void __fastcall InitQTextMsg(int m)
{ {
if ( alltext[m].scrlltxt ) if ( alltext[m].scrlltxt )
@ -89,7 +86,6 @@ void __fastcall InitQTextMsg(int m)
// 646D08: using guessed type int sgLastScroll; // 646D08: using guessed type int sgLastScroll;
// 69BD04: using guessed type int questlog; // 69BD04: using guessed type int questlog;
//----- (00428104) --------------------------------------------------------
void __cdecl DrawQTextBack() void __cdecl DrawQTextBack()
{ {
char *v0; // edi char *v0; // edi
@ -139,7 +135,6 @@ void __cdecl DrawQTextBack()
*v0 = 0; *v0 = 0;
} }
//----- (00428160) --------------------------------------------------------
void __fastcall PrintQTextChr(int screen_x, int screen_y, char *cel_buf, int frame) void __fastcall PrintQTextChr(int screen_x, int screen_y, char *cel_buf, int frame)
{ {
char *v4; // ebx char *v4; // ebx
@ -205,7 +200,6 @@ LABEL_15:
while ( (char *)v7 != v5 ); while ( (char *)v7 != v5 );
} }
//----- (00428202) --------------------------------------------------------
void __cdecl DrawQText() void __cdecl DrawQText()
{ {
char *v0; // edi char *v0; // edi

5
Source/minitext.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MINITEXT_H__
#define __MINITEXT_H__
//minitext
extern int qtexty; // weak extern int qtexty; // weak
extern char *qtextptr; extern char *qtextptr;
extern int qtextSpd; // weak extern int qtextSpd; // weak
@ -25,3 +26,5 @@ extern unsigned char mfontkern[56];
/* rdata */ /* rdata */
extern int qscroll_spd_tbl[9]; extern int qscroll_spd_tbl[9];
#endif /* __MINITEXT_H__ */

132
Source/missiles.cpp
View File

@ -464,7 +464,6 @@ MisFileData misfiledata[47] =
int XDirAdd[8] = { 1, 0, -1, -1, -1, 0, 1, 1 }; int XDirAdd[8] = { 1, 0, -1, -1, -1, 0, 1, 1 };
int YDirAdd[8] = { 1, 1, 1, 0, -1, -1, -1, 0 }; int YDirAdd[8] = { 1, 1, 1, 0, -1, -1, -1, 0 };
//----- (004283C0) --------------------------------------------------------
void __fastcall GetDamageAmt(int i, int *mind, int *maxd) void __fastcall GetDamageAmt(int i, int *mind, int *maxd)
{ {
int v3; // eax int v3; // eax
@ -779,7 +778,6 @@ LABEL_74:
} }
} }
//----- (00428921) --------------------------------------------------------
int __fastcall CheckBlock(int fx, int fy, int tx, int ty) int __fastcall CheckBlock(int fx, int fy, int tx, int ty)
{ {
int v4; // edi int v4; // edi
@ -801,7 +799,6 @@ int __fastcall CheckBlock(int fx, int fy, int tx, int ty)
return v6; return v6;
} }
//----- (0042897A) --------------------------------------------------------
int __fastcall FindClosest(int sx, int sy, int rad) int __fastcall FindClosest(int sx, int sy, int rad)
{ {
int v3; // eax int v3; // eax
@ -871,7 +868,6 @@ LABEL_13:
} }
} }
//----- (00428A99) --------------------------------------------------------
int __fastcall GetSpellLevel(int id, int sn) int __fastcall GetSpellLevel(int id, int sn)
{ {
int result; // eax int result; // eax
@ -885,7 +881,6 @@ int __fastcall GetSpellLevel(int id, int sn)
return result; return result;
} }
//----- (00428AC4) --------------------------------------------------------
int __fastcall GetDirection8(int x1, int y1, int x2, int y2) int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
{ {
int v4; // edi int v4; // edi
@ -973,7 +968,6 @@ int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
return result; return result;
} }
//----- (004290EE) --------------------------------------------------------
int __fastcall GetDirection16(int x1, int y1, int x2, int y2) int __fastcall GetDirection16(int x1, int y1, int x2, int y2)
{ {
int v4; // edi int v4; // edi
@ -1069,7 +1063,6 @@ int __fastcall GetDirection16(int x1, int y1, int x2, int y2)
return result; return result;
} }
//----- (0042977E) --------------------------------------------------------
void __fastcall DeleteMissile(int mi, int i) void __fastcall DeleteMissile(int mi, int i)
{ {
int v2; // edi int v2; // edi
@ -1097,7 +1090,6 @@ void __fastcall DeleteMissile(int mi, int i)
missileactive[v3] = missileactive[v5]; missileactive[v3] = missileactive[v5];
} }
//----- (004297EE) --------------------------------------------------------
void __fastcall GetMissileVel(int i, int sx, int sy, int dx, int dy, int v) void __fastcall GetMissileVel(int i, int sx, int sy, int dx, int dy, int v)
{ {
int v6; // eax int v6; // eax
@ -1123,7 +1115,6 @@ void __fastcall GetMissileVel(int i, int sx, int sy, int dx, int dy, int v)
} }
} }
//----- (004298AD) --------------------------------------------------------
void __fastcall PutMissile(int i) void __fastcall PutMissile(int i)
{ {
int v1; // eax int v1; // eax
@ -1152,7 +1143,6 @@ void __fastcall PutMissile(int i)
} }
// 64CCD4: using guessed type int MissilePreFlag; // 64CCD4: using guessed type int MissilePreFlag;
//----- (00429918) --------------------------------------------------------
void __fastcall GetMissilePos(int i) void __fastcall GetMissilePos(int i)
{ {
int v1; // ecx int v1; // ecx
@ -1203,7 +1193,6 @@ void __fastcall GetMissilePos(int i)
ChangeLightOff(missile[v1]._mlid, v12 - 8 * v8, v10 - 8 * v11); ChangeLightOff(missile[v1]._mlid, v12 - 8 * v8, v10 - 8 * v11);
} }
//----- (004299EA) --------------------------------------------------------
void __fastcall MoveMissilePos(int i) void __fastcall MoveMissilePos(int i)
{ {
int v1; // esi int v1; // esi
@ -1248,7 +1237,6 @@ LABEL_7:
} }
} }
//----- (00429A99) --------------------------------------------------------
bool __fastcall MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, int shift) bool __fastcall MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, int shift)
{ {
int v6; // esi int v6; // esi
@ -1344,7 +1332,6 @@ bool __fastcall MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, i
return 1; return 1;
} }
//----- (00429C3B) --------------------------------------------------------
bool __fastcall MonsterMHit(int pnum, 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)
{ {
int v7; // edi int v7; // edi
@ -1515,7 +1502,6 @@ bool __fastcall MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, i
return 1; return 1;
} }
//----- (00429F4E) --------------------------------------------------------
bool __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag) bool __fastcall PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, int shift, int earflag)
{ {
int v8; // ebx int v8; // ebx
@ -1756,7 +1742,6 @@ LABEL_78:
return 0; return 0;
} }
//----- (0042A307) --------------------------------------------------------
bool __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift) bool __fastcall Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, int shift)
{ {
int v7; // edi int v7; // edi
@ -1922,7 +1907,6 @@ LABEL_14:
return 0; return 0;
} }
//----- (0042A5DB) --------------------------------------------------------
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, bool shift, int mx, int my, int nodel)
{ {
int v7; // ebx int v7; // ebx
@ -2107,7 +2091,6 @@ LABEL_39:
} }
} }
//----- (0042A8D5) --------------------------------------------------------
void __fastcall SetMissAnim(int mi, int animtype) void __fastcall SetMissAnim(int mi, int animtype)
{ {
int v2; // ecx int v2; // ecx
@ -2142,14 +2125,12 @@ void __fastcall SetMissAnim(int mi, int animtype)
missile[v2]._miAnimFrame = 1; missile[v2]._miAnimFrame = 1;
} }
//----- (0042A959) --------------------------------------------------------
void __fastcall SetMissDir(int mi, int dir) void __fastcall SetMissDir(int mi, int dir)
{ {
missile[mi]._mimfnum = dir; missile[mi]._mimfnum = dir;
SetMissAnim(mi, _LOBYTE(missile[mi]._miAnimType)); SetMissAnim(mi, _LOBYTE(missile[mi]._miAnimType));
} }
//----- (0042A973) --------------------------------------------------------
void __fastcall LoadMissileGFX(int mi) void __fastcall LoadMissileGFX(int mi)
{ {
MisFileData *v1; // esi MisFileData *v1; // esi
@ -2211,7 +2192,6 @@ void __fastcall LoadMissileGFX(int mi)
} }
} }
//----- (0042AA5C) --------------------------------------------------------
void __cdecl InitMissileGFX() void __cdecl InitMissileGFX()
{ {
char v0; // bl char v0; // bl
@ -2232,7 +2212,6 @@ void __cdecl InitMissileGFX()
} }
} }
//----- (0042AA89) --------------------------------------------------------
void __fastcall FreeMissileGFX(int mi) void __fastcall FreeMissileGFX(int mi)
{ {
int v1; // esi int v1; // esi
@ -2273,7 +2252,6 @@ void __fastcall FreeMissileGFX(int mi)
} }
} }
//----- (0042AAF2) --------------------------------------------------------
void __cdecl FreeMissiles() void __cdecl FreeMissiles()
{ {
int v0; // edi int v0; // edi
@ -2294,7 +2272,6 @@ void __cdecl FreeMissiles()
} }
} }
//----- (0042AB20) --------------------------------------------------------
void __cdecl FreeMissiles2() void __cdecl FreeMissiles2()
{ {
int v0; // edi int v0; // edi
@ -2315,7 +2292,6 @@ void __cdecl FreeMissiles2()
} }
} }
//----- (0042AB4E) --------------------------------------------------------
void __cdecl InitMissiles() void __cdecl InitMissiles()
{ {
int v0; // eax int v0; // eax
@ -2380,7 +2356,6 @@ void __cdecl InitMissiles()
} }
// 64CCD8: using guessed type int END_unkmis_126; // 64CCD8: using guessed type int END_unkmis_126;
//----- (0042AC0C) --------------------------------------------------------
void __fastcall AddLArrow(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddLArrow(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -2430,7 +2405,6 @@ LABEL_12:
missile[v15]._mlid = AddLight(v10, sy, 5); missile[v15]._mlid = AddLight(v10, sy, 5);
} }
//----- (0042ACD9) --------------------------------------------------------
void __fastcall AddArrow(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddArrow(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ebx int v9; // ebx
@ -2479,7 +2453,6 @@ void __fastcall AddArrow(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v14]._miAnimFrame = v15 + 1; missile[v14]._miAnimFrame = v15 + 1;
} }
//----- (0042ADAA) --------------------------------------------------------
void __fastcall GetVileMissPos(int mi, int dx, int dy) void __fastcall GetVileMissPos(int mi, int dx, int dy)
{ {
signed int v3; // edi signed int v3; // edi
@ -2534,7 +2507,6 @@ void __fastcall GetVileMissPos(int mi, int dx, int dy)
missile[v6]._miy = dy; missile[v6]._miy = dy;
} }
//----- (0042AE48) --------------------------------------------------------
void __fastcall AddRndTeleport(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddRndTeleport(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // eax int v9; // eax
@ -2603,7 +2575,6 @@ LABEL_12:
// 5CCB10: using guessed type char setlvlnum; // 5CCB10: using guessed type char setlvlnum;
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
//----- (0042AF8B) --------------------------------------------------------
void __fastcall AddFirebolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam) void __fastcall AddFirebolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam)
{ {
int v9; // ebx int v9; // ebx
@ -2661,7 +2632,6 @@ LABEL_17:
missile[v15]._mlid = AddLight(v11, sy, 8); missile[v15]._mlid = AddLight(v11, sy, 8);
} }
//----- (0042B09A) --------------------------------------------------------
void __fastcall AddMagmaball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddMagmaball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -2682,7 +2652,6 @@ void __fastcall AddMagmaball(int mi, int sx, int sy, int dx, int dy, int midir,
*(int *)((char *)&missile[0]._mlid + v9) = AddLight(v10, sy, 8); *(int *)((char *)&missile[0]._mlid + v9) = AddLight(v10, sy, 8);
} }
//----- (0042B113) --------------------------------------------------------
void __fastcall miss_null_33(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_33(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -2699,7 +2668,6 @@ void __fastcall miss_null_33(int mi, int sx, int sy, int dx, int dy, int midir,
PutMissile(v10); PutMissile(v10);
} }
//----- (0042B159) --------------------------------------------------------
void __fastcall AddTeleport(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddTeleport(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -2774,7 +2742,6 @@ LABEL_13:
} }
} }
//----- (0042B284) --------------------------------------------------------
void __fastcall AddLightball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddLightball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -2806,7 +2773,6 @@ void __fastcall AddLightball(int mi, int sx, int sy, int dx, int dy, int midir,
} }
} }
//----- (0042B303) --------------------------------------------------------
void __fastcall AddFirewall(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFirewall(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ST20_4 int v9; // ST20_4
@ -2837,7 +2803,6 @@ void __fastcall AddFirewall(int mi, int sx, int sy, int dx, int dy, int midir, i
missile[v11]._miVar1 = v16; missile[v11]._miVar1 = v16;
} }
//----- (0042B3C0) --------------------------------------------------------
void __fastcall AddFireball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFireball(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -2904,7 +2869,6 @@ void __fastcall AddFireball(int mi, int sx, int sy, int dx, int dy, int midir, i
missile[v16]._mlid = AddLight(v9, sy, 8); missile[v16]._mlid = AddLight(v9, sy, 8);
} }
//----- (0042B4E7) --------------------------------------------------------
void __fastcall AddLightctrl(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddLightctrl(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -2927,7 +2891,6 @@ void __fastcall AddLightctrl(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v11]._miAnimFrame = v13 + 1; missile[v11]._miAnimFrame = v13 + 1;
} }
//----- (0042B553) --------------------------------------------------------
void __fastcall AddLightning(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddLightning(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -2965,7 +2928,6 @@ LABEL_10:
missile[v9]._mlid = AddLight(missile[v9]._mix, missile[v9]._miy, 4); missile[v9]._mlid = AddLight(missile[v9]._mix, missile[v9]._miy, 4);
} }
//----- (0042B620) --------------------------------------------------------
void __fastcall AddMisexp(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)
{ {
int v9; // edi int v9; // edi
@ -3002,7 +2964,6 @@ void __fastcall AddMisexp(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v11]._mirange = missile[v9]._miAnimLen; missile[v11]._mirange = missile[v9]._miAnimLen;
} }
//----- (0042B711) --------------------------------------------------------
void __fastcall AddWeapexp(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)
{ {
int v9; // esi int v9; // esi
@ -3024,7 +2985,6 @@ void __fastcall AddWeapexp(int mi, int sx, int sy, int dx, int dy, int midir, in
missile[v9]._mirange = missile[v9]._miAnimLen - 1; missile[v9]._mirange = missile[v9]._miAnimLen - 1;
} }
//----- (0042B77C) --------------------------------------------------------
bool __fastcall CheckIfTrig(int x, int y) bool __fastcall CheckIfTrig(int x, int y)
{ {
int v2; // edi int v2; // edi
@ -3054,7 +3014,6 @@ bool __fastcall CheckIfTrig(int x, int y)
return 1; return 1;
} }
//----- (0042B7DF) --------------------------------------------------------
void __fastcall AddTown(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddTown(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ebx int v9; // ebx
@ -3177,7 +3136,6 @@ LABEL_14:
// 5CCB10: using guessed type char setlvlnum; // 5CCB10: using guessed type char setlvlnum;
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
//----- (0042B9FC) --------------------------------------------------------
void __fastcall AddFlash(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)
{ {
int v9; // esi int v9; // esi
@ -3230,7 +3188,6 @@ LABEL_13:
missile[v9]._mirange = 19; missile[v9]._mirange = 19;
} }
//----- (0042BAC1) --------------------------------------------------------
void __fastcall AddFlash2(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)
{ {
int v9; // esi int v9; // esi
@ -3278,7 +3235,6 @@ void __fastcall AddFlash2(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v14]._mirange = 19; missile[v14]._mirange = 19;
} }
//----- (0042BB83) --------------------------------------------------------
void __fastcall AddManashield(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddManashield(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // eax int v9; // eax
@ -3295,7 +3251,6 @@ void __fastcall AddManashield(int mi, int sx, int sy, int dx, int dy, int midir,
plr[id].pManaShield = 1; plr[id].pManaShield = 1;
} }
//----- (0042BBFA) --------------------------------------------------------
void __fastcall AddFiremove(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFiremove(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -3317,7 +3272,6 @@ void __fastcall AddFiremove(int mi, int sx, int sy, int dx, int dy, int midir, i
*(int *)((char *)&missile[0]._mirange + v11) = 255; *(int *)((char *)&missile[0]._mirange + v11) = 255;
} }
//----- (0042BC76) --------------------------------------------------------
void __fastcall AddGuardian(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddGuardian(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -3445,7 +3399,6 @@ LABEL_18:
} }
} }
//----- (0042BE98) --------------------------------------------------------
void __fastcall AddChain(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddChain(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -3456,7 +3409,6 @@ void __fastcall AddChain(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v9]._mirange = 1; missile[v9]._mirange = 1;
} }
//----- (0042BECB) --------------------------------------------------------
void __fastcall miss_null_11(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_11(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3470,7 +3422,6 @@ void __fastcall miss_null_11(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v10]._mirange = 250; missile[v10]._mirange = 250;
} }
//----- (0042BEFE) --------------------------------------------------------
void __fastcall miss_null_12(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_12(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
signed int v9; // edx signed int v9; // edx
@ -3488,7 +3439,6 @@ void __fastcall miss_null_12(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v11]._mirange = 250; missile[v11]._mirange = 250;
} }
//----- (0042BF3B) --------------------------------------------------------
void __fastcall miss_null_13(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_13(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
signed int v9; // edx signed int v9; // edx
@ -3508,7 +3458,6 @@ void __fastcall miss_null_13(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v11]._mirange = v12; missile[v11]._mirange = v12;
} }
//----- (0042BF7A) --------------------------------------------------------
void __fastcall AddRhino(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddRhino(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3561,7 +3510,6 @@ void __fastcall AddRhino(int mi, int sx, int sy, int dx, int dy, int midir, int
PutMissile(i); PutMissile(i);
} }
//----- (0042C08B) --------------------------------------------------------
void __fastcall miss_null_32(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_32(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3598,7 +3546,6 @@ void __fastcall miss_null_32(int mi, int sx, int sy, int dx, int dy, int midir,
PutMissile(v10); PutMissile(v10);
} }
//----- (0042C167) --------------------------------------------------------
void __fastcall AddFlare(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFlare(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edi int v9; // edi
@ -3653,7 +3600,6 @@ void __fastcall AddFlare(int mi, int sx, int sy, int dx, int dy, int midir, int
} }
} }
//----- (0042C276) --------------------------------------------------------
void __fastcall AddAcid(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddAcid(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3676,7 +3622,6 @@ void __fastcall AddAcid(int mi, int sx, int sy, int dx, int dy, int midir, int m
PutMissile(v10); PutMissile(v10);
} }
//----- (0042C2EE) --------------------------------------------------------
void __fastcall miss_null_1D(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_1D(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -3692,7 +3637,6 @@ void __fastcall miss_null_1D(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v9]._miVar2 = 0; missile[v9]._miVar2 = 0;
} }
//----- (0042C32A) --------------------------------------------------------
void __fastcall AddAcidpud(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddAcidpud(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3712,7 +3656,6 @@ void __fastcall AddAcidpud(int mi, int sx, int sy, int dx, int dy, int midir, in
missile[v9]._mirange = v11 + 40 * ((unsigned char)monster[v10]._mint + 1); missile[v9]._mirange = v11 + 40 * ((unsigned char)monster[v10]._mint + 1);
} }
//----- (0042C38E) --------------------------------------------------------
void __fastcall AddStone(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddStone(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // eax int v9; // eax
@ -3806,7 +3749,6 @@ LABEL_19:
} }
} }
//----- (0042C518) --------------------------------------------------------
void __fastcall AddGolem(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddGolem(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // eax int v9; // eax
@ -3858,7 +3800,6 @@ LABEL_6:
} }
} }
//----- (0042C5DA) --------------------------------------------------------
void __fastcall AddEtherealize(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddEtherealize(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // edx int v9; // edx
@ -3892,13 +3833,11 @@ void __fastcall AddEtherealize(int mi, int sx, int sy, int dx, int dy, int midir
UseMana(id, 25); UseMana(id, 25);
} }
//----- (0042C664) --------------------------------------------------------
void __fastcall miss_null_1F(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_1F(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
} }
//----- (0042C677) --------------------------------------------------------
void __fastcall miss_null_23(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall miss_null_23(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3921,7 +3860,6 @@ void __fastcall miss_null_23(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v9]._mirange = v11; missile[v9]._mirange = v11;
} }
//----- (0042C6D9) --------------------------------------------------------
void __fastcall AddBoom(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddBoom(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -3940,7 +3878,6 @@ void __fastcall AddBoom(int mi, int sx, int sy, int dx, int dy, int midir, int m
missile[v9]._miVar1 = 0; missile[v9]._miVar1 = 0;
} }
//----- (0042C72C) --------------------------------------------------------
void __fastcall AddHeal(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddHeal(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -3996,7 +3933,6 @@ void __fastcall AddHeal(int mi, int sx, int sy, int dx, int dy, int midir, int m
drawhpflag = 1; drawhpflag = 1;
} }
//----- (0042C80C) --------------------------------------------------------
void __fastcall AddHealOther(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddHealOther(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4005,7 +3941,6 @@ void __fastcall AddHealOther(int mi, int sx, int sy, int dx, int dy, int midir,
SetCursor(CURSOR_HEALOTHER); SetCursor(CURSOR_HEALOTHER);
} }
//----- (0042C83F) --------------------------------------------------------
void __fastcall AddElement(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddElement(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ebx int v9; // ebx
@ -4058,7 +3993,6 @@ void __fastcall AddElement(int mi, int sx, int sy, int dx, int dy, int midir, in
missile[v14]._mlid = AddLight(x, sy, 8); missile[v14]._mlid = AddLight(x, sy, 8);
} }
//----- (0042C942) --------------------------------------------------------
void __fastcall AddIdentify(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddIdentify(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4074,7 +4008,6 @@ void __fastcall AddIdentify(int mi, int sx, int sy, int dx, int dy, int midir, i
} }
// 4B8968: using guessed type int sbookflag; // 4B8968: using guessed type int sbookflag;
//----- (0042C993) --------------------------------------------------------
void __fastcall AddFirewallC(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFirewallC(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4154,7 +4087,6 @@ LABEL_16:
} }
} }
//----- (0042CAF5) --------------------------------------------------------
void __fastcall AddInfra(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddInfra(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -4180,7 +4112,6 @@ void __fastcall AddInfra(int mi, int sx, int sy, int dx, int dy, int midir, int
UseMana(id, 9); UseMana(id, 9);
} }
//----- (0042CB5C) --------------------------------------------------------
void __fastcall AddWave(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddWave(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -4194,7 +4125,6 @@ void __fastcall AddWave(int mi, int sx, int sy, int dx, int dy, int midir, int m
missile[v9]._miAnimFrame = 4; missile[v9]._miAnimFrame = 4;
} }
//----- (0042CBA7) --------------------------------------------------------
void __fastcall AddNova(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddNova(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4266,7 +4196,6 @@ void __fastcall AddNova(int mi, int sx, int sy, int dx, int dy, int midir, int m
missile[v9]._mirange = 1; missile[v9]._mirange = 1;
} }
//----- (0042CC98) --------------------------------------------------------
void __fastcall AddRepair(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddRepair(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4282,7 +4211,6 @@ void __fastcall AddRepair(int mi, int sx, int sy, int dx, int dy, int midir, int
} }
// 4B8968: using guessed type int sbookflag; // 4B8968: using guessed type int sbookflag;
//----- (0042CCE9) --------------------------------------------------------
void __fastcall AddRecharge(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddRecharge(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4298,7 +4226,6 @@ void __fastcall AddRecharge(int mi, int sx, int sy, int dx, int dy, int midir, i
} }
// 4B8968: using guessed type int sbookflag; // 4B8968: using guessed type int sbookflag;
//----- (0042CD3A) --------------------------------------------------------
void __fastcall AddDisarm(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddDisarm(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4307,7 +4234,6 @@ void __fastcall AddDisarm(int mi, int sx, int sy, int dx, int dy, int midir, int
SetCursor(CURSOR_DISARM); SetCursor(CURSOR_DISARM);
} }
//----- (0042CD6D) --------------------------------------------------------
void __fastcall AddApoca(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddApoca(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4351,7 +4277,6 @@ void __fastcall AddApoca(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v9]._mirange = 255; missile[v9]._mirange = 255;
} }
//----- (0042CE32) --------------------------------------------------------
void __fastcall AddFlame(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFlame(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4392,7 +4317,6 @@ void __fastcall AddFlame(int mi, int sx, int sy, int dx, int dy, int midir, int
} }
} }
//----- (0042CF35) --------------------------------------------------------
void __fastcall AddFlamec(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddFlamec(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4420,7 +4344,6 @@ void __fastcall AddFlamec(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v13]._mirange = 256; missile[v13]._mirange = 256;
} }
//----- (0042CFAD) --------------------------------------------------------
void __fastcall AddCbolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam) void __fastcall AddCbolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4467,7 +4390,6 @@ void __fastcall AddCbolt(int mi, int sx, int sy, int dx, int dy, int midir, int
missile[v9]._mirange = 256; missile[v9]._mirange = 256;
} }
//----- (0042D098) --------------------------------------------------------
void __fastcall AddHbolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam) void __fastcall AddHbolt(int mi, int sx, int sy, int dx, int dy, int midir, int micaster, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4516,7 +4438,6 @@ LABEL_8:
missile[v14]._midam = random(v16, 10) + plr[id]._pLevel + 9; missile[v14]._midam = random(v16, 10) + plr[id]._pLevel + 9;
} }
//----- (0042D178) --------------------------------------------------------
void __fastcall AddResurrect(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddResurrect(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // esi int v9; // esi
@ -4528,7 +4449,6 @@ void __fastcall AddResurrect(int mi, int sx, int sy, int dx, int dy, int midir,
missile[v9]._miDelFlag = 1; missile[v9]._miDelFlag = 1;
} }
//----- (0042D1AF) --------------------------------------------------------
void __fastcall AddResurrectBeam(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddResurrectBeam(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ecx int v9; // ecx
@ -4545,7 +4465,6 @@ void __fastcall AddResurrectBeam(int mi, int sx, int sy, int dx, int dy, int mid
missile[v9]._mirange = v10; missile[v9]._mirange = v10;
} }
//----- (0042D1F3) --------------------------------------------------------
void __fastcall AddTelekinesis(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddTelekinesis(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
missile[mi]._miDelFlag = 1; missile[mi]._miDelFlag = 1;
@ -4554,7 +4473,6 @@ void __fastcall AddTelekinesis(int mi, int sx, int sy, int dx, int dy, int midir
SetCursor(CURSOR_TELEKINESIS); SetCursor(CURSOR_TELEKINESIS);
} }
//----- (0042D226) --------------------------------------------------------
void __fastcall AddBoneSpirit(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddBoneSpirit(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // ebx int v9; // ebx
@ -4598,7 +4516,6 @@ void __fastcall AddBoneSpirit(int mi, int sx, int sy, int dx, int dy, int midir,
} }
} }
//----- (0042D311) --------------------------------------------------------
void __fastcall AddRportal(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddRportal(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
int v9; // eax int v9; // eax
@ -4616,7 +4533,6 @@ void __fastcall AddRportal(int mi, int sx, int sy, int dx, int dy, int midir, in
PutMissile(mi); PutMissile(mi);
} }
//----- (0042D35B) --------------------------------------------------------
void __fastcall AddDiabApoca(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam) void __fastcall AddDiabApoca(int mi, int sx, int sy, int dx, int dy, int midir, int mienemy, int id, int dam)
{ {
signed int v9; // edi signed int v9; // edi
@ -4649,7 +4565,6 @@ void __fastcall AddDiabApoca(int mi, int sx, int sy, int dx, int dy, int midir,
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0042D3DA) --------------------------------------------------------
int __fastcall AddMissile(int sx, int sy, int v1, int v2, int midir, int mitype, int micaster, int id, int v3, int spllvl) int __fastcall AddMissile(int sx, int sy, int v1, int v2, int midir, int mitype, int micaster, int id, int v3, int spllvl)
{ {
int v10; // esi int v10; // esi
@ -4736,7 +4651,6 @@ LABEL_9:
return v13; return v13;
} }
//----- (0042D5A3) --------------------------------------------------------
int __fastcall Sentfire(int i, int sx, int sy) int __fastcall Sentfire(int i, int sx, int sy)
{ {
int v3; // esi int v3; // esi
@ -4782,7 +4696,6 @@ void __fastcall MI_Dummy(int i)
return; return;
} }
//----- (0042D680) --------------------------------------------------------
void __fastcall MI_Golem(int i) void __fastcall MI_Golem(int i)
{ {
int v1; // esi int v1; // esi
@ -4864,13 +4777,11 @@ LABEL_17:
missile[v1]._miDelFlag = 1; missile[v1]._miDelFlag = 1;
} }
//----- (0042D7C7) --------------------------------------------------------
void __fastcall MI_SetManashield(int i) void __fastcall MI_SetManashield(int i)
{ {
ManashieldFlag = 1; ManashieldFlag = 1;
} }
//----- (0042D7D2) --------------------------------------------------------
void __fastcall MI_LArrow(int i) void __fastcall MI_LArrow(int i)
{ {
int v1; // esi int v1; // esi
@ -5028,7 +4939,6 @@ void __fastcall MI_LArrow(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042DAD0) --------------------------------------------------------
void __fastcall MI_Arrow(int i) void __fastcall MI_Arrow(int i)
{ {
int v1; // esi int v1; // esi
@ -5077,7 +4987,6 @@ void __fastcall MI_Arrow(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042DBA1) --------------------------------------------------------
void __fastcall MI_Firebolt(int i) void __fastcall MI_Firebolt(int i)
{ {
int v1; // edi int v1; // edi
@ -5253,7 +5162,6 @@ LABEL_39:
PutMissile(v1); PutMissile(v1);
} }
//----- (0042DE5A) --------------------------------------------------------
void __fastcall MI_Lightball(int i) void __fastcall MI_Lightball(int i)
{ {
int v1; // esi int v1; // esi
@ -5292,7 +5200,6 @@ void __fastcall MI_Lightball(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042DF42) --------------------------------------------------------
void __fastcall mi_null_33(int i) void __fastcall mi_null_33(int i)
{ {
int v1; // edi int v1; // edi
@ -5312,7 +5219,6 @@ void __fastcall mi_null_33(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042DFAB) --------------------------------------------------------
void __fastcall MI_Acidpud(int i) void __fastcall MI_Acidpud(int i)
{ {
int v1; // ebx int v1; // ebx
@ -5344,7 +5250,6 @@ void __fastcall MI_Acidpud(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042E01E) --------------------------------------------------------
void __fastcall MI_Firewall(int i) void __fastcall MI_Firewall(int i)
{ {
int v1; // esi int v1; // esi
@ -5410,7 +5315,6 @@ void __fastcall MI_Firewall(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042E18F) --------------------------------------------------------
void __fastcall MI_Fireball(int i) void __fastcall MI_Fireball(int i)
{ {
int v1; // esi int v1; // esi
@ -5545,7 +5449,6 @@ void __fastcall MI_Fireball(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042E5A7) --------------------------------------------------------
void __fastcall MI_Lightctrl(int i) void __fastcall MI_Lightctrl(int i)
{ {
int v1; // esi int v1; // esi
@ -5641,7 +5544,6 @@ LABEL_27:
missile[v1]._miDelFlag = 1; missile[v1]._miDelFlag = 1;
} }
//----- (0042E79B) --------------------------------------------------------
void __fastcall MI_Lightning(int i) void __fastcall MI_Lightning(int i)
{ {
int v1; // edi int v1; // edi
@ -5668,7 +5570,6 @@ void __fastcall MI_Lightning(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042E820) --------------------------------------------------------
void __fastcall MI_Town(int i) void __fastcall MI_Town(int i)
{ {
int v1; // esi int v1; // esi
@ -5743,7 +5644,6 @@ void __fastcall MI_Town(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042E9CB) --------------------------------------------------------
void __fastcall MI_Flash(int i) void __fastcall MI_Flash(int i)
{ {
int v1; // edi int v1; // edi
@ -5783,7 +5683,6 @@ void __fastcall MI_Flash(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042EAF1) --------------------------------------------------------
void __fastcall MI_Flash2(int i) void __fastcall MI_Flash2(int i)
{ {
int v1; // edi int v1; // edi
@ -5820,7 +5719,6 @@ void __fastcall MI_Flash2(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042EBBF) --------------------------------------------------------
void __fastcall MI_Manashield(int i) void __fastcall MI_Manashield(int i)
{ {
int v1; // edi int v1; // edi
@ -5940,7 +5838,6 @@ LABEL_33:
PutMissile(ia); PutMissile(ia);
} }
//----- (0042EE19) --------------------------------------------------------
void __fastcall MI_Etherealize(int i) void __fastcall MI_Etherealize(int i)
{ {
int v1; // ebx int v1; // ebx
@ -5996,7 +5893,6 @@ void __fastcall MI_Etherealize(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042EEFD) --------------------------------------------------------
void __fastcall MI_Firemove(int i) void __fastcall MI_Firemove(int i)
{ {
int v1; // esi int v1; // esi
@ -6078,7 +5974,6 @@ void __fastcall MI_Firemove(int i)
PutMissile(v10); PutMissile(v10);
} }
//----- (0042F0C8) --------------------------------------------------------
void __fastcall MI_Guardian(int i) void __fastcall MI_Guardian(int i)
{ {
int v1; // esi int v1; // esi
@ -6182,7 +6077,6 @@ void __fastcall MI_Guardian(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (0042F2C2) --------------------------------------------------------
void __fastcall MI_Chain(int i) void __fastcall MI_Chain(int i)
{ {
int v1; // esi int v1; // esi
@ -6274,7 +6168,6 @@ void __fastcall MI_Chain(int i)
missile[v1]._miDelFlag = 1; missile[v1]._miDelFlag = 1;
} }
//----- (0042F475) --------------------------------------------------------
void __fastcall mi_null_11(int i) void __fastcall mi_null_11(int i)
{ {
int v1; // eax int v1; // eax
@ -6290,7 +6183,6 @@ void __fastcall mi_null_11(int i)
PutMissile(i); PutMissile(i);
} }
//----- (0042F4A9) --------------------------------------------------------
void __fastcall MI_Weapexp(int i) void __fastcall MI_Weapexp(int i)
{ {
int v1; // esi int v1; // esi
@ -6358,7 +6250,6 @@ void __fastcall MI_Weapexp(int i)
} }
} }
//----- (0042F5D6) --------------------------------------------------------
void __fastcall MI_Misexp(int i) void __fastcall MI_Misexp(int i)
{ {
int v1; // edi int v1; // edi
@ -6400,7 +6291,6 @@ void __fastcall MI_Misexp(int i)
} }
} }
//----- (0042F692) --------------------------------------------------------
void __fastcall MI_Acidsplat(int i) void __fastcall MI_Acidsplat(int i)
{ {
int v1; // eax int v1; // eax
@ -6442,7 +6332,6 @@ void __fastcall MI_Acidsplat(int i)
} }
} }
//----- (0042F723) --------------------------------------------------------
void __fastcall MI_Teleport(int i) void __fastcall MI_Teleport(int i)
{ {
int v1; // edi int v1; // edi
@ -6499,7 +6388,6 @@ void __fastcall MI_Teleport(int i)
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (0042F82C) --------------------------------------------------------
void __fastcall MI_Stone(int i) void __fastcall MI_Stone(int i)
{ {
int v1; // esi int v1; // esi
@ -6542,7 +6430,6 @@ void __fastcall MI_Stone(int i)
} }
} }
//----- (0042F8EE) --------------------------------------------------------
void __fastcall MI_Boom(int i) void __fastcall MI_Boom(int i)
{ {
int v1; // edi int v1; // edi
@ -6560,7 +6447,6 @@ void __fastcall MI_Boom(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0042F94F) --------------------------------------------------------
void __fastcall MI_Rhino(int i) void __fastcall MI_Rhino(int i)
{ {
int v1; // ebx int v1; // ebx
@ -6632,7 +6518,6 @@ LABEL_12:
PutMissile(arglist); PutMissile(arglist);
} }
//----- (0042FAD0) --------------------------------------------------------
void __fastcall mi_null_32(int i) void __fastcall mi_null_32(int i)
{ {
int v1; // edi int v1; // edi
@ -6716,7 +6601,6 @@ void __fastcall mi_null_32(int i)
PutMissile(arglist); PutMissile(arglist);
} }
//----- (0042FC74) --------------------------------------------------------
void __fastcall MI_FirewallC(int i) void __fastcall MI_FirewallC(int i)
{ {
int v1; // esi int v1; // esi
@ -6805,7 +6689,6 @@ void __fastcall MI_FirewallC(int i)
} }
} }
//----- (0042FDE3) --------------------------------------------------------
void __fastcall MI_Infra(int i) void __fastcall MI_Infra(int i)
{ {
int v1; // eax int v1; // eax
@ -6825,7 +6708,6 @@ void __fastcall MI_Infra(int i)
} }
} }
//----- (0042FE20) --------------------------------------------------------
void __fastcall MI_Apoca(int i) void __fastcall MI_Apoca(int i)
{ {
int v1; // esi int v1; // esi
@ -6890,7 +6772,6 @@ LABEL_18:
} }
} }
//----- (0042FF0B) --------------------------------------------------------
void __fastcall MI_Wave(int i) void __fastcall MI_Wave(int i)
{ {
int v1; // esi int v1; // esi
@ -6980,7 +6861,6 @@ void __fastcall MI_Wave(int i)
missile[v1]._miDelFlag = 1; missile[v1]._miDelFlag = 1;
} }
//----- (00430154) --------------------------------------------------------
void __fastcall MI_Nova(int i) void __fastcall MI_Nova(int i)
{ {
int v1; // edi int v1; // edi
@ -7036,13 +6916,11 @@ void __fastcall MI_Nova(int i)
missile[v1]._miDelFlag = 1; missile[v1]._miDelFlag = 1;
} }
//----- (004302A7) --------------------------------------------------------
void __fastcall MI_Blodboil(int i) void __fastcall MI_Blodboil(int i)
{ {
missile[i]._miDelFlag = 1; missile[i]._miDelFlag = 1;
} }
//----- (004302B8) --------------------------------------------------------
void __fastcall MI_Flame(int i) void __fastcall MI_Flame(int i)
{ {
int v1; // ebx int v1; // ebx
@ -7086,7 +6964,6 @@ void __fastcall MI_Flame(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0043037E) --------------------------------------------------------
void __fastcall MI_Flamec(int i) void __fastcall MI_Flamec(int i)
{ {
int v1; // edi int v1; // edi
@ -7139,7 +7016,6 @@ void __fastcall MI_Flamec(int i)
missile[v2]._miDelFlag = 1; missile[v2]._miDelFlag = 1;
} }
//----- (0043045C) --------------------------------------------------------
void __fastcall MI_Cbolt(int i) void __fastcall MI_Cbolt(int i)
{ {
int v1; // esi int v1; // esi
@ -7223,7 +7099,6 @@ void __fastcall MI_Cbolt(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (004305E2) --------------------------------------------------------
void __fastcall MI_Hbolt(int i) void __fastcall MI_Hbolt(int i)
{ {
int v1; // edi int v1; // edi
@ -7280,7 +7155,6 @@ void __fastcall MI_Hbolt(int i)
PutMissile(v1); PutMissile(v1);
} }
//----- (0043071F) --------------------------------------------------------
void __fastcall MI_Element(int i) void __fastcall MI_Element(int i)
{ {
int v1; // esi int v1; // esi
@ -7395,7 +7269,6 @@ void __fastcall MI_Element(int i)
PutMissile(ia); PutMissile(ia);
} }
//----- (00430A98) --------------------------------------------------------
void __fastcall MI_Bonespirit(int i) void __fastcall MI_Bonespirit(int i)
{ {
int v1; // ebx int v1; // ebx
@ -7486,7 +7359,6 @@ void __fastcall MI_Bonespirit(int i)
PutMissile(v5); PutMissile(v5);
} }
//----- (00430C8D) --------------------------------------------------------
void __fastcall MI_ResurrectBeam(int i) void __fastcall MI_ResurrectBeam(int i)
{ {
int v1; // eax int v1; // eax
@ -7500,7 +7372,6 @@ void __fastcall MI_ResurrectBeam(int i)
PutMissile(i); PutMissile(i);
} }
//----- (00430CAC) --------------------------------------------------------
void __fastcall MI_Rportal(int i) void __fastcall MI_Rportal(int i)
{ {
int v1; // esi int v1; // esi
@ -7554,7 +7425,6 @@ LABEL_13:
PutMissile(ia); PutMissile(ia);
} }
//----- (00430DDA) --------------------------------------------------------
void __cdecl ProcessMissiles() void __cdecl ProcessMissiles()
{ {
int v0; // eax int v0; // eax
@ -7656,7 +7526,6 @@ void __cdecl ProcessMissiles()
} }
// 64CCD4: using guessed type int MissilePreFlag; // 64CCD4: using guessed type int MissilePreFlag;
//----- (00430F35) --------------------------------------------------------
void __cdecl missiles_process_charge() void __cdecl missiles_process_charge()
{ {
int v0; // ebx int v0; // ebx
@ -7695,7 +7564,6 @@ void __cdecl missiles_process_charge()
} }
} }
//----- (00430FB9) --------------------------------------------------------
void __fastcall ClearMissileSpot(int mi) void __fastcall ClearMissileSpot(int mi)
{ {
dFlags[missile[mi]._mix][missile[mi]._miy] &= 0xFE; dFlags[missile[mi]._mix][missile[mi]._miy] &= 0xFE;

5
Source/missiles.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MISSILES_H__
#define __MISSILES_H__
//missile
extern int missileactive[125]; extern int missileactive[125];
extern int missileavail[125]; extern int missileavail[125];
extern MissileStruct missile[125]; extern MissileStruct missile[125];
@ -150,3 +151,5 @@ extern MissileData missiledata[68];
extern MisFileData misfiledata[47]; extern MisFileData misfiledata[47];
extern int XDirAdd[8]; extern int XDirAdd[8];
extern int YDirAdd[8]; extern int YDirAdd[8];
#endif /* __MISSILES_H__ */

146
Source/monster.cpp
View File

File diff suppressed because it is too large Load Diff

5
Source/monster.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MONSTER_H__
#define __MONSTER_H__
//monster
extern int MissileFileFlag; // weak extern int MissileFileFlag; // weak
extern int monster_cpp_init_value; // weak extern int monster_cpp_init_value; // weak
extern int monstkills[200]; extern int monstkills[200];
@ -190,3 +191,5 @@ extern int rnd60[4];
// //
extern void (__fastcall *AiProc[])(int i); extern void (__fastcall *AiProc[])(int i);
#endif /* __MONSTER_H__ */

3
Source/movie.cpp
View File

@ -8,7 +8,6 @@ int loop_movie; // weak
int movie_inf = 0x7F800000; // weak int movie_inf = 0x7F800000; // weak
//----- (0043AD38) --------------------------------------------------------
struct movie_cpp_init struct movie_cpp_init
{ {
movie_cpp_init() movie_cpp_init()
@ -19,7 +18,6 @@ struct movie_cpp_init
// 47F144: using guessed type int movie_inf; // 47F144: using guessed type int movie_inf;
// 659AF4: using guessed type int movie_cpp_init_value; // 659AF4: using guessed type int movie_cpp_init_value;
//----- (0043AD43) --------------------------------------------------------
void __fastcall play_movie(char *pszMovie, bool user_can_close) void __fastcall play_movie(char *pszMovie, bool user_can_close)
{ {
char *v2; // esi char *v2; // esi
@ -71,7 +69,6 @@ void __fastcall play_movie(char *pszMovie, bool user_can_close)
// 659AF8: using guessed type int movie_playing; // 659AF8: using guessed type int movie_playing;
// 659AFC: using guessed type int loop_movie; // 659AFC: using guessed type int loop_movie;
//----- (0043AE3E) --------------------------------------------------------
LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{ {
if ( Msg == WM_KEYFIRST || Msg == WM_CHAR ) if ( Msg == WM_KEYFIRST || Msg == WM_CHAR )

5
Source/movie.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MOVIE_H__
#define __MOVIE_H__
//movie
extern int movie_cpp_init_value; // weak extern int movie_cpp_init_value; // weak
extern char movie_playing; // weak extern char movie_playing; // weak
extern int loop_movie; // weak extern int loop_movie; // weak
@ -12,3 +13,5 @@ LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam
/* data */ /* data */
extern int movie_inf; // weak extern int movie_inf; // weak
#endif /* __MOVIE_H__ */

27
Source/mpqapi.cpp
View File

@ -16,7 +16,6 @@ int mpqapi_inf = 0x7F800000; // weak
HANDLE sghArchive = (HANDLE)0xFFFFFFFF; // idb HANDLE sghArchive = (HANDLE)0xFFFFFFFF; // idb
//----- (0043AE95) --------------------------------------------------------
struct mpqapi_cpp_init struct mpqapi_cpp_init
{ {
mpqapi_cpp_init() mpqapi_cpp_init()
@ -27,7 +26,6 @@ struct mpqapi_cpp_init
// 47F148: using guessed type int mpqapi_inf; // 47F148: using guessed type int mpqapi_inf;
// 659B00: using guessed type int mpqapi_cpp_init_value; // 659B00: using guessed type int mpqapi_cpp_init_value;
//----- (0043AEA0) --------------------------------------------------------
bool __fastcall mpqapi_set_hidden(char *pszArchive, bool hidden) bool __fastcall mpqapi_set_hidden(char *pszArchive, bool hidden)
{ {
char *v2; // edi char *v2; // edi
@ -49,7 +47,6 @@ bool __fastcall mpqapi_set_hidden(char *pszArchive, bool hidden)
return result; return result;
} }
//----- (0043AEDC) --------------------------------------------------------
void __fastcall mpqapi_store_creation_time(char *pszArchive, int dwChar) void __fastcall mpqapi_store_creation_time(char *pszArchive, int dwChar)
{ {
int v2; // esi int v2; // esi
@ -77,7 +74,6 @@ void __fastcall mpqapi_store_creation_time(char *pszArchive, int dwChar)
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043AF4F) --------------------------------------------------------
bool __fastcall mpqapi_reg_load_modification_time(char *dst, int size) bool __fastcall mpqapi_reg_load_modification_time(char *dst, int size)
{ {
unsigned int v2; // esi unsigned int v2; // esi
@ -106,7 +102,6 @@ bool __fastcall mpqapi_reg_load_modification_time(char *dst, int size)
return 1; return 1;
} }
//----- (0043AFA5) --------------------------------------------------------
void __fastcall mpqapi_xor_buf(char *pbData) void __fastcall mpqapi_xor_buf(char *pbData)
{ {
signed int v1; // eax signed int v1; // eax
@ -126,7 +121,6 @@ void __fastcall mpqapi_xor_buf(char *pbData)
while ( v3 ); while ( v3 );
} }
//----- (0043AFC4) --------------------------------------------------------
bool __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen) bool __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen)
{ {
int v2; // ebx int v2; // ebx
@ -153,7 +147,6 @@ bool __fastcall mpqapi_reg_store_modification_time(char *pbData, int dwLen)
return SRegSaveData("Diablo", "Video Player ", 0, (unsigned char *)v3, v2); return SRegSaveData("Diablo", "Video Player ", 0, (unsigned char *)v3, v2);
} }
//----- (0043B002) --------------------------------------------------------
void __fastcall mpqapi_remove_hash_entry(char *pszName) void __fastcall mpqapi_remove_hash_entry(char *pszName)
{ {
int v1; // eax int v1; // eax
@ -177,7 +170,6 @@ void __fastcall mpqapi_remove_hash_entry(char *pszName)
} }
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
//----- (0043B054) --------------------------------------------------------
void __fastcall mpqapi_alloc_block(int block_offset, int block_size) void __fastcall mpqapi_alloc_block(int block_offset, int block_size)
{ {
int v2; // esi int v2; // esi
@ -235,7 +227,6 @@ LABEL_11:
} }
} }
//----- (0043B0E4) --------------------------------------------------------
_BLOCKENTRY *__fastcall mpqapi_new_block(int *block_index) _BLOCKENTRY *__fastcall mpqapi_new_block(int *block_index)
{ {
_BLOCKENTRY *result; // eax _BLOCKENTRY *result; // eax
@ -258,7 +249,6 @@ _BLOCKENTRY *__fastcall mpqapi_new_block(int *block_index)
return result; return result;
} }
//----- (0043B123) --------------------------------------------------------
int __fastcall mpqapi_get_hash_index_of_path(char *pszName) // FetchHandle int __fastcall mpqapi_get_hash_index_of_path(char *pszName) // FetchHandle
{ {
char *v1; // esi char *v1; // esi
@ -273,7 +263,6 @@ int __fastcall mpqapi_get_hash_index_of_path(char *pszName) // FetchHandle
return mpqapi_get_hash_index(v4, v3, v2, 0); return mpqapi_get_hash_index(v4, v3, v2, 0);
} }
//----- (0043B153) --------------------------------------------------------
int __fastcall mpqapi_get_hash_index(short index, int hash_a, int hash_b, int locale) int __fastcall mpqapi_get_hash_index(short index, int hash_a, int hash_b, int locale)
{ {
int v4; // ecx int v4; // ecx
@ -303,7 +292,6 @@ int __fastcall mpqapi_get_hash_index(short index, int hash_a, int hash_b, int lo
return i; return i;
} }
//----- (0043B1BD) --------------------------------------------------------
void __fastcall mpqapi_remove_hash_entries(bool (__stdcall *fnGetName)(int, char *)) void __fastcall mpqapi_remove_hash_entries(bool (__stdcall *fnGetName)(int, char *))
{ {
bool (__stdcall *v1)(int, char *); // edi bool (__stdcall *v1)(int, char *); // edi
@ -321,7 +309,6 @@ void __fastcall mpqapi_remove_hash_entries(bool (__stdcall *fnGetName)(int, char
} }
} }
//----- (0043B1F8) --------------------------------------------------------
bool __fastcall mpqapi_write_file(char *pszName, char *pbData, int dwLen) bool __fastcall mpqapi_write_file(char *pszName, char *pbData, int dwLen)
{ {
char *v3; // edi char *v3; // edi
@ -340,7 +327,6 @@ bool __fastcall mpqapi_write_file(char *pszName, char *pbData, int dwLen)
} }
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
//----- (0043B23D) --------------------------------------------------------
_BLOCKENTRY *__fastcall mpqapi_add_file(char *pszName, _BLOCKENTRY *pBlk, int block_index) _BLOCKENTRY *__fastcall mpqapi_add_file(char *pszName, _BLOCKENTRY *pBlk, int block_index)
{ {
char *v3; // edi char *v3; // edi
@ -387,7 +373,6 @@ _BLOCKENTRY *__fastcall mpqapi_add_file(char *pszName, _BLOCKENTRY *pBlk, int bl
return v12; return v12;
} }
//----- (0043B317) --------------------------------------------------------
bool __fastcall mpqapi_write_file_contents(char *pszName, char *pbData, int dwLen, _BLOCKENTRY *pBlk) bool __fastcall mpqapi_write_file_contents(char *pszName, char *pbData, int dwLen, _BLOCKENTRY *pBlk)
{ {
char *v4; // esi char *v4; // esi
@ -491,7 +476,6 @@ LABEL_25:
return 1; return 1;
} }
//----- (0043B51C) --------------------------------------------------------
int __fastcall mpqapi_find_free_block(int size, int *block_size) int __fastcall mpqapi_find_free_block(int size, int *block_size)
{ {
_BLOCKENTRY *v2; // eax _BLOCKENTRY *v2; // eax
@ -529,7 +513,6 @@ int __fastcall mpqapi_find_free_block(int size, int *block_size)
return v5; return v5;
} }
//----- (0043B570) --------------------------------------------------------
void __fastcall mpqapi_rename(char *pszOld, char *pszNew) void __fastcall mpqapi_rename(char *pszOld, char *pszNew)
{ {
char *v2; // esi char *v2; // esi
@ -552,13 +535,11 @@ void __fastcall mpqapi_rename(char *pszOld, char *pszNew)
} }
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
//----- (0043B5AF) --------------------------------------------------------
bool __fastcall mpqapi_has_file(char *pszName) bool __fastcall mpqapi_has_file(char *pszName)
{ {
return mpqapi_get_hash_index_of_path(pszName) != -1; return mpqapi_get_hash_index_of_path(pszName) != -1;
} }
//----- (0043B5BF) --------------------------------------------------------
bool __fastcall mpqapi_open_archive(char *pszArchive, bool hidden, int dwChar) // OpenMPQ bool __fastcall mpqapi_open_archive(char *pszArchive, bool hidden, int dwChar) // OpenMPQ
{ {
char *v3; // ebp char *v3; // ebp
@ -627,7 +608,6 @@ LABEL_15:
// 65AB14: using guessed type char save_archive_open; // 65AB14: using guessed type char save_archive_open;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043B791) --------------------------------------------------------
bool __fastcall mpqapi_parse_archive_header(TMPQHeader *pHdr, int *pdwNextFileStart) // ParseMPQHeader bool __fastcall mpqapi_parse_archive_header(TMPQHeader *pHdr, int *pdwNextFileStart) // ParseMPQHeader
{ {
int *v2; // ebp int *v2; // ebp
@ -671,7 +651,6 @@ bool __fastcall mpqapi_parse_archive_header(TMPQHeader *pHdr, int *pdwNextFileSt
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
// 65AB14: using guessed type char save_archive_open; // 65AB14: using guessed type char save_archive_open;
//----- (0043B882) --------------------------------------------------------
void __fastcall mpqapi_close_archive(char *pszArchive, bool bFree, int dwChar) // CloseMPQ void __fastcall mpqapi_close_archive(char *pszArchive, bool bFree, int dwChar) // CloseMPQ
{ {
char *v3; // esi char *v3; // esi
@ -707,7 +686,6 @@ void __fastcall mpqapi_close_archive(char *pszArchive, bool bFree, int dwChar) /
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
// 65AB14: using guessed type char save_archive_open; // 65AB14: using guessed type char save_archive_open;
//----- (0043B8FD) --------------------------------------------------------
void __fastcall mpqapi_store_modified_time(char *pszArchive, int dwChar) void __fastcall mpqapi_store_modified_time(char *pszArchive, int dwChar)
{ {
int v2; // esi int v2; // esi
@ -735,7 +713,6 @@ void __fastcall mpqapi_store_modified_time(char *pszArchive, int dwChar)
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043B970) --------------------------------------------------------
void __fastcall mpqapi_flush_and_close(char *pszArchive, bool bFree, int dwChar) void __fastcall mpqapi_flush_and_close(char *pszArchive, bool bFree, int dwChar)
{ {
if ( sghArchive != (HANDLE)-1 ) if ( sghArchive != (HANDLE)-1 )
@ -756,7 +733,6 @@ void __fastcall mpqapi_flush_and_close(char *pszArchive, bool bFree, int dwChar)
} }
// 65AB0C: using guessed type int save_archive_modified; // 65AB0C: using guessed type int save_archive_modified;
//----- (0043B9CA) --------------------------------------------------------
bool __cdecl mpqapi_write_header() // WriteMPQHeader bool __cdecl mpqapi_write_header() // WriteMPQHeader
{ {
bool result; // al bool result; // al
@ -780,7 +756,6 @@ bool __cdecl mpqapi_write_header() // WriteMPQHeader
return result; return result;
} }
//----- (0043BA60) --------------------------------------------------------
bool __cdecl mpqapi_write_block_table() bool __cdecl mpqapi_write_block_table()
{ {
int v1; // eax int v1; // eax
@ -798,7 +773,6 @@ bool __cdecl mpqapi_write_block_table()
return v2 && NumberOfBytesWritten == 0x8000; return v2 && NumberOfBytesWritten == 0x8000;
} }
//----- (0043BAEB) --------------------------------------------------------
bool __cdecl mpqapi_write_hash_table() bool __cdecl mpqapi_write_hash_table()
{ {
int v1; // eax int v1; // eax
@ -816,7 +790,6 @@ bool __cdecl mpqapi_write_hash_table()
return v2 && NumberOfBytesWritten == 0x8000; return v2 && NumberOfBytesWritten == 0x8000;
} }
//----- (0043BB79) --------------------------------------------------------
bool __cdecl mpqapi_can_seek() bool __cdecl mpqapi_can_seek()
{ {
bool result; // al bool result; // al

5
Source/mpqapi.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MPQAPI_H__
#define __MPQAPI_H__
//mpqapi
extern int mpqapi_cpp_init_value; // weak extern int mpqapi_cpp_init_value; // weak
extern int sgdwMpqOffset; // idb extern int sgdwMpqOffset; // idb
extern char mpq_buf[4096]; extern char mpq_buf[4096];
@ -45,3 +46,5 @@ extern int mpqapi_inf; // weak
/* rdata */ /* rdata */
extern HANDLE sghArchive; // idb extern HANDLE sghArchive; // idb
#endif /* __MPQAPI_H__ */

131
Source/msg.cpp
View File

@ -23,7 +23,6 @@ int msg_err_timer; // weak
int msg_inf = 0x7F800000; // weak int msg_inf = 0x7F800000; // weak
//----- (0043BBA9) --------------------------------------------------------
struct msg_cpp_init struct msg_cpp_init
{ {
msg_cpp_init() msg_cpp_init()
@ -34,7 +33,6 @@ struct msg_cpp_init
// 47F14C: using guessed type int msg_inf; // 47F14C: using guessed type int msg_inf;
// 65AB1C: using guessed type int msg_cpp_init_value; // 65AB1C: using guessed type int msg_cpp_init_value;
//----- (0043BBB4) --------------------------------------------------------
void __fastcall msg_send_drop_pkt(int pnum, int reason) void __fastcall msg_send_drop_pkt(int pnum, int reason)
{ {
TFakeDropPlr cmd; // [esp+0h] [ebp-8h] TFakeDropPlr cmd; // [esp+0h] [ebp-8h]
@ -45,7 +43,6 @@ void __fastcall msg_send_drop_pkt(int pnum, int reason)
msg_send_packet(pnum, &cmd, 6); msg_send_packet(pnum, &cmd, 6);
} }
//----- (0043BBCF) --------------------------------------------------------
void __fastcall msg_send_packet(int pnum, void *packet, int dwSize) void __fastcall msg_send_packet(int pnum, void *packet, int dwSize)
{ {
void *v3; // edi void *v3; // edi
@ -71,7 +68,6 @@ void __fastcall msg_send_packet(int pnum, void *packet, int dwSize)
} }
// 65AB24: using guessed type int sgnCurrMegaPlayer; // 65AB24: using guessed type int sgnCurrMegaPlayer;
//----- (0043BC31) --------------------------------------------------------
TMegaPkt *__cdecl msg_get_next_packet() TMegaPkt *__cdecl msg_get_next_packet()
{ {
TMegaPkt *v0; // eax TMegaPkt *v0; // eax
@ -93,7 +89,6 @@ TMegaPkt *__cdecl msg_get_next_packet()
return result; return result;
} }
//----- (0043BC6D) --------------------------------------------------------
int __cdecl msg_wait_resync() int __cdecl msg_wait_resync()
{ {
int v0; // eax int v0; // eax
@ -128,7 +123,6 @@ LABEL_6:
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
// 67862D: using guessed type char gbGameDestroyed; // 67862D: using guessed type char gbGameDestroyed;
//----- (0043BCED) --------------------------------------------------------
void __cdecl msg_free_packets() void __cdecl msg_free_packets()
{ {
TMegaPkt *v0; // eax TMegaPkt *v0; // eax
@ -146,7 +140,6 @@ void __cdecl msg_free_packets()
} }
} }
//----- (0043BD19) --------------------------------------------------------
int __cdecl msg_wait_for_turns() int __cdecl msg_wait_for_turns()
{ {
//int v0; // eax //int v0; // eax
@ -191,7 +184,6 @@ int __cdecl msg_wait_for_turns()
// 6796E4: using guessed type char gbDeltaSender; // 6796E4: using guessed type char gbDeltaSender;
// 679738: using guessed type int gdwTurnsInTransit; // 679738: using guessed type int gdwTurnsInTransit;
//----- (0043BDEB) --------------------------------------------------------
void __cdecl msg_process_net_packets() void __cdecl msg_process_net_packets()
{ {
if ( gbMaxPlayers != 1 ) if ( gbMaxPlayers != 1 )
@ -205,7 +197,6 @@ void __cdecl msg_process_net_packets()
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043BE0D) --------------------------------------------------------
void __cdecl msg_pre_packet() void __cdecl msg_pre_packet()
{ {
TMegaPkt *v0; // edi TMegaPkt *v0; // edi
@ -247,7 +238,6 @@ void __cdecl msg_pre_packet()
} }
} }
//----- (0043BE74) --------------------------------------------------------
void __fastcall DeltaExportData(int pnum) void __fastcall DeltaExportData(int pnum)
{ {
char *v1; // edi char *v1; // edi
@ -290,7 +280,6 @@ void __fastcall DeltaExportData(int pnum)
} }
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
//----- (0043BF2B) --------------------------------------------------------
void *__fastcall DeltaExportItem(void *dst, void *src) void *__fastcall DeltaExportItem(void *dst, void *src)
{ {
_BYTE *v2; // edi _BYTE *v2; // edi
@ -318,7 +307,6 @@ void *__fastcall DeltaExportItem(void *dst, void *src)
return v3; return v3;
} }
//----- (0043BF5B) --------------------------------------------------------
void *__fastcall DeltaExportObject(void *dst, void *src) void *__fastcall DeltaExportObject(void *dst, void *src)
{ {
char *v2; // esi char *v2; // esi
@ -328,7 +316,6 @@ void *__fastcall DeltaExportObject(void *dst, void *src)
return v2 + 127; return v2 + 127;
} }
//----- (0043BF6F) --------------------------------------------------------
void *__fastcall DeltaExportMonster(void *dst, void *src) void *__fastcall DeltaExportMonster(void *dst, void *src)
{ {
_BYTE *v2; // edi _BYTE *v2; // edi
@ -356,7 +343,6 @@ void *__fastcall DeltaExportMonster(void *dst, void *src)
return v3; return v3;
} }
//----- (0043BFA1) --------------------------------------------------------
char *__fastcall DeltaExportJunk(char *a1) char *__fastcall DeltaExportJunk(char *a1)
{ {
char *v1; // ebx char *v1; // ebx
@ -402,7 +388,6 @@ char *__fastcall DeltaExportJunk(char *a1)
return v1; return v1;
} }
//----- (0043C019) --------------------------------------------------------
int __fastcall msg_comp_level(char *buffer, int size) int __fastcall msg_comp_level(char *buffer, int size)
{ {
char *v2; // esi char *v2; // esi
@ -416,7 +401,6 @@ int __fastcall msg_comp_level(char *buffer, int size)
return v4 + 1; return v4 + 1;
} }
//----- (0043C035) --------------------------------------------------------
void __cdecl delta_init() void __cdecl delta_init()
{ {
sgbDeltaChanged = 0; sgbDeltaChanged = 0;
@ -428,7 +412,6 @@ void __cdecl delta_init()
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (0043C07C) --------------------------------------------------------
void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, unsigned char bLevel) void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, unsigned char bLevel)
{ {
DMonsterStr *v4; // eax DMonsterStr *v4; // eax
@ -448,7 +431,6 @@ void __fastcall delta_kill_monster(int mi, unsigned char x, unsigned char y, uns
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C0C2) --------------------------------------------------------
void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel) void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel)
{ {
DMonsterStr *v3; // eax DMonsterStr *v3; // eax
@ -464,7 +446,6 @@ void __fastcall delta_monster_hp(int mi, int hp, unsigned char bLevel)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C0F2) --------------------------------------------------------
void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level) void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level)
{ {
DMonsterStr *v2; // eax DMonsterStr *v2; // eax
@ -487,7 +468,6 @@ void __fastcall delta_sync_monster(TCmdLocParam1 *packet, char level)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C134) --------------------------------------------------------
void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel) void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel)
{ {
DMonsterStr *v3; // eax DMonsterStr *v3; // eax
@ -509,7 +489,6 @@ void __fastcall delta_sync_golem(TCmdGolem *pG, int pnum, int bLevel)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C17D) --------------------------------------------------------
void __fastcall delta_leave_sync(unsigned char bLevel) void __fastcall delta_leave_sync(unsigned char bLevel)
{ {
unsigned char v1; // bl unsigned char v1; // bl
@ -556,19 +535,16 @@ void __fastcall delta_leave_sync(unsigned char bLevel)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C24F) --------------------------------------------------------
bool __fastcall delta_portal_inited(int portal_num) bool __fastcall delta_portal_inited(int portal_num)
{ {
return sgJunk[0].portal[portal_num].x == -1; return sgJunk[0].portal[portal_num].x == -1;
} }
//----- (0043C25D) --------------------------------------------------------
bool __fastcall delta_quest_inited(int quest_num) bool __fastcall delta_quest_inited(int quest_num)
{ {
return sgJunk[0].quests[quest_num].qstate != -1; return sgJunk[0].quests[quest_num].qstate != -1;
} }
//----- (0043C26B) --------------------------------------------------------
void __fastcall DeltaAddItem(int ii) void __fastcall DeltaAddItem(int ii)
{ {
int v1; // eax int v1; // eax
@ -641,7 +617,6 @@ void __fastcall DeltaAddItem(int ii)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C372) --------------------------------------------------------
void __cdecl DeltaSaveLevel() void __cdecl DeltaSaveLevel()
{ {
int v0; // eax int v0; // eax
@ -669,7 +644,6 @@ void __cdecl DeltaSaveLevel()
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C3BA) --------------------------------------------------------
void __cdecl DeltaLoadLevel() void __cdecl DeltaLoadLevel()
{ {
int v0; // ebx int v0; // ebx
@ -933,7 +907,6 @@ void __cdecl DeltaLoadLevel()
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043C873) --------------------------------------------------------
void __fastcall NetSendCmd(unsigned char bHiPri, unsigned char bCmd) void __fastcall NetSendCmd(unsigned char bHiPri, unsigned char bCmd)
{ {
TCmd cmd; // [esp+3h] [ebp-1h] TCmd cmd; // [esp+3h] [ebp-1h]
@ -945,7 +918,6 @@ void __fastcall NetSendCmd(unsigned char bHiPri, unsigned char bCmd)
NetSendLoPri((unsigned char *)&cmd, 1u); NetSendLoPri((unsigned char *)&cmd, 1u);
} }
//----- (0043C891) --------------------------------------------------------
void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned char dir, unsigned char menemy, int hp, int cl) void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned char dir, unsigned char menemy, int hp, int cl)
{ {
TCmdGolem cmd; // [esp+0h] [ebp-Ch] TCmdGolem cmd; // [esp+0h] [ebp-Ch]
@ -960,7 +932,6 @@ void __fastcall NetSendCmdGolem(unsigned char mx, unsigned char my, unsigned cha
NetSendLoPri((unsigned char *)&cmd, 0xAu); NetSendLoPri((unsigned char *)&cmd, 0xAu);
} }
//----- (0043C8C7) --------------------------------------------------------
void __fastcall NetSendCmdLoc(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y) void __fastcall NetSendCmdLoc(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y)
{ {
TCmdLoc cmd; // [esp+1h] [ebp-3h] TCmdLoc cmd; // [esp+1h] [ebp-3h]
@ -974,7 +945,6 @@ void __fastcall NetSendCmdLoc(unsigned char bHiPri, unsigned char bCmd, unsigned
NetSendLoPri((unsigned char *)&cmd, 3u); NetSendLoPri((unsigned char *)&cmd, 3u);
} }
//----- (0043C8F3) --------------------------------------------------------
void __fastcall NetSendCmdLocParam1(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1) void __fastcall NetSendCmdLocParam1(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1)
{ {
TCmdLocParam1 cmd; // [esp+0h] [ebp-8h] TCmdLocParam1 cmd; // [esp+0h] [ebp-8h]
@ -989,7 +959,6 @@ void __fastcall NetSendCmdLocParam1(unsigned char bHiPri, unsigned char bCmd, un
NetSendLoPri((unsigned char *)&cmd, 5u); NetSendLoPri((unsigned char *)&cmd, 5u);
} }
//----- (0043C928) --------------------------------------------------------
void __fastcall NetSendCmdLocParam2(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2) void __fastcall NetSendCmdLocParam2(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2)
{ {
TCmdLocParam2 cmd; // [esp+0h] [ebp-8h] TCmdLocParam2 cmd; // [esp+0h] [ebp-8h]
@ -1005,7 +974,6 @@ void __fastcall NetSendCmdLocParam2(unsigned char bHiPri, unsigned char bCmd, un
NetSendLoPri((unsigned char *)&cmd, 7u); NetSendLoPri((unsigned char *)&cmd, 7u);
} }
//----- (0043C965) --------------------------------------------------------
void __fastcall NetSendCmdLocParam3(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2, int wParam3) void __fastcall NetSendCmdLocParam3(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y, int wParam1, int wParam2, int wParam3)
{ {
TCmdLocParam3 cmd; // [esp+0h] [ebp-Ch] TCmdLocParam3 cmd; // [esp+0h] [ebp-Ch]
@ -1022,7 +990,6 @@ void __fastcall NetSendCmdLocParam3(unsigned char bHiPri, unsigned char bCmd, un
NetSendLoPri((unsigned char *)&cmd, 9u); NetSendLoPri((unsigned char *)&cmd, 9u);
} }
//----- (0043C9AB) --------------------------------------------------------
void __fastcall NetSendCmdParam1(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1) void __fastcall NetSendCmdParam1(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1)
{ {
TCmdParam1 cmd; // [esp+1h] [ebp-3h] TCmdParam1 cmd; // [esp+1h] [ebp-3h]
@ -1035,7 +1002,6 @@ void __fastcall NetSendCmdParam1(unsigned char bHiPri, unsigned char bCmd, unsig
NetSendLoPri((unsigned char *)&cmd, 3u); NetSendLoPri((unsigned char *)&cmd, 3u);
} }
//----- (0043C9D3) --------------------------------------------------------
void __fastcall NetSendCmdParam2(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2) void __fastcall NetSendCmdParam2(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2)
{ {
TCmdParam2 cmd; // [esp+0h] [ebp-8h] TCmdParam2 cmd; // [esp+0h] [ebp-8h]
@ -1049,7 +1015,6 @@ void __fastcall NetSendCmdParam2(unsigned char bHiPri, unsigned char bCmd, unsig
NetSendLoPri((unsigned char *)&cmd, 5u); NetSendLoPri((unsigned char *)&cmd, 5u);
} }
//----- (0043CA04) --------------------------------------------------------
void __fastcall NetSendCmdParam3(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2, int wParam3) void __fastcall NetSendCmdParam3(unsigned char bHiPri, unsigned char bCmd, unsigned short wParam1, unsigned short wParam2, int wParam3)
{ {
TCmdParam3 cmd; // [esp+0h] [ebp-8h] TCmdParam3 cmd; // [esp+0h] [ebp-8h]
@ -1064,7 +1029,6 @@ void __fastcall NetSendCmdParam3(unsigned char bHiPri, unsigned char bCmd, unsig
NetSendLoPri((unsigned char *)&cmd, 7u); NetSendLoPri((unsigned char *)&cmd, 7u);
} }
//----- (0043CA3D) --------------------------------------------------------
void __fastcall NetSendCmdQuest(unsigned char bHiPri, unsigned char q) void __fastcall NetSendCmdQuest(unsigned char bHiPri, unsigned char q)
{ {
int v2; // eax int v2; // eax
@ -1085,7 +1049,6 @@ void __fastcall NetSendCmdQuest(unsigned char bHiPri, unsigned char q)
NetSendLoPri((unsigned char *)&cmd, 5u); NetSendLoPri((unsigned char *)&cmd, 5u);
} }
//----- (0043CA84) --------------------------------------------------------
void __fastcall NetSendCmdGItem(unsigned char bHiPri, unsigned char bCmd, unsigned char mast, unsigned char pnum, int ii) void __fastcall NetSendCmdGItem(unsigned char bHiPri, unsigned char bCmd, unsigned char mast, unsigned char pnum, int ii)
{ {
int v5; // eax int v5; // eax
@ -1146,7 +1109,6 @@ void __fastcall NetSendCmdGItem(unsigned char bHiPri, unsigned char bCmd, unsign
NetSendLoPri((unsigned char *)&cmd, 0x1Eu); NetSendLoPri((unsigned char *)&cmd, 0x1Eu);
} }
//----- (0043CC09) --------------------------------------------------------
void __fastcall NetSendCmdGItem2(unsigned char usonly, unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p) void __fastcall NetSendCmdGItem2(unsigned char usonly, unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p)
{ {
unsigned char v5; // bl unsigned char v5; // bl
@ -1179,7 +1141,6 @@ void __fastcall NetSendCmdGItem2(unsigned char usonly, unsigned char bCmd, unsig
multi_msg_add(&cmd.bCmd, 0x1Eu); multi_msg_add(&cmd.bCmd, 0x1Eu);
} }
//----- (0043CC74) --------------------------------------------------------
bool __fastcall NetSendCmdReq2(unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p) bool __fastcall NetSendCmdReq2(unsigned char bCmd, unsigned char mast, unsigned char pnum, struct TCmdGItem *p)
{ {
unsigned char v4; // bl unsigned char v4; // bl
@ -1206,7 +1167,6 @@ LABEL_3:
return 0; return 0;
} }
//----- (0043CCCF) --------------------------------------------------------
void __fastcall NetSendCmdExtra(struct TCmdGItem *p) void __fastcall NetSendCmdExtra(struct TCmdGItem *p)
{ {
TCmdGItem cmd; // [esp+0h] [ebp-20h] TCmdGItem cmd; // [esp+0h] [ebp-20h]
@ -1217,7 +1177,6 @@ void __fastcall NetSendCmdExtra(struct TCmdGItem *p)
NetSendHiPri((unsigned char *)&cmd, 0x1Eu); NetSendHiPri((unsigned char *)&cmd, 0x1Eu);
} }
//----- (0043CCF8) --------------------------------------------------------
void __fastcall NetSendCmdPItem(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y) void __fastcall NetSendCmdPItem(unsigned char bHiPri, unsigned char bCmd, unsigned char x, unsigned char y)
{ {
int v4; // eax int v4; // eax
@ -1275,7 +1234,6 @@ void __fastcall NetSendCmdPItem(unsigned char bHiPri, unsigned char bCmd, unsign
NetSendLoPri((unsigned char *)&cmd, 0x16u); NetSendLoPri((unsigned char *)&cmd, 0x16u);
} }
//----- (0043CE5B) --------------------------------------------------------
void __fastcall NetSendCmdChItem(unsigned char bHiPri, unsigned char bLoc) void __fastcall NetSendCmdChItem(unsigned char bHiPri, unsigned char bLoc)
{ {
short v2; // dx short v2; // dx
@ -1296,7 +1254,6 @@ void __fastcall NetSendCmdChItem(unsigned char bHiPri, unsigned char bLoc)
NetSendLoPri((unsigned char *)&cmd, 0xBu); NetSendLoPri((unsigned char *)&cmd, 0xBu);
} }
//----- (0043CEB2) --------------------------------------------------------
void __fastcall NetSendCmdDelItem(unsigned char bHiPri, unsigned char bLoc) void __fastcall NetSendCmdDelItem(unsigned char bHiPri, unsigned char bLoc)
{ {
TCmdDelItem cmd; // [esp+2h] [ebp-2h] TCmdDelItem cmd; // [esp+2h] [ebp-2h]
@ -1309,7 +1266,6 @@ void __fastcall NetSendCmdDelItem(unsigned char bHiPri, unsigned char bLoc)
NetSendLoPri((unsigned char *)&cmd, 2u); NetSendLoPri((unsigned char *)&cmd, 2u);
} }
//----- (0043CED4) --------------------------------------------------------
void __fastcall NetSendCmdDItem(unsigned char bHiPri, int ii) void __fastcall NetSendCmdDItem(unsigned char bHiPri, int ii)
{ {
int v2; // eax int v2; // eax
@ -1367,7 +1323,6 @@ void __fastcall NetSendCmdDItem(unsigned char bHiPri, int ii)
NetSendLoPri((unsigned char *)&cmd, 0x16u); NetSendLoPri((unsigned char *)&cmd, 0x16u);
} }
//----- (0043D039) --------------------------------------------------------
void __fastcall NetSendCmdDamage(unsigned char bHiPri, unsigned char bPlr, unsigned int dwDam) void __fastcall NetSendCmdDamage(unsigned char bHiPri, unsigned char bPlr, unsigned int dwDam)
{ {
TCmdDamage cmd; // [esp+0h] [ebp-8h] TCmdDamage cmd; // [esp+0h] [ebp-8h]
@ -1381,7 +1336,6 @@ void __fastcall NetSendCmdDamage(unsigned char bHiPri, unsigned char bPlr, unsig
NetSendLoPri((unsigned char *)&cmd, 6u); NetSendLoPri((unsigned char *)&cmd, 6u);
} }
//----- (0043D064) --------------------------------------------------------
void __fastcall NetSendCmdString(int a1, const char *pszStr) void __fastcall NetSendCmdString(int a1, const char *pszStr)
{ {
const char *v2; // esi const char *v2; // esi
@ -1397,7 +1351,6 @@ void __fastcall NetSendCmdString(int a1, const char *pszStr)
multi_send_msg_packet(v3, &cmd.bCmd, dwStrLen + 2); multi_send_msg_packet(v3, &cmd.bCmd, dwStrLen + 2);
} }
//----- (0043D09D) --------------------------------------------------------
void __fastcall RemovePlrPortal(int pnum) void __fastcall RemovePlrPortal(int pnum)
{ {
memset((char *)sgJunk + 5 * pnum, 255, 5u); memset((char *)sgJunk + 5 * pnum, 255, 5u);
@ -1405,7 +1358,6 @@ void __fastcall RemovePlrPortal(int pnum)
} }
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
//----- (0043D0BC) --------------------------------------------------------
int __fastcall ParseCmd(int pnum, TCmd *pCmd) int __fastcall ParseCmd(int pnum, TCmd *pCmd)
{ {
bool v2; // zf bool v2; // zf
@ -1637,7 +1589,6 @@ LABEL_100:
// 67618D: using guessed type char sgbDeltaChunks; // 67618D: using guessed type char sgbDeltaChunks;
// 6796E4: using guessed type char gbDeltaSender; // 6796E4: using guessed type char gbDeltaSender;
//----- (0043D632) --------------------------------------------------------
void __fastcall DeltaImportData(unsigned char cmd, int recv_offset) void __fastcall DeltaImportData(unsigned char cmd, int recv_offset)
{ {
unsigned char v2; // bl unsigned char v2; // bl
@ -1669,7 +1620,6 @@ void __fastcall DeltaImportData(unsigned char cmd, int recv_offset)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 67618D: using guessed type char sgbDeltaChunks; // 67618D: using guessed type char sgbDeltaChunks;
//----- (0043D6BA) --------------------------------------------------------
void *__fastcall DeltaImportItem(void *src, void *dst) void *__fastcall DeltaImportItem(void *src, void *dst)
{ {
char *v2; // edi char *v2; // edi
@ -1698,7 +1648,6 @@ void *__fastcall DeltaImportItem(void *src, void *dst)
return v3; return v3;
} }
//----- (0043D6F5) --------------------------------------------------------
void *__fastcall DeltaImportObject(void *src, void *dst) void *__fastcall DeltaImportObject(void *src, void *dst)
{ {
char *v2; // esi char *v2; // esi
@ -1708,7 +1657,6 @@ void *__fastcall DeltaImportObject(void *src, void *dst)
return v2 + 127; return v2 + 127;
} }
//----- (0043D709) --------------------------------------------------------
void *__fastcall DeltaImportMonster(void *src, void *dst) void *__fastcall DeltaImportMonster(void *src, void *dst)
{ {
char *v2; // edi char *v2; // edi
@ -1737,7 +1685,6 @@ void *__fastcall DeltaImportMonster(void *src, void *dst)
return v3; return v3;
} }
//----- (0043D746) --------------------------------------------------------
char __fastcall DeltaImportJunk(int a1) char __fastcall DeltaImportJunk(int a1)
{ {
_BYTE *v1; // ebx _BYTE *v1; // ebx
@ -1797,13 +1744,11 @@ char __fastcall DeltaImportJunk(int a1)
return result; return result;
} }
//----- (0043D7F1) --------------------------------------------------------
int __fastcall On_SYNCDATA(void *packet, int pnum) int __fastcall On_SYNCDATA(void *packet, int pnum)
{ {
return SyncData(pnum, (TSyncHeader *)packet); return SyncData(pnum, (TSyncHeader *)packet);
} }
//----- (0043D7FC) --------------------------------------------------------
int __fastcall On_WALKXY(struct TCmdLoc *pCmd, int pnum) int __fastcall On_WALKXY(struct TCmdLoc *pCmd, int pnum)
{ {
int v2; // ebx int v2; // ebx
@ -1826,7 +1771,6 @@ int __fastcall On_WALKXY(struct TCmdLoc *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D84A) --------------------------------------------------------
int __fastcall On_ADDSTR(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ADDSTR(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -1845,7 +1789,6 @@ int __fastcall On_ADDSTR(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D87B) --------------------------------------------------------
int __fastcall On_ADDMAG(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ADDMAG(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -1864,7 +1807,6 @@ int __fastcall On_ADDMAG(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D8AC) --------------------------------------------------------
int __fastcall On_ADDDEX(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ADDDEX(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -1883,7 +1825,6 @@ int __fastcall On_ADDDEX(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D8DD) --------------------------------------------------------
int __fastcall On_ADDVIT(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ADDVIT(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -1902,7 +1843,6 @@ int __fastcall On_ADDVIT(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D90E) --------------------------------------------------------
int __fastcall On_SBSPELL(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_SBSPELL(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // eax int v2; // eax
@ -1926,7 +1866,6 @@ int __fastcall On_SBSPELL(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043D97D) --------------------------------------------------------
void msg_errorf(char *pszFmt, ...) void msg_errorf(char *pszFmt, ...)
{ {
DWORD v1; // eax DWORD v1; // eax
@ -1944,7 +1883,6 @@ void msg_errorf(char *pszFmt, ...)
} }
// 67619C: using guessed type int msg_err_timer; // 67619C: using guessed type int msg_err_timer;
//----- (0043D9C4) --------------------------------------------------------
int __fastcall On_GOTOGETITEM(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_GOTOGETITEM(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // edi struct TCmdLocParam1 *v2; // edi
@ -1965,7 +1903,6 @@ int __fastcall On_GOTOGETITEM(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DA16) --------------------------------------------------------
int __fastcall On_REQUESTGITEM(struct TCmdGItem *pCmd, int pnum) int __fastcall On_REQUESTGITEM(struct TCmdGItem *pCmd, int pnum)
{ {
struct TCmdGItem *v2; // esi struct TCmdGItem *v2; // esi
@ -2013,7 +1950,6 @@ int __fastcall On_REQUESTGITEM(struct TCmdGItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DAE6) --------------------------------------------------------
bool __fastcall i_own_level(int nReqLevel) bool __fastcall i_own_level(int nReqLevel)
{ {
int v1; // edx int v1; // edx
@ -2033,7 +1969,6 @@ bool __fastcall i_own_level(int nReqLevel)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DB2D) --------------------------------------------------------
int __fastcall On_GETITEM(struct TCmdGItem *pCmd, int pnum) int __fastcall On_GETITEM(struct TCmdGItem *pCmd, int pnum)
{ {
struct TCmdGItem *v2; // esi struct TCmdGItem *v2; // esi
@ -2106,7 +2041,6 @@ int __fastcall On_GETITEM(struct TCmdGItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DC3D) --------------------------------------------------------
bool __fastcall delta_get_item(struct TCmdGItem *pI, unsigned char bLevel) bool __fastcall delta_get_item(struct TCmdGItem *pI, unsigned char bLevel)
{ {
struct TCmdGItem *v2; // esi struct TCmdGItem *v2; // esi
@ -2181,7 +2115,6 @@ LABEL_15:
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043DD40) --------------------------------------------------------
int __fastcall On_GOTOAGETITEM(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_GOTOAGETITEM(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // edi struct TCmdLocParam1 *v2; // edi
@ -2202,7 +2135,6 @@ int __fastcall On_GOTOAGETITEM(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DD92) --------------------------------------------------------
int __fastcall On_REQUESTAGITEM(struct TCmdGItem *pCmd, int pnum) int __fastcall On_REQUESTAGITEM(struct TCmdGItem *pCmd, int pnum)
{ {
struct TCmdGItem *v2; // esi struct TCmdGItem *v2; // esi
@ -2250,7 +2182,6 @@ int __fastcall On_REQUESTAGITEM(struct TCmdGItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DE60) --------------------------------------------------------
int __fastcall On_AGETITEM(struct TCmdGItem *pCmd, int pnum) int __fastcall On_AGETITEM(struct TCmdGItem *pCmd, int pnum)
{ {
struct TCmdGItem *v2; // esi struct TCmdGItem *v2; // esi
@ -2322,7 +2253,6 @@ int __fastcall On_AGETITEM(struct TCmdGItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DF6E) --------------------------------------------------------
int __fastcall On_ITEMEXTRA(struct TCmdGItem *pCmd, int pnum) int __fastcall On_ITEMEXTRA(struct TCmdGItem *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -2349,7 +2279,6 @@ int __fastcall On_ITEMEXTRA(struct TCmdGItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043DFC9) --------------------------------------------------------
int __fastcall On_PUTITEM(struct TCmdPItem *pCmd, int pnum) int __fastcall On_PUTITEM(struct TCmdPItem *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -2406,7 +2335,6 @@ int __fastcall On_PUTITEM(struct TCmdPItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E0CE) --------------------------------------------------------
void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, unsigned char bLevel) void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, unsigned char bLevel)
{ {
struct TCmdPItem *v4; // ebx struct TCmdPItem *v4; // ebx
@ -2461,7 +2389,6 @@ void __fastcall delta_put_item(struct TCmdPItem *pI, int x, int y, unsigned char
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043E179) --------------------------------------------------------
void __fastcall check_update_plr(int pnum) void __fastcall check_update_plr(int pnum)
{ {
if ( gbMaxPlayers != 1 && pnum == myplr ) if ( gbMaxPlayers != 1 && pnum == myplr )
@ -2469,7 +2396,6 @@ void __fastcall check_update_plr(int pnum)
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043E193) --------------------------------------------------------
int __fastcall On_SYNCPUTITEM(struct TCmdPItem *pCmd, int pnum) int __fastcall On_SYNCPUTITEM(struct TCmdPItem *pCmd, int pnum)
{ {
int v2; // ebx int v2; // ebx
@ -2519,7 +2445,6 @@ int __fastcall On_SYNCPUTITEM(struct TCmdPItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E284) --------------------------------------------------------
int __fastcall On_RESPAWNITEM(struct TCmdPItem *pCmd, int pnum) int __fastcall On_RESPAWNITEM(struct TCmdPItem *pCmd, int pnum)
{ {
struct TCmdPItem *v2; // esi struct TCmdPItem *v2; // esi
@ -2556,7 +2481,6 @@ int __fastcall On_RESPAWNITEM(struct TCmdPItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E32A) --------------------------------------------------------
int __fastcall On_ATTACKXY(struct TCmdLoc *pCmd, int pnum) int __fastcall On_ATTACKXY(struct TCmdLoc *pCmd, int pnum)
{ {
struct TCmdLoc *v2; // edi struct TCmdLoc *v2; // edi
@ -2578,7 +2502,6 @@ int __fastcall On_ATTACKXY(struct TCmdLoc *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E386) --------------------------------------------------------
int __fastcall On_SATTACKXY(struct TCmdLoc *pCmd, int pnum) int __fastcall On_SATTACKXY(struct TCmdLoc *pCmd, int pnum)
{ {
struct TCmdLoc *v2; // edi struct TCmdLoc *v2; // edi
@ -2600,7 +2523,6 @@ int __fastcall On_SATTACKXY(struct TCmdLoc *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E3D5) --------------------------------------------------------
int __fastcall On_RATTACKXY(struct TCmdLoc *pCmd, int pnum) int __fastcall On_RATTACKXY(struct TCmdLoc *pCmd, int pnum)
{ {
struct TCmdLoc *v2; // edi struct TCmdLoc *v2; // edi
@ -2622,7 +2544,6 @@ int __fastcall On_RATTACKXY(struct TCmdLoc *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E424) --------------------------------------------------------
int __fastcall On_SPELLXYD(struct TCmdLocParam3 *pCmd, int pnum) int __fastcall On_SPELLXYD(struct TCmdLocParam3 *pCmd, int pnum)
{ {
struct TCmdLocParam3 *v2; // edi struct TCmdLocParam3 *v2; // edi
@ -2658,7 +2579,6 @@ int __fastcall On_SPELLXYD(struct TCmdLocParam3 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E4D2) --------------------------------------------------------
int __fastcall On_SPELLXY(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_SPELLXY(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -2693,7 +2613,6 @@ int __fastcall On_SPELLXY(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E576) --------------------------------------------------------
int __fastcall On_TSPELLXY(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_TSPELLXY(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -2726,7 +2645,6 @@ int __fastcall On_TSPELLXY(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E61A) --------------------------------------------------------
int __fastcall On_OPOBJXY(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_OPOBJXY(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // esi struct TCmdLocParam1 *v2; // esi
@ -2752,7 +2670,6 @@ int __fastcall On_OPOBJXY(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E68A) --------------------------------------------------------
int __fastcall On_DISARMXY(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_DISARMXY(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // esi struct TCmdLocParam1 *v2; // esi
@ -2778,7 +2695,6 @@ int __fastcall On_DISARMXY(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E6FA) --------------------------------------------------------
int __fastcall On_OPOBJT(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_OPOBJT(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // eax int v2; // eax
@ -2796,7 +2712,6 @@ int __fastcall On_OPOBJT(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E732) --------------------------------------------------------
int __fastcall On_ATTACKID(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ATTACKID(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // ebp int v2; // ebp
@ -2828,7 +2743,6 @@ int __fastcall On_ATTACKID(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E7DF) --------------------------------------------------------
int __fastcall On_ATTACKPID(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_ATTACKPID(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -2849,7 +2763,6 @@ int __fastcall On_ATTACKPID(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E840) --------------------------------------------------------
int __fastcall On_RATTACKID(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_RATTACKID(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -2870,7 +2783,6 @@ int __fastcall On_RATTACKID(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E885) --------------------------------------------------------
int __fastcall On_RATTACKPID(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_RATTACKPID(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -2891,7 +2803,6 @@ int __fastcall On_RATTACKPID(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E8CA) --------------------------------------------------------
int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -2925,7 +2836,6 @@ int __fastcall On_SPELLID(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E964) --------------------------------------------------------
int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -2959,7 +2869,6 @@ int __fastcall On_SPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043E9FE) --------------------------------------------------------
int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -2991,7 +2900,6 @@ int __fastcall On_TSPELLID(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EA98) --------------------------------------------------------
int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum) int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
{ {
struct TCmdLocParam2 *v2; // edi struct TCmdLocParam2 *v2; // edi
@ -3023,7 +2931,6 @@ int __fastcall On_TSPELLPID(struct TCmdLocParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EB32) --------------------------------------------------------
int __fastcall On_KNOCKBACK(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_KNOCKBACK(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -3040,7 +2947,6 @@ int __fastcall On_KNOCKBACK(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EB74) --------------------------------------------------------
int __fastcall On_RESURRECT(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_RESURRECT(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // esi int v2; // esi
@ -3059,7 +2965,6 @@ int __fastcall On_RESURRECT(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EBA4) --------------------------------------------------------
int __fastcall On_HEALOTHER(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_HEALOTHER(struct TCmdParam1 *pCmd, int pnum)
{ {
if ( gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel ) if ( gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel )
@ -3068,7 +2973,6 @@ int __fastcall On_HEALOTHER(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EBD5) --------------------------------------------------------
int __fastcall On_TALKXY(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_TALKXY(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // edi struct TCmdLocParam1 *v2; // edi
@ -3089,7 +2993,6 @@ int __fastcall On_TALKXY(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EC27) --------------------------------------------------------
int __fastcall On_NEWLVL(struct TCmdParam2 *pCmd, int pnum) int __fastcall On_NEWLVL(struct TCmdParam2 *pCmd, int pnum)
{ {
if ( gbBufferMsgs == 1 ) if ( gbBufferMsgs == 1 )
@ -3104,7 +3007,6 @@ int __fastcall On_NEWLVL(struct TCmdParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EC5B) --------------------------------------------------------
int __fastcall On_WARP(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_WARP(struct TCmdParam1 *pCmd, int pnum)
{ {
int v2; // esi int v2; // esi
@ -3127,7 +3029,6 @@ int __fastcall On_WARP(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043ECBA) --------------------------------------------------------
int __fastcall On_MONSTDEATH(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_MONSTDEATH(struct TCmdLocParam1 *pCmd, int pnum)
{ {
struct TCmdLocParam1 *v2; // esi struct TCmdLocParam1 *v2; // esi
@ -3149,7 +3050,6 @@ int __fastcall On_MONSTDEATH(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043ED23) --------------------------------------------------------
int __fastcall On_KILLGOLEM(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_KILLGOLEM(struct TCmdLocParam1 *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -3171,7 +3071,6 @@ int __fastcall On_KILLGOLEM(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043ED89) --------------------------------------------------------
int __fastcall On_AWAKEGOLEM(struct TCmdGolem *pCmd, int pnum) int __fastcall On_AWAKEGOLEM(struct TCmdGolem *pCmd, int pnum)
{ {
int v2; // esi int v2; // esi
@ -3229,7 +3128,6 @@ LABEL_16:
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EE3D) --------------------------------------------------------
int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -3267,7 +3165,6 @@ int __fastcall On_MONSTDAMAGE(struct TCmdLocParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EEF5) --------------------------------------------------------
int __fastcall On_PLRDEAD(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_PLRDEAD(struct TCmdParam1 *pCmd, int pnum)
{ {
if ( gbBufferMsgs == 1 ) if ( gbBufferMsgs == 1 )
@ -3286,7 +3183,6 @@ int __fastcall On_PLRDEAD(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EF2D) --------------------------------------------------------
int __fastcall On_PLRDAMAGE(struct TCmdDamage *pCmd, int pnum) int __fastcall On_PLRDAMAGE(struct TCmdDamage *pCmd, int pnum)
{ {
int v2; // edi int v2; // edi
@ -3326,7 +3222,6 @@ int __fastcall On_PLRDAMAGE(struct TCmdDamage *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043EFDD) --------------------------------------------------------
int __fastcall On_OPENDOOR(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_OPENDOOR(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -3348,7 +3243,6 @@ int __fastcall On_OPENDOOR(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F033) --------------------------------------------------------
void __fastcall delta_sync_object(int oi, unsigned char bCmd, unsigned char bLevel) void __fastcall delta_sync_object(int oi, unsigned char bCmd, unsigned char bLevel)
{ {
if ( gbMaxPlayers != 1 ) if ( gbMaxPlayers != 1 )
@ -3360,7 +3254,6 @@ void __fastcall delta_sync_object(int oi, unsigned char bCmd, unsigned char bLev
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0043F058) --------------------------------------------------------
int __fastcall On_CLOSEDOOR(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_CLOSEDOOR(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -3382,7 +3275,6 @@ int __fastcall On_CLOSEDOOR(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F0AE) --------------------------------------------------------
int __fastcall On_OPERATEOBJ(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_OPERATEOBJ(struct TCmdParam1 *pCmd, int pnum)
{ {
struct TCmdParam1 *v2; // edi struct TCmdParam1 *v2; // edi
@ -3404,7 +3296,6 @@ int __fastcall On_OPERATEOBJ(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F104) --------------------------------------------------------
int __fastcall On_PLROPOBJ(struct TCmdParam2 *pCmd, int pnum) int __fastcall On_PLROPOBJ(struct TCmdParam2 *pCmd, int pnum)
{ {
struct TCmdParam2 *v2; // esi struct TCmdParam2 *v2; // esi
@ -3426,7 +3317,6 @@ int __fastcall On_PLROPOBJ(struct TCmdParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F15C) --------------------------------------------------------
int __fastcall On_BREAKOBJ(struct TCmdParam2 *pCmd, int pnum) int __fastcall On_BREAKOBJ(struct TCmdParam2 *pCmd, int pnum)
{ {
struct TCmdParam2 *v2; // esi struct TCmdParam2 *v2; // esi
@ -3448,7 +3338,6 @@ int __fastcall On_BREAKOBJ(struct TCmdParam2 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F1B0) --------------------------------------------------------
int __fastcall On_CHANGEPLRITEMS(struct TCmdChItem *pCmd, int pnum) int __fastcall On_CHANGEPLRITEMS(struct TCmdChItem *pCmd, int pnum)
{ {
int v2; // eax int v2; // eax
@ -3474,7 +3363,6 @@ int __fastcall On_CHANGEPLRITEMS(struct TCmdChItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F1F0) --------------------------------------------------------
int __fastcall On_DELPLRITEMS(struct TCmdDelItem *pCmd, int pnum) int __fastcall On_DELPLRITEMS(struct TCmdDelItem *pCmd, int pnum)
{ {
int v2; // eax int v2; // eax
@ -3493,7 +3381,6 @@ int __fastcall On_DELPLRITEMS(struct TCmdDelItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F21E) --------------------------------------------------------
int __fastcall On_PLRLEVEL(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_PLRLEVEL(struct TCmdParam1 *pCmd, int pnum)
{ {
if ( gbBufferMsgs == 1 ) if ( gbBufferMsgs == 1 )
@ -3508,7 +3395,6 @@ int __fastcall On_PLRLEVEL(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F258) --------------------------------------------------------
int __fastcall On_DROPITEM(struct TCmdPItem *pCmd, int pnum) int __fastcall On_DROPITEM(struct TCmdPItem *pCmd, int pnum)
{ {
if ( gbBufferMsgs == 1 ) if ( gbBufferMsgs == 1 )
@ -3519,7 +3405,6 @@ int __fastcall On_DROPITEM(struct TCmdPItem *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F28F) --------------------------------------------------------
int __fastcall On_SEND_PLRINFO(struct TCmdPlrInfoHdr *pCmd, int pnum) int __fastcall On_SEND_PLRINFO(struct TCmdPlrInfoHdr *pCmd, int pnum)
{ {
struct TCmdPlrInfoHdr *v2; // esi struct TCmdPlrInfoHdr *v2; // esi
@ -3538,7 +3423,6 @@ int __fastcall On_ACK_PLRINFO(struct TCmdPlrInfoHdr *pCmd, int pnum)
return On_SEND_PLRINFO(pCmd, pnum); return On_SEND_PLRINFO(pCmd, pnum);
} }
//----- (0043F2CE) --------------------------------------------------------
int __fastcall On_PLAYER_JOINLEVEL(struct TCmdLocParam1 *pCmd, int pnum) int __fastcall On_PLAYER_JOINLEVEL(struct TCmdLocParam1 *pCmd, int pnum)
{ {
int v2; // ebx int v2; // ebx
@ -3612,7 +3496,6 @@ int __fastcall On_PLAYER_JOINLEVEL(struct TCmdLocParam1 *pCmd, int pnum)
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
// 67862C: using guessed type char gbActivePlayers; // 67862C: using guessed type char gbActivePlayers;
//----- (0043F448) --------------------------------------------------------
int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum) int __fastcall On_ACTIVATEPORTAL(DJunk *pCmd, int pnum)
{ {
signed int v2; // ebx signed int v2; // ebx
@ -3690,7 +3573,6 @@ LABEL_19:
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F521) --------------------------------------------------------
void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType, int bSetLvl) void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType, int bSetLvl)
{ {
int v6; // eax int v6; // eax
@ -3705,7 +3587,6 @@ void __fastcall delta_open_portal(int pnum, int x, int y, int bLevel, int bLType
} }
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
//----- (0043F55C) --------------------------------------------------------
int __fastcall On_DEACTIVATEPORTAL(struct TCmd *pCmd, int pnum) int __fastcall On_DEACTIVATEPORTAL(struct TCmd *pCmd, int pnum)
{ {
int v2; // esi int v2; // esi
@ -3726,7 +3607,6 @@ int __fastcall On_DEACTIVATEPORTAL(struct TCmd *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F59A) --------------------------------------------------------
int __fastcall On_RETOWN(struct TCmd *pCmd, int pnum) int __fastcall On_RETOWN(struct TCmd *pCmd, int pnum)
{ {
int v2; // esi int v2; // esi
@ -3749,7 +3629,6 @@ int __fastcall On_RETOWN(struct TCmd *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F5D3) --------------------------------------------------------
int __fastcall On_SETSTR(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_SETSTR(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -3768,7 +3647,6 @@ int __fastcall On_SETSTR(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F60C) --------------------------------------------------------
int __fastcall On_SETDEX(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_SETDEX(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -3787,7 +3665,6 @@ int __fastcall On_SETDEX(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F645) --------------------------------------------------------
int __fastcall On_SETMAG(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_SETMAG(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -3806,7 +3683,6 @@ int __fastcall On_SETMAG(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F67E) --------------------------------------------------------
int __fastcall On_SETVIT(struct TCmdParam1 *pCmd, int pnum) int __fastcall On_SETVIT(struct TCmdParam1 *pCmd, int pnum)
{ {
unsigned short v2; // cx unsigned short v2; // cx
@ -3825,7 +3701,6 @@ int __fastcall On_SETVIT(struct TCmdParam1 *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F6B7) --------------------------------------------------------
int __fastcall On_STRING(struct TCmdString *pCmd, int pnum) int __fastcall On_STRING(struct TCmdString *pCmd, int pnum)
{ {
const char *v2; // esi const char *v2; // esi
@ -3841,7 +3716,6 @@ int __fastcall On_STRING(struct TCmdString *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F6EC) --------------------------------------------------------
int __fastcall On_SYNCQUEST(struct TCmdQuest *pCmd, int pnum) int __fastcall On_SYNCQUEST(struct TCmdQuest *pCmd, int pnum)
{ {
if ( gbBufferMsgs == 1 ) if ( gbBufferMsgs == 1 )
@ -3863,7 +3737,6 @@ int __fastcall On_SYNCQUEST(struct TCmdQuest *pCmd, int pnum)
// 67618C: using guessed type char sgbDeltaChanged; // 67618C: using guessed type char sgbDeltaChanged;
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F72E) --------------------------------------------------------
int __fastcall On_ENDSHIELD(int a1, int pnum) int __fastcall On_ENDSHIELD(int a1, int pnum)
{ {
int v2; // ebx int v2; // ebx
@ -3915,13 +3788,11 @@ int __fastcall On_CHEAT_SPELL_LEVEL(struct TCmd *pCmd, int pnum)
} }
#endif #endif
//----- (0043F7A5) --------------------------------------------------------
int __cdecl On_DEBUG() int __cdecl On_DEBUG()
{ {
return 1; return 1;
} }
//----- (0043F7A9) --------------------------------------------------------
int __fastcall On_NOVA(struct TCmdLoc *pCmd, int pnum) int __fastcall On_NOVA(struct TCmdLoc *pCmd, int pnum)
{ {
struct TCmdLoc *v2; // edi struct TCmdLoc *v2; // edi
@ -3946,7 +3817,6 @@ int __fastcall On_NOVA(struct TCmdLoc *pCmd, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F818) --------------------------------------------------------
int __fastcall On_SETSHIELD(int unused, int pnum) int __fastcall On_SETSHIELD(int unused, int pnum)
{ {
int result; // eax int result; // eax
@ -3958,7 +3828,6 @@ int __fastcall On_SETSHIELD(int unused, int pnum)
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043F830) --------------------------------------------------------
int __fastcall On_REMSHIELD(int unused, int pnum) int __fastcall On_REMSHIELD(int unused, int pnum)
{ {
int result; // eax int result; // eax

5
Source/msg.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MSG_H__
#define __MSG_H__
//msg
extern int sgdwOwnerWait; // weak extern int sgdwOwnerWait; // weak
extern int msg_cpp_init_value; // weak extern int msg_cpp_init_value; // weak
extern int sgdwRecvOffset; // idb extern int sgdwRecvOffset; // idb
@ -160,3 +161,5 @@ int __fastcall On_REMSHIELD(int unused, int pnum);
/* data */ /* data */
extern int msg_inf; // weak extern int msg_inf; // weak
#endif /* __MSG_H__ */

17
Source/msgcmd.cpp
View File

@ -8,7 +8,6 @@ int sgdwMsgCmdTimer;
int msgcmd_inf = 0x7F800000; // weak int msgcmd_inf = 0x7F800000; // weak
//----- (0043F84E) --------------------------------------------------------
struct msgcmd_cpp_init_1 struct msgcmd_cpp_init_1
{ {
msgcmd_cpp_init_1() msgcmd_cpp_init_1()
@ -19,7 +18,6 @@ struct msgcmd_cpp_init_1
// 47F150: using guessed type int msgcmd_inf; // 47F150: using guessed type int msgcmd_inf;
// 6761A0: using guessed type int msgcmd_cpp_init_value; // 6761A0: using guessed type int msgcmd_cpp_init_value;
//----- (0043F859) --------------------------------------------------------
struct msgcmd_cpp_init_2 struct msgcmd_cpp_init_2
{ {
msgcmd_cpp_init_2() msgcmd_cpp_init_2()
@ -29,32 +27,27 @@ struct msgcmd_cpp_init_2
} }
} _msgcmd_cpp_init_2; } _msgcmd_cpp_init_2;
//----- (0043F863) --------------------------------------------------------
void __cdecl msgcmd_init_event() void __cdecl msgcmd_init_event()
{ {
msgcmd_init_chatcmd(&sgChat_Cmd); msgcmd_init_chatcmd(&sgChat_Cmd);
} }
//----- (0043F86D) --------------------------------------------------------
void __cdecl msgcmd_cleanup_chatcmd_atexit() void __cdecl msgcmd_cleanup_chatcmd_atexit()
{ {
atexit(msgcmd_cleanup_chatcmd); atexit(msgcmd_cleanup_chatcmd);
} }
//----- (0043F879) --------------------------------------------------------
void __cdecl msgcmd_cleanup_chatcmd() void __cdecl msgcmd_cleanup_chatcmd()
{ {
msgcmd_cleanup_chatcmd_1(&sgChat_Cmd); msgcmd_cleanup_chatcmd_1(&sgChat_Cmd);
msgcmd_cleanup_extern_msg(sgChat_Cmd.extern_msgs); msgcmd_cleanup_extern_msg(sgChat_Cmd.extern_msgs);
} }
//----- (0043F88D) --------------------------------------------------------
void __cdecl msgcmd_cmd_cleanup() void __cdecl msgcmd_cmd_cleanup()
{ {
msgcmd_free_event(&sgChat_Cmd); msgcmd_free_event(&sgChat_Cmd);
} }
//----- (0043F897) --------------------------------------------------------
void __cdecl msgcmd_send_chat() void __cdecl msgcmd_send_chat()
{ {
ServerCommand *v0; // esi ServerCommand *v0; // esi
@ -73,7 +66,6 @@ void __cdecl msgcmd_send_chat()
} }
} }
//----- (0043F8D4) --------------------------------------------------------
bool __fastcall msgcmd_add_server_cmd_W(char *chat_message) bool __fastcall msgcmd_add_server_cmd_W(char *chat_message)
{ {
if ( *chat_message != '/' ) if ( *chat_message != '/' )
@ -82,7 +74,6 @@ bool __fastcall msgcmd_add_server_cmd_W(char *chat_message)
return 1; return 1;
} }
//----- (0043F8E5) --------------------------------------------------------
void __fastcall msgcmd_add_server_cmd(char *command) void __fastcall msgcmd_add_server_cmd(char *command)
{ {
char *v1; // edi char *v1; // edi
@ -104,7 +95,6 @@ void __fastcall msgcmd_add_server_cmd(char *command)
} }
} }
//----- (0043F920) --------------------------------------------------------
void __fastcall msgcmd_init_chatcmd(ChatCmd *chat_cmd) void __fastcall msgcmd_init_chatcmd(ChatCmd *chat_cmd)
{ {
ServerCommand **v1; // edx ServerCommand **v1; // edx
@ -117,7 +107,6 @@ void __fastcall msgcmd_init_chatcmd(ChatCmd *chat_cmd)
chat_cmd->extern_msgs[1] = (ServerCommand *)~(unsigned int)chat_cmd->extern_msgs; chat_cmd->extern_msgs[1] = (ServerCommand *)~(unsigned int)chat_cmd->extern_msgs;
} }
//----- (0043F936) --------------------------------------------------------
void __fastcall msgcmd_free_event(ChatCmd *a1) void __fastcall msgcmd_free_event(ChatCmd *a1)
{ {
int v1; // edx int v1; // edx
@ -135,7 +124,6 @@ void __fastcall msgcmd_free_event(ChatCmd *a1)
} }
} }
//----- (0043F95E) --------------------------------------------------------
bool __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg) bool __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_msg)
{ {
char *v2; // eax char *v2; // eax
@ -156,7 +144,6 @@ bool __fastcall msgcmd_delete_server_cmd_W(ChatCmd *cmd, ServerCommand *extern_m
return v4; return v4;
} }
//----- (0043F999) --------------------------------------------------------
ChatCmd *__fastcall msgcmd_alloc_event(ChatCmd *a1, int a2, int a3, int a4, int a5) ChatCmd *__fastcall msgcmd_alloc_event(ChatCmd *a1, int a2, int a3, int a4, int a5)
{ {
int v5; // eax int v5; // eax
@ -184,7 +171,6 @@ ChatCmd *__fastcall msgcmd_alloc_event(ChatCmd *a1, int a2, int a3, int a4, int
return v9; return v9;
} }
//----- (0043F9E5) --------------------------------------------------------
void __fastcall msgcmd_remove_event(ChatCmd *a1, int a2) void __fastcall msgcmd_remove_event(ChatCmd *a1, int a2)
{ {
ServerCommand **v2; // esi ServerCommand **v2; // esi
@ -199,7 +185,6 @@ void __fastcall msgcmd_remove_event(ChatCmd *a1, int a2)
} }
} }
//----- (0043FA14) --------------------------------------------------------
void __fastcall msgcmd_event_type(ChatCmd *a1, int a2, int *a3, int a4, int a5) void __fastcall msgcmd_event_type(ChatCmd *a1, int a2, int *a3, int a4, int a5)
{ {
ChatCmd *v5; // edi ChatCmd *v5; // edi
@ -248,7 +233,6 @@ void __fastcall msgcmd_event_type(ChatCmd *a1, int a2, int *a3, int a4, int a5)
} }
} }
//----- (0043FA85) --------------------------------------------------------
void __fastcall msgcmd_cleanup_chatcmd_1(ChatCmd *a1) void __fastcall msgcmd_cleanup_chatcmd_1(ChatCmd *a1)
{ {
ChatCmd *v1; // esi ChatCmd *v1; // esi
@ -264,7 +248,6 @@ void __fastcall msgcmd_cleanup_chatcmd_1(ChatCmd *a1)
} }
} }
//----- (0043FA98) --------------------------------------------------------
void __fastcall msgcmd_cleanup_extern_msg(ServerCommand **extern_msgs) void __fastcall msgcmd_cleanup_extern_msg(ServerCommand **extern_msgs)
{ {
ServerCommand *v1; // esi ServerCommand *v1; // esi

5
Source/msgcmd.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MSGCMD_H__
#define __MSGCMD_H__
//msgcmd
extern int msgcmd_cpp_init_value; // weak extern int msgcmd_cpp_init_value; // weak
extern ChatCmd sgChat_Cmd; extern ChatCmd sgChat_Cmd;
extern int sgdwMsgCmdTimer; extern int sgdwMsgCmdTimer;
@ -26,3 +27,5 @@ void __fastcall msgcmd_cleanup_extern_msg(ServerCommand **extern_msgs);
/* data */ /* data */
extern int msgcmd_inf; // weak extern int msgcmd_inf; // weak
#endif /* __MSGCMD_H__ */

37
Source/multi.cpp
View File

@ -36,7 +36,6 @@ event_type event_types[3] =
EVENT_TYPE_PLAYER_MESSAGE EVENT_TYPE_PLAYER_MESSAGE
}; };
//----- (0043FAC9) --------------------------------------------------------
struct multi_cpp_init struct multi_cpp_init
{ {
multi_cpp_init() multi_cpp_init()
@ -47,7 +46,6 @@ struct multi_cpp_init
// 47F154: using guessed type int multi_inf; // 47F154: using guessed type int multi_inf;
// 678620: using guessed type int multi_cpp_init_value; // 678620: using guessed type int multi_cpp_init_value;
//----- (0043FAD4) --------------------------------------------------------
void __fastcall multi_msg_add(unsigned char *a1, unsigned char a2) void __fastcall multi_msg_add(unsigned char *a1, unsigned char a2)
{ {
if ( a1 ) if ( a1 )
@ -57,7 +55,6 @@ void __fastcall multi_msg_add(unsigned char *a1, unsigned char a2)
} }
} }
//----- (0043FAE2) --------------------------------------------------------
void __fastcall NetSendLoPri(unsigned char *pbMsg, unsigned char bLen) void __fastcall NetSendLoPri(unsigned char *pbMsg, unsigned char bLen)
{ {
unsigned char *v2; // esi unsigned char *v2; // esi
@ -77,7 +74,6 @@ void __fastcall NetSendLoPri(unsigned char *pbMsg, unsigned char bLen)
} }
} }
//----- (0043FB0B) --------------------------------------------------------
void __fastcall multi_copy_packet(void *a1, void *packet, int size) void __fastcall multi_copy_packet(void *a1, void *packet, int size)
{ {
int v3; // eax int v3; // eax
@ -96,7 +92,6 @@ void __fastcall multi_copy_packet(void *a1, void *packet, int size)
} }
} }
//----- (0043FB4D) --------------------------------------------------------
void __fastcall multi_send_packet(void *packet, int dwSize) void __fastcall multi_send_packet(void *packet, int dwSize)
{ {
void *v2; // esi void *v2; // esi
@ -112,7 +107,6 @@ void __fastcall multi_send_packet(void *packet, int dwSize)
nthread_terminate_game("SNetSendMessage0"); nthread_terminate_game("SNetSendMessage0");
} }
//----- (0043FBB5) --------------------------------------------------------
void __fastcall NetRecvPlrData(TPkt *pkt) void __fastcall NetRecvPlrData(TPkt *pkt)
{ {
pkt->hdr.wCheck = 'ip'; pkt->hdr.wCheck = 'ip';
@ -127,7 +121,6 @@ void __fastcall NetRecvPlrData(TPkt *pkt)
pkt->hdr.bdex = plr[myplr]._pBaseDex; pkt->hdr.bdex = plr[myplr]._pBaseDex;
} }
//----- (0043FC6F) --------------------------------------------------------
void __fastcall NetSendHiPri(unsigned char *pbMsg, unsigned char bLen) void __fastcall NetSendHiPri(unsigned char *pbMsg, unsigned char bLen)
{ {
unsigned char *v2; // edi unsigned char *v2; // edi
@ -166,7 +159,6 @@ void __fastcall NetSendHiPri(unsigned char *pbMsg, unsigned char bLen)
// 678628: using guessed type int dword_678628; // 678628: using guessed type int dword_678628;
// 679760: using guessed type int gdwNormalMsgSize; // 679760: using guessed type int gdwNormalMsgSize;
//----- (0043FD27) --------------------------------------------------------
unsigned char *__fastcall multi_recv_packet(void *packet, unsigned char *a2, int *a3) unsigned char *__fastcall multi_recv_packet(void *packet, unsigned char *a2, int *a3)
{ {
char *v3; // esi char *v3; // esi
@ -200,7 +192,6 @@ unsigned char *__fastcall multi_recv_packet(void *packet, unsigned char *a2, int
return result; return result;
} }
//----- (0043FD90) --------------------------------------------------------
void __fastcall multi_send_msg_packet(int a1, unsigned char *a2, unsigned char len) void __fastcall multi_send_msg_packet(int a1, unsigned char *a2, unsigned char len)
{ {
//const void *v3; // edx //const void *v3; // edx
@ -230,7 +221,6 @@ void __fastcall multi_send_msg_packet(int a1, unsigned char *a2, unsigned char l
nthread_terminate_game("SNetSendMessage"); nthread_terminate_game("SNetSendMessage");
} }
//----- (0043FE0E) --------------------------------------------------------
void __cdecl multi_msg_countdown() void __cdecl multi_msg_countdown()
{ {
int v0; // esi int v0; // esi
@ -248,7 +238,6 @@ void __cdecl multi_msg_countdown()
while ( v0 < 4 ); while ( v0 < 4 );
} }
//----- (0043FE3D) --------------------------------------------------------
void __fastcall multi_parse_turn(int pnum, int turn) void __fastcall multi_parse_turn(int pnum, int turn)
{ {
int v2; // esi int v2; // esi
@ -269,7 +258,6 @@ void __fastcall multi_parse_turn(int pnum, int turn)
// 679704: using guessed type char byte_679704; // 679704: using guessed type char byte_679704;
// 679738: using guessed type int gdwTurnsInTransit; // 679738: using guessed type int gdwTurnsInTransit;
//----- (0043FE85) --------------------------------------------------------
void __fastcall multi_handle_turn_upper_bit(int pnum) void __fastcall multi_handle_turn_upper_bit(int pnum)
{ {
signed int v1; // eax signed int v1; // eax
@ -293,7 +281,6 @@ void __fastcall multi_handle_turn_upper_bit(int pnum)
} }
// 6796E4: using guessed type char gbDeltaSender; // 6796E4: using guessed type char gbDeltaSender;
//----- (0043FEB7) --------------------------------------------------------
void __fastcall multi_player_left(int pnum, int reason) void __fastcall multi_player_left(int pnum, int reason)
{ {
sgbPlayerLeftGameTbl[pnum] = 1; sgbPlayerLeftGameTbl[pnum] = 1;
@ -301,7 +288,6 @@ void __fastcall multi_player_left(int pnum, int reason)
multi_clear_left_tbl(); multi_clear_left_tbl();
} }
//----- (0043FECA) --------------------------------------------------------
void __cdecl multi_clear_left_tbl() void __cdecl multi_clear_left_tbl()
{ {
int v0; // esi int v0; // esi
@ -324,7 +310,6 @@ void __cdecl multi_clear_left_tbl()
} }
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
//----- (0043FF0E) --------------------------------------------------------
void __fastcall multi_player_left_msg(int pnum, int left) void __fastcall multi_player_left_msg(int pnum, int left)
{ {
int v2; // edi int v2; // edi
@ -367,7 +352,6 @@ void __fastcall multi_player_left_msg(int pnum, int left)
// 6761B8: using guessed type char gbSomebodyWonGameKludge; // 6761B8: using guessed type char gbSomebodyWonGameKludge;
// 67862C: using guessed type char gbActivePlayers; // 67862C: using guessed type char gbActivePlayers;
//----- (0043FF9D) --------------------------------------------------------
void __cdecl multi_net_ping() void __cdecl multi_net_ping()
{ {
sgbTimeout = 1; sgbTimeout = 1;
@ -376,7 +360,6 @@ void __cdecl multi_net_ping()
// 678644: using guessed type int sglTimeoutStart; // 678644: using guessed type int sglTimeoutStart;
// 679661: using guessed type char sgbTimeout; // 679661: using guessed type char sgbTimeout;
//----- (0043FFB0) --------------------------------------------------------
int __cdecl multi_handle_delta() int __cdecl multi_handle_delta()
{ {
int v0; // esi int v0; // esi
@ -427,14 +410,12 @@ int __cdecl multi_handle_delta()
// 67862D: using guessed type char gbGameDestroyed; // 67862D: using guessed type char gbGameDestroyed;
// 679661: using guessed type char sgbTimeout; // 679661: using guessed type char sgbTimeout;
//----- (00440058) --------------------------------------------------------
// Microsoft VisualC 2-11/net runtime // Microsoft VisualC 2-11/net runtime
int __fastcall multi_check_pkt_valid(char *a1) int __fastcall multi_check_pkt_valid(char *a1)
{ {
return *(_DWORD *)a1 == 0; return *(_DWORD *)a1 == 0;
} }
//----- (00440060) --------------------------------------------------------
void __cdecl multi_mon_seeds() void __cdecl multi_mon_seeds()
{ {
unsigned int v0; // eax unsigned int v0; // eax
@ -454,7 +435,6 @@ void __cdecl multi_mon_seeds()
while ( (signed int)v2 < (signed int)&monster[200]._mAISeed ); while ( (signed int)v2 < (signed int)&monster[200]._mAISeed );
} }
//----- (00440093) --------------------------------------------------------
void __cdecl multi_begin_timeout() void __cdecl multi_begin_timeout()
{ {
unsigned char bGroupPlayers; // bl unsigned char bGroupPlayers; // bl
@ -524,7 +504,6 @@ void __cdecl multi_begin_timeout()
// 678644: using guessed type int sglTimeoutStart; // 678644: using guessed type int sglTimeoutStart;
// 679661: using guessed type char sgbTimeout; // 679661: using guessed type char sgbTimeout;
//----- (00440128) --------------------------------------------------------
void __cdecl multi_check_drop_player() void __cdecl multi_check_drop_player()
{ {
int v0; // esi int v0; // esi
@ -544,7 +523,6 @@ void __cdecl multi_check_drop_player()
while ( v0 < 4 ); while ( v0 < 4 );
} }
//----- (00440153) --------------------------------------------------------
void __cdecl multi_process_network_packets() void __cdecl multi_process_network_packets()
{ {
//int v0; // eax //int v0; // eax
@ -651,7 +629,6 @@ void __cdecl multi_process_network_packets()
// 676194: using guessed type char gbBufferMsgs; // 676194: using guessed type char gbBufferMsgs;
// 676198: using guessed type int dword_676198; // 676198: using guessed type int dword_676198;
//----- (0044041D) --------------------------------------------------------
void __fastcall multi_handle_all_packets(int players, TPkt *packet, int a3) void __fastcall multi_handle_all_packets(int players, TPkt *packet, int a3)
{ {
TCmd *v3; // esi TCmd *v3; // esi
@ -668,7 +645,6 @@ void __fastcall multi_handle_all_packets(int players, TPkt *packet, int a3)
} }
} }
//----- (00440444) --------------------------------------------------------
void __cdecl multi_process_tmsgs() void __cdecl multi_process_tmsgs()
{ {
int v0; // eax int v0; // eax
@ -683,7 +659,6 @@ void __cdecl multi_process_tmsgs()
} }
} }
//----- (00440477) --------------------------------------------------------
void __fastcall multi_send_zero_packet(int pnum, char a2, void *pbSrc, int dwLen) void __fastcall multi_send_zero_packet(int pnum, char a2, void *pbSrc, int dwLen)
{ {
unsigned int v4; // edi unsigned int v4; // edi
@ -729,7 +704,6 @@ void __fastcall multi_send_zero_packet(int pnum, char a2, void *pbSrc, int dwLen
} }
// 67975C: using guessed type int gdwLargestMsgSize; // 67975C: using guessed type int gdwLargestMsgSize;
//----- (0044055D) --------------------------------------------------------
void __cdecl NetClose() void __cdecl NetClose()
{ {
if ( sgbNetInited ) if ( sgbNetInited )
@ -748,7 +722,6 @@ void __cdecl NetClose()
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
// 6796E8: using guessed type int sgbNetInited; // 6796E8: using guessed type int sgbNetInited;
//----- (004405A4) --------------------------------------------------------
char __fastcall multi_event_handler(int a1) char __fastcall multi_event_handler(int a1)
{ {
int v1; // edi int v1; // edi
@ -776,7 +749,6 @@ char __fastcall multi_event_handler(int a1)
return v4; return v4;
} }
//----- (004405EC) --------------------------------------------------------
void __stdcall multi_handle_events(_SNETEVENT *pEvt) void __stdcall multi_handle_events(_SNETEVENT *pEvt)
{ {
int v1; // ecx int v1; // ecx
@ -814,7 +786,6 @@ void __stdcall multi_handle_events(_SNETEVENT *pEvt)
// 6761B8: using guessed type char gbSomebodyWonGameKludge; // 6761B8: using guessed type char gbSomebodyWonGameKludge;
// 6796E4: using guessed type char gbDeltaSender; // 6796E4: using guessed type char gbDeltaSender;
//----- (00440694) --------------------------------------------------------
int __fastcall NetInit(int bSinglePlayer, int *pfExitProgram) int __fastcall NetInit(int bSinglePlayer, int *pfExitProgram)
{ {
int v2; // ebx int v2; // ebx
@ -936,14 +907,12 @@ int __fastcall NetInit(int bSinglePlayer, int *pfExitProgram)
// 6796E4: using guessed type char gbDeltaSender; // 6796E4: using guessed type char gbDeltaSender;
// 6796E8: using guessed type int sgbNetInited; // 6796E8: using guessed type int sgbNetInited;
//----- (00440992) --------------------------------------------------------
void __fastcall multi_clear_pkt(char *a1) void __fastcall multi_clear_pkt(char *a1)
{ {
*(_DWORD *)a1 = 0; *(_DWORD *)a1 = 0;
a1[4] = 0; a1[4] = 0;
} }
//----- (0044099A) --------------------------------------------------------
void __fastcall multi_send_pinfo(int pnum, TCmdPlrInfoHdr *cmd) void __fastcall multi_send_pinfo(int pnum, TCmdPlrInfoHdr *cmd)
{ {
char v2; // bl char v2; // bl
@ -958,7 +927,6 @@ void __fastcall multi_send_pinfo(int pnum, TCmdPlrInfoHdr *cmd)
dthread_send_delta(v3, v4, &pkplr, 1266); dthread_send_delta(v3, v4, &pkplr, 1266);
} }
//----- (004409D5) --------------------------------------------------------
int __fastcall InitNewSeed(int newseed) int __fastcall InitNewSeed(int newseed)
{ {
int result; // eax int result; // eax
@ -985,7 +953,6 @@ int __fastcall InitNewSeed(int newseed)
return result; return result;
} }
//----- (00440A05) --------------------------------------------------------
void __cdecl SetupLocalCoords() void __cdecl SetupLocalCoords()
{ {
int x; // ecx int x; // ecx
@ -1025,7 +992,6 @@ void __cdecl SetupLocalCoords()
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (00440A9B) --------------------------------------------------------
int __fastcall multi_init_single(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info) int __fastcall multi_init_single(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info)
{ {
//int v3; // eax //int v3; // eax
@ -1056,7 +1022,6 @@ int __fastcall multi_init_single(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (00440B09) --------------------------------------------------------
int __fastcall multi_init_multi(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, int *a4) int __fastcall multi_init_multi(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, int *a4)
{ {
_SNETPLAYERDATA *v4; // ebx _SNETPLAYERDATA *v4; // ebx
@ -1097,7 +1062,6 @@ int __fastcall multi_init_multi(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *
// 678640: using guessed type char byte_678640; // 678640: using guessed type char byte_678640;
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (00440BDB) --------------------------------------------------------
int __fastcall multi_upgrade(int *a1) int __fastcall multi_upgrade(int *a1)
{ {
int *v1; // esi int *v1; // esi
@ -1122,7 +1086,6 @@ int __fastcall multi_upgrade(int *a1)
return result; return result;
} }
//----- (00440C17) --------------------------------------------------------
void __fastcall multi_player_joins(int pnum, TCmdPlrInfoHdr *cmd, int a3) void __fastcall multi_player_joins(int pnum, TCmdPlrInfoHdr *cmd, int a3)
{ {
int v3; // ebx int v3; // ebx

5
Source/multi.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __MULTI_H__
#define __MULTI_H__
//multi
extern char gbSomebodyWonGameKludge; // weak extern char gbSomebodyWonGameKludge; // weak
extern char pkdata_6761C0[4100]; extern char pkdata_6761C0[4100];
extern char szPlayerDescript[128]; extern char szPlayerDescript[128];
@ -69,3 +70,5 @@ void __fastcall multi_player_joins(int pnum, TCmdPlrInfoHdr *cmd, int a3);
extern int multi_inf; // weak extern int multi_inf; // weak
extern event_type event_types[3]; extern event_type event_types[3];
#endif /* __MULTI_H__ */

14
Source/nthread.cpp
View File

@ -25,7 +25,6 @@ int nthread_inf = 0x7F800000; // weak
/* rdata */ /* rdata */
static HANDLE sghThread = (HANDLE)0xFFFFFFFF; // idb static HANDLE sghThread = (HANDLE)0xFFFFFFFF; // idb
//----- (00440DB3) --------------------------------------------------------
struct nthread_cpp_init_1 struct nthread_cpp_init_1
{ {
nthread_cpp_init_1() nthread_cpp_init_1()
@ -36,7 +35,6 @@ struct nthread_cpp_init_1
// 47F164: using guessed type int nthread_inf; // 47F164: using guessed type int nthread_inf;
// 679700: using guessed type int nthread_cpp_init_value; // 679700: using guessed type int nthread_cpp_init_value;
//----- (00440DBE) --------------------------------------------------------
struct nthread_cpp_init_2 struct nthread_cpp_init_2
{ {
nthread_cpp_init_2() nthread_cpp_init_2()
@ -46,25 +44,21 @@ struct nthread_cpp_init_2
} }
} _nthread_cpp_init_2; } _nthread_cpp_init_2;
//----- (00440DC8) --------------------------------------------------------
void __cdecl nthread_init_mutex() void __cdecl nthread_init_mutex()
{ {
InitializeCriticalSection(&sgMemCrit); InitializeCriticalSection(&sgMemCrit);
} }
//----- (00440DD4) --------------------------------------------------------
void __cdecl nthread_cleanup_mutex_atexit() void __cdecl nthread_cleanup_mutex_atexit()
{ {
atexit(nthread_cleanup_mutex); atexit(nthread_cleanup_mutex);
} }
//----- (00440DE0) --------------------------------------------------------
void __cdecl nthread_cleanup_mutex() void __cdecl nthread_cleanup_mutex()
{ {
DeleteCriticalSection(&sgMemCrit); DeleteCriticalSection(&sgMemCrit);
} }
//----- (00440DEC) --------------------------------------------------------
void __fastcall nthread_terminate_game(char *pszFcn) void __fastcall nthread_terminate_game(char *pszFcn)
{ {
char *v1; // esi char *v1; // esi
@ -88,7 +82,6 @@ void __fastcall nthread_terminate_game(char *pszFcn)
} }
// 67862D: using guessed type char gbGameDestroyed; // 67862D: using guessed type char gbGameDestroyed;
//----- (00440E28) --------------------------------------------------------
int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta) int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta)
{ {
int v2; // ebx int v2; // ebx
@ -130,7 +123,6 @@ int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta)
// 679738: using guessed type int gdwTurnsInTransit; // 679738: using guessed type int gdwTurnsInTransit;
// 679754: using guessed type int dword_679754; // 679754: using guessed type int dword_679754;
//----- (00440EAA) --------------------------------------------------------
int __fastcall nthread_recv_turns(int *pfSendAsync) int __fastcall nthread_recv_turns(int *pfSendAsync)
{ {
int *v1; // esi int *v1; // esi
@ -174,14 +166,12 @@ LABEL_11:
// 679759: using guessed type char sgbPacketCountdown; // 679759: using guessed type char sgbPacketCountdown;
// 679764: using guessed type int dword_679764; // 679764: using guessed type int dword_679764;
//----- (00440F56) --------------------------------------------------------
void __cdecl nthread_set_turn_upper_bit() void __cdecl nthread_set_turn_upper_bit()
{ {
dword_679754 = 0x80000000; dword_679754 = 0x80000000;
} }
// 679754: using guessed type int dword_679754; // 679754: using guessed type int dword_679754;
//----- (00440F61) --------------------------------------------------------
void __fastcall nthread_start(bool set_turn_upper_bit) void __fastcall nthread_start(bool set_turn_upper_bit)
{ {
BOOL v1; // esi BOOL v1; // esi
@ -262,7 +252,6 @@ void __fastcall nthread_start(bool set_turn_upper_bit)
// 679760: using guessed type int gdwNormalMsgSize; // 679760: using guessed type int gdwNormalMsgSize;
// 679764: using guessed type int dword_679764; // 679764: using guessed type int dword_679764;
//----- (004410CF) --------------------------------------------------------
unsigned int __stdcall nthread_handler(void *a1) unsigned int __stdcall nthread_handler(void *a1)
{ {
signed int v1; // esi signed int v1; // esi
@ -293,7 +282,6 @@ unsigned int __stdcall nthread_handler(void *a1)
// 679734: using guessed type char byte_679734; // 679734: using guessed type char byte_679734;
// 679764: using guessed type int dword_679764; // 679764: using guessed type int dword_679764;
//----- (00441145) --------------------------------------------------------
void __cdecl nthread_cleanup() void __cdecl nthread_cleanup()
{ {
char *v0; // eax char *v0; // eax
@ -321,7 +309,6 @@ void __cdecl nthread_cleanup()
// 67975C: using guessed type int gdwLargestMsgSize; // 67975C: using guessed type int gdwLargestMsgSize;
// 679760: using guessed type int gdwNormalMsgSize; // 679760: using guessed type int gdwNormalMsgSize;
//----- (004411C4) --------------------------------------------------------
void __fastcall nthread_ignore_mutex(bool bStart) void __fastcall nthread_ignore_mutex(bool bStart)
{ {
bool v1; // bl bool v1; // bl
@ -338,7 +325,6 @@ void __fastcall nthread_ignore_mutex(bool bStart)
} }
// 67975A: using guessed type char sgbThreadIsRunning; // 67975A: using guessed type char sgbThreadIsRunning;
//----- (004411EF) --------------------------------------------------------
bool __cdecl nthread_has_500ms_passed() bool __cdecl nthread_has_500ms_passed()
{ {
DWORD v0; // eax DWORD v0; // eax

5
Source/nthread.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __NTHREAD_H__
#define __NTHREAD_H__
//nthread
extern int nthread_cpp_init_value; // weak extern int nthread_cpp_init_value; // weak
extern char byte_679704; // weak extern char byte_679704; // weak
extern int gdwMsgLenTbl[4]; extern int gdwMsgLenTbl[4];
@ -36,3 +37,5 @@ bool __cdecl nthread_has_500ms_passed();
/* data */ /* data */
extern int nthread_inf; // weak extern int nthread_inf; // weak
#endif /* __NTHREAD_H__ */

131
Source/objects.cpp
View File

@ -360,7 +360,6 @@ int StoryText[3][3] =
{ QUEST_BOOK31, QUEST_BOOK32, QUEST_BOOK33 } { QUEST_BOOK31, QUEST_BOOK32, QUEST_BOOK33 }
}; };
//----- (0044121D) --------------------------------------------------------
void __cdecl InitObjectGFX() void __cdecl InitObjectGFX()
{ {
ObjDataStruct *v0; // eax ObjDataStruct *v0; // eax
@ -425,7 +424,6 @@ void __cdecl InitObjectGFX()
// 67D7C4: using guessed type int numobjfiles; // 67D7C4: using guessed type int numobjfiles;
// 44121D: using guessed type char fileload[56]; // 44121D: using guessed type char fileload[56];
//----- (00441317) --------------------------------------------------------
void __cdecl FreeObjectGFX() void __cdecl FreeObjectGFX()
{ {
int i; // esi int i; // esi
@ -441,7 +439,6 @@ void __cdecl FreeObjectGFX()
} }
// 67D7C4: using guessed type int numobjfiles; // 67D7C4: using guessed type int numobjfiles;
//----- (00441345) --------------------------------------------------------
bool __fastcall RndLocOk(int xp, int yp) bool __fastcall RndLocOk(int xp, int yp)
{ {
int v2; // ecx int v2; // ecx
@ -462,7 +459,6 @@ bool __fastcall RndLocOk(int xp, int yp)
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (004413A0) --------------------------------------------------------
void __fastcall InitRndLocObj(int min, int max, int objtype) void __fastcall InitRndLocObj(int min, int max, int objtype)
{ {
int numobjs; // ebx int numobjs; // ebx
@ -513,7 +509,6 @@ void __fastcall InitRndLocObj(int min, int max, int objtype)
} }
} }
//----- (00441477) --------------------------------------------------------
void __fastcall InitRndLocBigObj(int min, int max, int objtype) void __fastcall InitRndLocBigObj(int min, int max, int objtype)
{ {
int xp; // edi int xp; // edi
@ -573,7 +568,6 @@ void __fastcall InitRndLocBigObj(int min, int max, int objtype)
} }
} }
//----- (00441584) --------------------------------------------------------
void __fastcall InitRndLocObj5x5(int min, int max, int objtype) void __fastcall InitRndLocObj5x5(int min, int max, int objtype)
{ {
int v3; // esi int v3; // esi
@ -636,7 +630,6 @@ void __fastcall InitRndLocObj5x5(int min, int max, int objtype)
} }
} }
//----- (0044163B) --------------------------------------------------------
void __cdecl ClrAllObjects() void __cdecl ClrAllObjects()
{ {
int *v0; // eax int *v0; // eax
@ -677,7 +670,6 @@ void __cdecl ClrAllObjects()
// 67976C: using guessed type int trapdir; // 67976C: using guessed type int trapdir;
// 67D7C8: using guessed type int hero_cpp_init_value; // 67D7C8: using guessed type int hero_cpp_init_value;
//----- (004416A8) --------------------------------------------------------
void __cdecl AddTortures() void __cdecl AddTortures()
{ {
int v0; // esi int v0; // esi
@ -715,7 +707,6 @@ void __cdecl AddTortures()
while ( v0 < 112 ); while ( v0 < 112 );
} }
//----- (0044179F) --------------------------------------------------------
void __cdecl AddCandles() void __cdecl AddCandles()
{ {
int v0; // esi int v0; // esi
@ -732,7 +723,6 @@ void __cdecl AddCandles()
AddObject(OBJ_STORYCANDLE, v0 + 2, v1); AddObject(OBJ_STORYCANDLE, v0 + 2, v1);
} }
//----- (004417E8) --------------------------------------------------------
void __fastcall AddBookLever(int lx1, int ly1, int lx2, int ly2, int x1, int y1, int x2, int y2, int msg) void __fastcall AddBookLever(int lx1, int ly1, int lx2, int ly2, int x1, int y1, int x2, int y2, int msg)
{ {
int v9; // esi int v9; // esi
@ -793,7 +783,6 @@ void __fastcall AddBookLever(int lx1, int ly1, int lx2, int ly2, int x1, int y1,
object[v16]._oVar6 = object[v16]._oAnimFrame + 1; object[v16]._oVar6 = object[v16]._oAnimFrame + 1;
} }
//----- (00441904) --------------------------------------------------------
void __cdecl InitRndBarrels() void __cdecl InitRndBarrels()
{ {
int v0; // ebp int v0; // ebp
@ -854,7 +843,6 @@ void __cdecl InitRndBarrels()
} }
} }
//----- (00441A00) --------------------------------------------------------
void __fastcall AddL1Objs(int x1, int y1, int x2, int y2) void __fastcall AddL1Objs(int x1, int y1, int x2, int y2)
{ {
int v4; // ebx int v4; // ebx
@ -887,7 +875,6 @@ void __fastcall AddL1Objs(int x1, int y1, int x2, int y2)
} }
} }
//----- (00441A98) --------------------------------------------------------
void __fastcall AddL2Objs(int x1, int y1, int x2, int y2) void __fastcall AddL2Objs(int x1, int y1, int x2, int y2)
{ {
int v4; // ebx int v4; // ebx
@ -918,7 +905,6 @@ void __fastcall AddL2Objs(int x1, int y1, int x2, int y2)
} }
} }
//----- (00441B16) --------------------------------------------------------
void __fastcall AddL3Objs(int x1, int y1, int x2, int y2) void __fastcall AddL3Objs(int x1, int y1, int x2, int y2)
{ {
int v4; // edi int v4; // edi
@ -949,13 +935,11 @@ void __fastcall AddL3Objs(int x1, int y1, int x2, int y2)
} }
} }
//----- (00441B8A) --------------------------------------------------------
bool __fastcall WallTrapLocOk(int xp, int yp) bool __fastcall WallTrapLocOk(int xp, int yp)
{ {
return (~dFlags[xp][yp] & 8u) >> 3; return (~dFlags[xp][yp] & 8u) >> 3;
} }
//----- (00441BA0) --------------------------------------------------------
void __cdecl AddL2Torches() void __cdecl AddL2Torches()
{ {
int v0; // esi int v0; // esi
@ -1019,7 +1003,6 @@ LABEL_18:
while ( (signed int)v7 < (signed int)dPiece[1] ); while ( (signed int)v7 < (signed int)dPiece[1] );
} }
//----- (00441C8C) --------------------------------------------------------
bool __fastcall TorchLocOK(int xp, int yp) bool __fastcall TorchLocOK(int xp, int yp)
{ {
int v2; // ecx int v2; // ecx
@ -1033,7 +1016,6 @@ bool __fastcall TorchLocOK(int xp, int yp)
return result; return result;
} }
//----- (00441CB3) --------------------------------------------------------
void __cdecl AddObjTraps() void __cdecl AddObjTraps()
{ {
int v0; // esi int v0; // esi
@ -1128,7 +1110,6 @@ LABEL_28:
while ( (signed int)v12 < (signed int)dPiece ); while ( (signed int)v12 < (signed int)dPiece );
} }
//----- (00441E58) --------------------------------------------------------
void __cdecl AddChestTraps() void __cdecl AddChestTraps()
{ {
signed int v0; // ebp signed int v0; // ebp
@ -1172,7 +1153,6 @@ void __cdecl AddChestTraps()
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (00441EE4) --------------------------------------------------------
void __fastcall LoadMapObjects(unsigned char *pMap, int startx, int starty, int x1, int y1, int w, int h, int leveridx) void __fastcall LoadMapObjects(unsigned char *pMap, int startx, int starty, int x1, int y1, int w, int h, int leveridx)
{ {
unsigned char *v8; // ebx unsigned char *v8; // ebx
@ -1229,7 +1209,6 @@ void __fastcall LoadMapObjects(unsigned char *pMap, int startx, int starty, int
} }
// 67D7C0: using guessed type int InitObjFlag; // 67D7C0: using guessed type int InitObjFlag;
//----- (00441FAF) --------------------------------------------------------
void __fastcall LoadMapObjs(unsigned char *pMap, int startx, int starty) void __fastcall LoadMapObjs(unsigned char *pMap, int startx, int starty)
{ {
unsigned char *v3; // esi unsigned char *v3; // esi
@ -1276,7 +1255,6 @@ void __fastcall LoadMapObjs(unsigned char *pMap, int startx, int starty)
} }
// 67D7C0: using guessed type int InitObjFlag; // 67D7C0: using guessed type int InitObjFlag;
//----- (00442036) --------------------------------------------------------
void __cdecl AddDiabObjs() void __cdecl AddDiabObjs()
{ {
unsigned char *v0; // esi unsigned char *v0; // esi
@ -1296,7 +1274,6 @@ void __cdecl AddDiabObjs()
// 5289C4: using guessed type int diabquad1x; // 5289C4: using guessed type int diabquad1x;
// 5289C8: using guessed type int diabquad1y; // 5289C8: using guessed type int diabquad1y;
//----- (004420F2) --------------------------------------------------------
void __cdecl AddStoryBooks() void __cdecl AddStoryBooks()
{ {
int v0; // esi int v0; // esi
@ -1344,7 +1321,6 @@ void __cdecl AddStoryBooks()
AddObject(OBJ_STORYCANDLE, v4, v1 + 1); AddObject(OBJ_STORYCANDLE, v4, v1 + 1);
} }
//----- (004421CA) --------------------------------------------------------
void __fastcall AddHookedBodies(int freq) void __fastcall AddHookedBodies(int freq)
{ {
int v1; // ebx int v1; // ebx
@ -1436,7 +1412,6 @@ LABEL_22:
while ( v1 < 96 ); while ( v1 < 96 );
} }
//----- (0044229F) --------------------------------------------------------
void __cdecl AddL4Goodies() void __cdecl AddL4Goodies()
{ {
AddHookedBodies(6); AddHookedBodies(6);
@ -1451,7 +1426,6 @@ void __cdecl AddL4Goodies()
InitRndLocObj(1, 3, OBJ_CAULDRON); InitRndLocObj(1, 3, OBJ_CAULDRON);
} }
//----- (00442316) --------------------------------------------------------
void __cdecl AddLazStand() void __cdecl AddLazStand()
{ {
int v0; // edi int v0; // edi
@ -1505,7 +1479,6 @@ void __cdecl AddLazStand()
AddObject(OBJ_STORYCANDLE, v4, v1 + 1); AddObject(OBJ_STORYCANDLE, v4, v1 + 1);
} }
//----- (00442418) --------------------------------------------------------
void __fastcall InitObjects(int a1) void __fastcall InitObjects(int a1)
{ {
//int v1; // eax //int v1; // eax
@ -1684,7 +1657,6 @@ void __fastcall InitObjects(int a1)
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
// 67D7C0: using guessed type int InitObjFlag; // 67D7C0: using guessed type int InitObjFlag;
//----- (004427C5) --------------------------------------------------------
void __fastcall SetMapObjects(char *pMap, int startx, int starty) void __fastcall SetMapObjects(char *pMap, int startx, int starty)
{ {
char *v3; // esi char *v3; // esi
@ -1794,7 +1766,6 @@ void __fastcall SetMapObjects(char *pMap, int startx, int starty)
// 67D7C4: using guessed type int numobjfiles; // 67D7C4: using guessed type int numobjfiles;
// 4427C5: using guessed type int var_10C[56]; // 4427C5: using guessed type int var_10C[56];
//----- (0044292B) --------------------------------------------------------
void __fastcall DeleteObject(int oi, int i) void __fastcall DeleteObject(int oi, int i)
{ {
int v2; // eax int v2; // eax
@ -1811,7 +1782,6 @@ void __fastcall DeleteObject(int oi, int i)
objectactive[i] = objectactive[v2]; objectactive[i] = objectactive[v2];
} }
//----- (0044297B) --------------------------------------------------------
void __fastcall SetupObject(int i, int x, int y, int ot) void __fastcall SetupObject(int i, int x, int y, int ot)
{ {
int v4; // esi int v4; // esi
@ -1873,7 +1843,6 @@ void __fastcall SetupObject(int i, int x, int y, int ot)
object[v4]._oDoorFlag = 0; object[v4]._oDoorFlag = 0;
} }
//----- (00442A9D) --------------------------------------------------------
void __fastcall SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v) void __fastcall SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v)
{ {
object[i]._oVar1 = x1; object[i]._oVar1 = x1;
@ -1883,13 +1852,11 @@ void __fastcall SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v)
object[i]._oVar8 = v; object[i]._oVar8 = v;
} }
//----- (00442AD1) --------------------------------------------------------
void __fastcall SetBookMsg(int i, int msg) void __fastcall SetBookMsg(int i, int msg)
{ {
object[i]._oVar7 = msg; object[i]._oVar7 = msg;
} }
//----- (00442ADB) --------------------------------------------------------
void __fastcall AddL1Door(int i, int x, int y, int ot) void __fastcall AddL1Door(int i, int x, int y, int ot)
{ {
int v4; // ecx int v4; // ecx
@ -1919,7 +1886,6 @@ void __fastcall AddL1Door(int i, int x, int y, int ot)
object[v4]._oVar2 = v8; object[v4]._oVar2 = v8;
} }
//----- (00442B2C) --------------------------------------------------------
void __fastcall AddSCambBook(int i) void __fastcall AddSCambBook(int i)
{ {
object[i]._oVar1 = setpc_x; object[i]._oVar1 = setpc_x;
@ -1931,7 +1897,6 @@ void __fastcall AddSCambBook(int i)
// 5CF330: using guessed type int setpc_h; // 5CF330: using guessed type int setpc_h;
// 5CF334: using guessed type int setpc_w; // 5CF334: using guessed type int setpc_w;
//----- (00442B75) --------------------------------------------------------
void __fastcall AddChest(int i, int t) void __fastcall AddChest(int i, int t)
{ {
int v2; // edi int v2; // edi
@ -1991,7 +1956,6 @@ LABEL_22:
} }
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
//----- (00442C27) --------------------------------------------------------
void __fastcall AddL2Door(int i, int x, int y, int ot) void __fastcall AddL2Door(int i, int x, int y, int ot)
{ {
int v4; // esi int v4; // esi
@ -2005,7 +1969,6 @@ void __fastcall AddL2Door(int i, int x, int y, int ot)
object[v4]._oVar4 = 0; object[v4]._oVar4 = 0;
} }
//----- (00442C62) --------------------------------------------------------
void __fastcall AddL3Door(int i, int x, int y, int ot) void __fastcall AddL3Door(int i, int x, int y, int ot)
{ {
int v4; // esi int v4; // esi
@ -2019,7 +1982,6 @@ void __fastcall AddL3Door(int i, int x, int y, int ot)
object[v4]._oVar4 = 0; object[v4]._oVar4 = 0;
} }
//----- (00442C9D) --------------------------------------------------------
void __fastcall AddSarc(int i) void __fastcall AddSarc(int i)
{ {
int v1; // esi int v1; // esi
@ -2043,7 +2005,6 @@ void __fastcall AddSarc(int i)
object[v1]._oVar2 = PreSpawnSkeleton(); object[v1]._oVar2 = PreSpawnSkeleton();
} }
//----- (00442CEE) --------------------------------------------------------
void __fastcall AddFlameTrap(int i) void __fastcall AddFlameTrap(int i)
{ {
object[i]._oVar1 = trapid; object[i]._oVar1 = trapid;
@ -2054,7 +2015,6 @@ void __fastcall AddFlameTrap(int i)
// 679768: using guessed type int trapid; // 679768: using guessed type int trapid;
// 67976C: using guessed type int trapdir; // 67976C: using guessed type int trapdir;
//----- (00442D16) --------------------------------------------------------
void __fastcall AddFlameLvr(int i) void __fastcall AddFlameLvr(int i)
{ {
object[i]._oVar1 = trapid; object[i]._oVar1 = trapid;
@ -2062,7 +2022,6 @@ void __fastcall AddFlameLvr(int i)
} }
// 679768: using guessed type int trapid; // 679768: using guessed type int trapid;
//----- (00442D2F) --------------------------------------------------------
void __fastcall AddTrap(int i) void __fastcall AddTrap(int i)
{ {
int mt; // eax int mt; // eax
@ -2077,7 +2036,6 @@ void __fastcall AddTrap(int i)
object[i]._oVar4 = 0; object[i]._oVar4 = 0;
} }
//----- (00442D8A) --------------------------------------------------------
void __fastcall AddObjLight(int i, int r) void __fastcall AddObjLight(int i, int r)
{ {
if ( InitObjFlag ) if ( InitObjFlag )
@ -2092,7 +2050,6 @@ void __fastcall AddObjLight(int i, int r)
} }
// 67D7C0: using guessed type int InitObjFlag; // 67D7C0: using guessed type int InitObjFlag;
//----- (00442DC1) --------------------------------------------------------
void __fastcall AddBarrel(int i) void __fastcall AddBarrel(int i)
{ {
int v1; // esi int v1; // esi
@ -2120,7 +2077,6 @@ void __fastcall AddBarrel(int i)
object[v1]._oVar4 = PreSpawnSkeleton(); object[v1]._oVar4 = PreSpawnSkeleton();
} }
//----- (00442E0F) --------------------------------------------------------
void __fastcall AddShrine(int i) void __fastcall AddShrine(int i)
{ {
int v1; // esi int v1; // esi
@ -2173,7 +2129,6 @@ void __fastcall AddShrine(int i)
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
// 442E0F: using guessed type int var_68[26]; // 442E0F: using guessed type int var_68[26];
//----- (00442EB2) --------------------------------------------------------
void __fastcall AddBookcase(int i) void __fastcall AddBookcase(int i)
{ {
int v1; // esi int v1; // esi
@ -2183,7 +2138,6 @@ void __fastcall AddBookcase(int i)
object[v1]._oPreFlag = 1; object[v1]._oPreFlag = 1;
} }
//----- (00442ECF) --------------------------------------------------------
void __fastcall AddPurifyingFountain(int i) void __fastcall AddPurifyingFountain(int i)
{ {
char *v1; // eax char *v1; // eax
@ -2195,7 +2149,6 @@ void __fastcall AddPurifyingFountain(int i)
object[i]._oRndSeed = GetRndSeed(); object[i]._oRndSeed = GetRndSeed();
} }
//----- (00442F08) --------------------------------------------------------
void __fastcall AddArmorStand(int i) void __fastcall AddArmorStand(int i)
{ {
int v1; // eax int v1; // eax
@ -2210,7 +2163,6 @@ void __fastcall AddArmorStand(int i)
} }
// 6AAA3C: using guessed type int armorFlag; // 6AAA3C: using guessed type int armorFlag;
//----- (00442F3A) --------------------------------------------------------
void __fastcall AddDecap(int i) void __fastcall AddDecap(int i)
{ {
int v1; // esi int v1; // esi
@ -2227,7 +2179,6 @@ void __fastcall AddDecap(int i)
object[v1]._oAnimFrame = v4 + 1; object[v1]._oAnimFrame = v4 + 1;
} }
//----- (00442F68) --------------------------------------------------------
void __fastcall AddVilebook(int i) void __fastcall AddVilebook(int i)
{ {
if ( setlevel ) if ( setlevel )
@ -2239,7 +2190,6 @@ void __fastcall AddVilebook(int i)
// 5CCB10: using guessed type char setlvlnum; // 5CCB10: using guessed type char setlvlnum;
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
//----- (00442F88) --------------------------------------------------------
void __fastcall AddMagicCircle(int i) void __fastcall AddMagicCircle(int i)
{ {
int v1; // esi int v1; // esi
@ -2253,13 +2203,11 @@ void __fastcall AddMagicCircle(int i)
object[v1]._oVar5 = 1; object[v1]._oVar5 = 1;
} }
//----- (00442FB1) --------------------------------------------------------
void __fastcall AddBookstand(int i) void __fastcall AddBookstand(int i)
{ {
object[i]._oRndSeed = GetRndSeed(); object[i]._oRndSeed = GetRndSeed();
} }
//----- (00442FC4) --------------------------------------------------------
void __fastcall AddPedistal(int i) void __fastcall AddPedistal(int i)
{ {
int v1; // ecx int v1; // ecx
@ -2283,7 +2231,6 @@ void __fastcall AddPedistal(int i)
// 5CF330: using guessed type int setpc_h; // 5CF330: using guessed type int setpc_h;
// 5CF334: using guessed type int setpc_w; // 5CF334: using guessed type int setpc_w;
//----- (00442FFC) --------------------------------------------------------
void __fastcall AddStoryBook(int i) void __fastcall AddStoryBook(int i)
{ {
int bookframe; // eax int bookframe; // eax
@ -2305,7 +2252,6 @@ void __fastcall AddStoryBook(int i)
object[i]._oVar4 = v7 + 1; object[i]._oVar4 = v7 + 1;
} }
//----- (0044308E) --------------------------------------------------------
void __fastcall AddWeaponRack(int i) void __fastcall AddWeaponRack(int i)
{ {
if ( !weaponFlag ) if ( !weaponFlag )
@ -2317,7 +2263,6 @@ void __fastcall AddWeaponRack(int i)
} }
// 6AAA50: using guessed type int weaponFlag; // 6AAA50: using guessed type int weaponFlag;
//----- (004430C0) --------------------------------------------------------
void __fastcall AddTorturedBody(int i) void __fastcall AddTorturedBody(int i)
{ {
object[i]._oRndSeed = GetRndSeed(); object[i]._oRndSeed = GetRndSeed();
@ -2325,7 +2270,6 @@ void __fastcall AddTorturedBody(int i)
object[i]._oAnimFrame = random(0, 4) + 1; object[i]._oAnimFrame = random(0, 4) + 1;
} }
//----- (004430EE) --------------------------------------------------------
void __fastcall GetRndObjLoc(int randarea, int *xx, int *yy) void __fastcall GetRndObjLoc(int randarea, int *xx, int *yy)
{ {
int *v3; // ebx int *v3; // ebx
@ -2382,7 +2326,6 @@ LABEL_3:
} }
} }
//----- (00443178) --------------------------------------------------------
void __cdecl AddMushPatch() void __cdecl AddMushPatch()
{ {
int i; // bl int i; // bl
@ -2400,7 +2343,6 @@ void __cdecl AddMushPatch()
} }
} }
//----- (004431D4) --------------------------------------------------------
void __cdecl AddSlainHero() void __cdecl AddSlainHero()
{ {
int x; // [esp+0h] [ebp-8h] int x; // [esp+0h] [ebp-8h]
@ -2410,7 +2352,6 @@ void __cdecl AddSlainHero()
AddObject(OBJ_SLAINHERO, x + 2, y + 2); AddObject(OBJ_SLAINHERO, x + 2, y + 2);
} }
//----- (004431FF) --------------------------------------------------------
void __fastcall AddObject(int ot, int ox, int oy) void __fastcall AddObject(int ot, int ox, int oy)
{ {
int v3; // ebp int v3; // ebp
@ -2563,7 +2504,6 @@ LABEL_31:
} }
} }
//----- (004434CB) --------------------------------------------------------
void __fastcall Obj_Light(int i, int lr) void __fastcall Obj_Light(int i, int lr)
{ {
int v2; // esi int v2; // esi
@ -2622,7 +2562,6 @@ LABEL_15:
} }
// 646A28: using guessed type int lightflag; // 646A28: using guessed type int lightflag;
//----- (004435B5) --------------------------------------------------------
void __fastcall Obj_Circle(int i) void __fastcall Obj_Circle(int i)
{ {
int v1; // ecx int v1; // ecx
@ -2685,7 +2624,6 @@ void __fastcall Obj_Circle(int i)
} }
// 525748: using guessed type char sgbMouseDown; // 525748: using guessed type char sgbMouseDown;
//----- (00443727) --------------------------------------------------------
void __fastcall Obj_StopAnim(int i) void __fastcall Obj_StopAnim(int i)
{ {
if ( object[i]._oAnimFrame == object[i]._oAnimLen ) if ( object[i]._oAnimFrame == object[i]._oAnimLen )
@ -2695,7 +2633,6 @@ void __fastcall Obj_StopAnim(int i)
} }
} }
//----- (0044374A) --------------------------------------------------------
void __fastcall Obj_Door(int i) void __fastcall Obj_Door(int i)
{ {
int dy; // edx int dy; // edx
@ -2720,14 +2657,12 @@ void __fastcall Obj_Door(int i)
} }
} }
//----- (004437CD) --------------------------------------------------------
void __fastcall Obj_Sarc(int i) void __fastcall Obj_Sarc(int i)
{ {
if ( object[i]._oAnimFrame == object[i]._oAnimLen ) if ( object[i]._oAnimFrame == object[i]._oAnimLen )
object[i]._oAnimFlag = 0; object[i]._oAnimFlag = 0;
} }
//----- (004437E6) --------------------------------------------------------
void __fastcall ActivateTrapLine(int ttype, int tid) void __fastcall ActivateTrapLine(int ttype, int tid)
{ {
int v2; // edi int v2; // edi
@ -2754,7 +2689,6 @@ void __fastcall ActivateTrapLine(int ttype, int tid)
} }
} }
//----- (00443855) --------------------------------------------------------
void __fastcall Obj_FlameTrap(int i) void __fastcall Obj_FlameTrap(int i)
{ {
int v1; // ecx int v1; // ecx
@ -2845,7 +2779,6 @@ LABEL_24:
ActivateTrapLine(object[v1]._otype, object[v1]._oVar1); ActivateTrapLine(object[v1]._otype, object[v1]._oVar1);
} }
//----- (00443966) --------------------------------------------------------
void __fastcall Obj_Trap(int i) void __fastcall Obj_Trap(int i)
{ {
int edi1; // edi int edi1; // edi
@ -2942,7 +2875,6 @@ LABEL_10:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00443AD5) --------------------------------------------------------
void __fastcall Obj_BCrossDamage(int i) void __fastcall Obj_BCrossDamage(int i)
{ {
int v1; // esi int v1; // esi
@ -3003,7 +2935,6 @@ LABEL_15:
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (00443BD2) --------------------------------------------------------
void __cdecl ProcessObjects() void __cdecl ProcessObjects()
{ {
int v0; // ebx int v0; // ebx
@ -3144,7 +3075,6 @@ LABEL_45:
} }
} }
//----- (00443D69) --------------------------------------------------------
void __fastcall ObjSetMicro(int dx, int dy, int pn) void __fastcall ObjSetMicro(int dx, int dy, int pn)
{ {
int v3; // esi int v3; // esi
@ -3182,7 +3112,6 @@ void __fastcall ObjSetMicro(int dx, int dy, int pn)
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (00443DEA) --------------------------------------------------------
void __fastcall objects_set_door_piece(int x, int y) void __fastcall objects_set_door_piece(int x, int y)
{ {
int v2; // edi int v2; // edi
@ -3200,7 +3129,6 @@ void __fastcall objects_set_door_piece(int x, int y)
dpiece_defs_map_1[0][0][16 * gendung_get_dpiece_num_from_coord(v3, v2) + 1] = v6; dpiece_defs_map_1[0][0][16 * gendung_get_dpiece_num_from_coord(v3, v2) + 1] = v6;
} }
//----- (00443E62) --------------------------------------------------------
void __fastcall ObjSetMini(int x, int y, int v) void __fastcall ObjSetMini(int x, int y, int v)
{ {
unsigned short *v3; // esi unsigned short *v3; // esi
@ -3233,7 +3161,6 @@ void __fastcall ObjSetMini(int x, int y, int v)
ObjSetMicro(v10 + 1, v11, v9); ObjSetMicro(v10 + 1, v11, v9);
} }
//----- (00443EDA) --------------------------------------------------------
void __fastcall ObjL1Special(int x1, int y1, int x2, int y2) void __fastcall ObjL1Special(int x1, int y1, int x2, int y2)
{ {
int i; // ebx int i; // ebx
@ -3292,7 +3219,6 @@ void __fastcall ObjL1Special(int x1, int y1, int x2, int y2)
} }
} }
//----- (00443FC6) --------------------------------------------------------
void __fastcall ObjL2Special(int x1, int y1, int x2, int y2) void __fastcall ObjL2Special(int x1, int y1, int x2, int y2)
{ {
int v4; // edi int v4; // edi
@ -3379,7 +3305,6 @@ void __fastcall ObjL2Special(int x1, int y1, int x2, int y2)
} }
} }
//----- (004440C2) --------------------------------------------------------
void __fastcall DoorSet(int oi, int dx, int dy) void __fastcall DoorSet(int oi, int dx, int dy)
{ {
int v3; // esi int v3; // esi
@ -3432,7 +3357,6 @@ LABEL_10:
} }
} }
//----- (00444246) --------------------------------------------------------
void __cdecl RedoPlayerVision() void __cdecl RedoPlayerVision()
{ {
int *v0; // esi int *v0; // esi
@ -3450,7 +3374,6 @@ void __cdecl RedoPlayerVision()
while ( (signed int)v0 < (signed int)&plr[4].plrlevel ); while ( (signed int)v0 < (signed int)&plr[4].plrlevel );
} }
//----- (0044427B) --------------------------------------------------------
void __fastcall OperateL1RDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL1RDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3523,7 +3446,6 @@ void __fastcall OperateL1RDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (0044443C) --------------------------------------------------------
void __fastcall OperateL1LDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL1LDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3599,7 +3521,6 @@ void __fastcall OperateL1LDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00444613) --------------------------------------------------------
void __fastcall OperateL2RDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL2RDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3654,7 +3575,6 @@ void __fastcall OperateL2RDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00444775) --------------------------------------------------------
void __fastcall OperateL2LDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL2LDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3709,7 +3629,6 @@ void __fastcall OperateL2LDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004448D7) --------------------------------------------------------
void __fastcall OperateL3RDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL3RDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3764,7 +3683,6 @@ void __fastcall OperateL3RDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00444A3C) --------------------------------------------------------
void __fastcall OperateL3LDoor(int pnum, int oi, unsigned char sendflag) void __fastcall OperateL3LDoor(int pnum, int oi, unsigned char sendflag)
{ {
int v3; // esi int v3; // esi
@ -3819,7 +3737,6 @@ void __fastcall OperateL3LDoor(int pnum, int oi, unsigned char sendflag)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00444BA1) --------------------------------------------------------
void __fastcall MonstCheckDoors(int m) void __fastcall MonstCheckDoors(int m)
{ {
int v1; // ecx int v1; // ecx
@ -3964,7 +3881,6 @@ LABEL_17:
} }
} }
//----- (00444DC3) --------------------------------------------------------
void __fastcall ObjChangeMap(int x1, int y1, int x2, int y2) void __fastcall ObjChangeMap(int x1, int y1, int x2, int y2)
{ {
int v4; // ebx int v4; // ebx
@ -4013,7 +3929,6 @@ void __fastcall ObjChangeMap(int x1, int y1, int x2, int y2)
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (00444E9E) --------------------------------------------------------
void __fastcall ObjChangeMapResync(int x1, int y1, int x2, int y2) void __fastcall ObjChangeMapResync(int x1, int y1, int x2, int y2)
{ {
int v4; // edi int v4; // edi
@ -4052,7 +3967,6 @@ void __fastcall ObjChangeMapResync(int x1, int y1, int x2, int y2)
} }
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
//----- (00444F4F) --------------------------------------------------------
void __fastcall OperateL1Door(int pnum, int i, unsigned char sendflag) void __fastcall OperateL1Door(int pnum, int i, unsigned char sendflag)
{ {
int v3; // ebx int v3; // ebx
@ -4096,7 +4010,6 @@ LABEL_6:
OperateL1RDoor(pnuma, v3, sendflag); OperateL1RDoor(pnuma, v3, sendflag);
} }
//----- (00444FDE) --------------------------------------------------------
void __fastcall OperateLever(int pnum, int i) void __fastcall OperateLever(int pnum, int i)
{ {
int v2; // esi int v2; // esi
@ -4144,7 +4057,6 @@ LABEL_17:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004450AC) --------------------------------------------------------
void __fastcall OperateBook(int pnum, int i) void __fastcall OperateBook(int pnum, int i)
{ {
int esi1; // esi int esi1; // esi
@ -4260,7 +4172,6 @@ LABEL_17:
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004452D1) --------------------------------------------------------
void __fastcall OperateBookLever(int pnum, int i) void __fastcall OperateBookLever(int pnum, int i)
{ {
int v2; // esi int v2; // esi
@ -4334,7 +4245,6 @@ void __fastcall OperateBookLever(int pnum, int i)
// 5A5590: using guessed type char TransVal; // 5A5590: using guessed type char TransVal;
// 646D00: using guessed type char qtextflag; // 646D00: using guessed type char qtextflag;
//----- (00445483) --------------------------------------------------------
void __fastcall OperateSChambBk(int pnum, int i) void __fastcall OperateSChambBk(int pnum, int i)
{ {
int v2; // esi int v2; // esi
@ -4382,7 +4292,6 @@ void __fastcall OperateSChambBk(int pnum, int i)
} }
// 646D00: using guessed type char qtextflag; // 646D00: using guessed type char qtextflag;
//----- (0044555A) --------------------------------------------------------
void __fastcall OperateChest(int pnum, int i, unsigned char sendmsg) void __fastcall OperateChest(int pnum, int i, unsigned char sendmsg)
{ {
int v3; // esi int v3; // esi
@ -4477,7 +4386,6 @@ LABEL_26:
// 5CF31D: using guessed type char setlevel; // 5CF31D: using guessed type char setlevel;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004456E3) --------------------------------------------------------
void __fastcall OperateMushPatch(int pnum, int i) void __fastcall OperateMushPatch(int pnum, int i)
{ {
int v2; // esi int v2; // esi
@ -4533,7 +4441,6 @@ void __fastcall OperateMushPatch(int pnum, int i)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004457B8) --------------------------------------------------------
void __fastcall OperateInnSignChest(int pnum, int i) void __fastcall OperateInnSignChest(int pnum, int i)
{ {
char v2; // al char v2; // al
@ -4581,7 +4488,6 @@ LABEL_8:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00445880) --------------------------------------------------------
void __fastcall OperateSlainHero(int pnum, int i, unsigned char sendmsg) void __fastcall OperateSlainHero(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // di unsigned short v3; // di
@ -4631,7 +4537,6 @@ LABEL_10:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00445954) --------------------------------------------------------
void __fastcall OperateTrapLvr(int i) void __fastcall OperateTrapLvr(int i)
{ {
int v1; // ecx int v1; // ecx
@ -4684,7 +4589,6 @@ void __fastcall OperateTrapLvr(int i)
} }
} }
//----- (00445A0B) --------------------------------------------------------
void __fastcall OperateSarc(int pnum, int i, unsigned char sendmsg) void __fastcall OperateSarc(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // bp unsigned short v3; // bp
@ -4723,7 +4627,6 @@ void __fastcall OperateSarc(int pnum, int i, unsigned char sendmsg)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00445ADC) --------------------------------------------------------
void __fastcall OperateL2Door(int pnum, int i, unsigned char sendflag) void __fastcall OperateL2Door(int pnum, int i, unsigned char sendflag)
{ {
int v3; // ebx int v3; // ebx
@ -4767,7 +4670,6 @@ LABEL_6:
OperateL2RDoor(pnuma, v3, sendflag); OperateL2RDoor(pnuma, v3, sendflag);
} }
//----- (00445B6C) --------------------------------------------------------
void __fastcall OperateL3Door(int pnum, int i, unsigned char sendflag) void __fastcall OperateL3Door(int pnum, int i, unsigned char sendflag)
{ {
int v3; // ebx int v3; // ebx
@ -4811,7 +4713,6 @@ LABEL_6:
OperateL3LDoor(pnuma, v3, sendflag); OperateL3LDoor(pnuma, v3, sendflag);
} }
//----- (00445BFC) --------------------------------------------------------
void __fastcall OperatePedistal(int pnum, int i) void __fastcall OperatePedistal(int pnum, int i)
{ {
int v2; // esi int v2; // esi
@ -4857,7 +4758,6 @@ void __fastcall OperatePedistal(int pnum, int i)
// 5CF334: using guessed type int setpc_w; // 5CF334: using guessed type int setpc_w;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00445D5F) --------------------------------------------------------
void __fastcall TryDisarm(int pnum, int i) void __fastcall TryDisarm(int pnum, int i)
{ {
int v2; // edi int v2; // edi
@ -4907,7 +4807,6 @@ void __fastcall TryDisarm(int pnum, int i)
} }
} }
//----- (00445E33) --------------------------------------------------------
int __fastcall ItemMiscIdIdx(int imiscid) int __fastcall ItemMiscIdIdx(int imiscid)
{ {
int result; // eax int result; // eax
@ -4919,7 +4818,6 @@ int __fastcall ItemMiscIdIdx(int imiscid)
return result; return result;
} }
//----- (00445E4B) --------------------------------------------------------
void __fastcall OperateShrine(int pnum, int i, int sType) void __fastcall OperateShrine(int pnum, int i, int sType)
{ {
int v3; // esi int v3; // esi
@ -5954,7 +5852,6 @@ LABEL_280:
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00446E6A) --------------------------------------------------------
void __fastcall OperateSkelBook(int pnum, int i, unsigned char sendmsg) void __fastcall OperateSkelBook(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // di unsigned short v3; // di
@ -5994,7 +5891,6 @@ void __fastcall OperateSkelBook(int pnum, int i, unsigned char sendmsg)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00446F08) --------------------------------------------------------
void __fastcall OperateBookCase(int pnum, int i, unsigned char sendmsg) void __fastcall OperateBookCase(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // di unsigned short v3; // di
@ -6035,7 +5931,6 @@ void __fastcall OperateBookCase(int pnum, int i, unsigned char sendmsg)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00446FE8) --------------------------------------------------------
void __fastcall OperateDecap(int pnum, int i, unsigned char sendmsg) void __fastcall OperateDecap(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // bp unsigned short v3; // bp
@ -6063,7 +5958,6 @@ void __fastcall OperateDecap(int pnum, int i, unsigned char sendmsg)
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00447046) --------------------------------------------------------
void __fastcall OperateArmorStand(int pnum, int i, unsigned char sendmsg) void __fastcall OperateArmorStand(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // di unsigned short v3; // di
@ -6122,7 +6016,6 @@ LABEL_15:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (0044710C) --------------------------------------------------------
int __fastcall FindValidShrine(int i) int __fastcall FindValidShrine(int i)
{ {
bool done; // esi bool done; // esi
@ -6149,7 +6042,6 @@ int __fastcall FindValidShrine(int i)
} }
// 679660: using guessed type char gbMaxPlayers; // 679660: using guessed type char gbMaxPlayers;
//----- (0044715F) --------------------------------------------------------
void __fastcall OperateGoatShrine(int pnum, int i, int sType) void __fastcall OperateGoatShrine(int pnum, int i, int sType)
{ {
int v3; // edi int v3; // edi
@ -6167,7 +6059,6 @@ void __fastcall OperateGoatShrine(int pnum, int i, int sType)
} }
// 52571C: using guessed type int drawpanflag; // 52571C: using guessed type int drawpanflag;
//----- (004471AA) --------------------------------------------------------
void __fastcall OperateCauldron(int pnum, int i, int sType) void __fastcall OperateCauldron(int pnum, int i, int sType)
{ {
int v3; // edi int v3; // edi
@ -6186,7 +6077,6 @@ void __fastcall OperateCauldron(int pnum, int i, int sType)
} }
// 52571C: using guessed type int drawpanflag; // 52571C: using guessed type int drawpanflag;
//----- (004471FC) --------------------------------------------------------
bool __fastcall OperateFountains(int pnum, int i) bool __fastcall OperateFountains(int pnum, int i)
{ {
unsigned short v2; // bx unsigned short v2; // bx
@ -6366,7 +6256,6 @@ LABEL_38:
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004474AD) --------------------------------------------------------
void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg) void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg)
{ {
unsigned short v3; // di unsigned short v3; // di
@ -6436,7 +6325,6 @@ LABEL_12:
// 5BB1ED: using guessed type char leveltype; // 5BB1ED: using guessed type char leveltype;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00447558) --------------------------------------------------------
void __fastcall OperateStoryBook(int pnum, int i) void __fastcall OperateStoryBook(int pnum, int i)
{ {
unsigned short v2; // di unsigned short v2; // di
@ -6459,7 +6347,6 @@ void __fastcall OperateStoryBook(int pnum, int i)
// 646D00: using guessed type char qtextflag; // 646D00: using guessed type char qtextflag;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (004475BB) --------------------------------------------------------
void __fastcall OperateLazStand(int pnum, int i) void __fastcall OperateLazStand(int pnum, int i)
{ {
int v2; // eax int v2; // eax
@ -6480,7 +6367,6 @@ void __fastcall OperateLazStand(int pnum, int i)
// 646D00: using guessed type char qtextflag; // 646D00: using guessed type char qtextflag;
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00447620) --------------------------------------------------------
void __fastcall OperateObject(int pnum, int i, unsigned char TeleFlag) void __fastcall OperateObject(int pnum, int i, unsigned char TeleFlag)
{ {
int v3; // esi int v3; // esi
@ -6625,7 +6511,6 @@ void __fastcall OperateObject(int pnum, int i, unsigned char TeleFlag)
} }
} }
//----- (00447932) --------------------------------------------------------
void __fastcall SyncOpL1Door(int pnum, int cmd, int i) void __fastcall SyncOpL1Door(int pnum, int cmd, int i)
{ {
signed int v3; // eax signed int v3; // eax
@ -6653,7 +6538,6 @@ void __fastcall SyncOpL1Door(int pnum, int cmd, int i)
} }
} }
//----- (004479A3) --------------------------------------------------------
void __fastcall SyncOpL2Door(int pnum, int cmd, int i) void __fastcall SyncOpL2Door(int pnum, int cmd, int i)
{ {
signed int v3; // eax signed int v3; // eax
@ -6681,7 +6565,6 @@ void __fastcall SyncOpL2Door(int pnum, int cmd, int i)
} }
} }
//----- (00447A15) --------------------------------------------------------
void __fastcall SyncOpL3Door(int pnum, int cmd, int i) void __fastcall SyncOpL3Door(int pnum, int cmd, int i)
{ {
signed int v3; // eax signed int v3; // eax
@ -6709,7 +6592,6 @@ void __fastcall SyncOpL3Door(int pnum, int cmd, int i)
} }
} }
//----- (00447A87) --------------------------------------------------------
void __fastcall SyncOpObject(int pnum, int cmd, int i) void __fastcall SyncOpObject(int pnum, int cmd, int i)
{ {
switch ( object[i]._otype ) switch ( object[i]._otype )
@ -6799,7 +6681,6 @@ void __fastcall SyncOpObject(int pnum, int cmd, int i)
} }
} }
//----- (00447C2D) --------------------------------------------------------
void __fastcall BreakCrux(int i) void __fastcall BreakCrux(int i)
{ {
int v1; // esi int v1; // esi
@ -6845,7 +6726,6 @@ LABEL_15:
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00447CEF) --------------------------------------------------------
void __fastcall BreakBarrel(int pnum, int i, int dam, unsigned char forcebreak, int sendmsg) void __fastcall BreakBarrel(int pnum, int i, int dam, unsigned char forcebreak, int sendmsg)
{ {
int v5; // esi int v5; // esi
@ -6971,7 +6851,6 @@ void __fastcall BreakBarrel(int pnum, int i, int dam, unsigned char forcebreak,
} }
// 676190: using guessed type int deltaload; // 676190: using guessed type int deltaload;
//----- (00447F63) --------------------------------------------------------
void __fastcall BreakObject(int pnum, int oi) void __fastcall BreakObject(int pnum, int oi)
{ {
int v2; // ebx int v2; // ebx
@ -7010,7 +6889,6 @@ void __fastcall BreakObject(int pnum, int oi)
} }
} }
//----- (00447FEF) --------------------------------------------------------
void __fastcall SyncBreakObj(int pnum, int oi) void __fastcall SyncBreakObj(int pnum, int oi)
{ {
int v2; // eax int v2; // eax
@ -7020,7 +6898,6 @@ void __fastcall SyncBreakObj(int pnum, int oi)
BreakBarrel(pnum, oi, 0, 1u, 0); BreakBarrel(pnum, oi, 0, 1u, 0);
} }
//----- (00448010) --------------------------------------------------------
void __fastcall SyncL1Doors(int i) void __fastcall SyncL1Doors(int i)
{ {
int v1; // ebx int v1; // ebx
@ -7061,7 +6938,6 @@ void __fastcall SyncL1Doors(int i)
} }
} }
//----- (004480BB) --------------------------------------------------------
void __fastcall SyncCrux(int i) void __fastcall SyncCrux(int i)
{ {
signed int v1; // ebx signed int v1; // ebx
@ -7091,7 +6967,6 @@ LABEL_13:
ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4); ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
} }
//----- (00448139) --------------------------------------------------------
void __fastcall SyncLever(int i) void __fastcall SyncLever(int i)
{ {
int v1; // ecx int v1; // ecx
@ -7101,7 +6976,6 @@ void __fastcall SyncLever(int i)
ObjChangeMap(object[v1]._oVar1, object[v1]._oVar2, object[v1]._oVar3, object[v1]._oVar4); ObjChangeMap(object[v1]._oVar1, object[v1]._oVar2, object[v1]._oVar3, object[v1]._oVar4);
} }
//----- (00448163) --------------------------------------------------------
void __fastcall SyncQSTLever(int i) void __fastcall SyncQSTLever(int i)
{ {
int v1; // esi int v1; // esi
@ -7130,7 +7004,6 @@ void __fastcall SyncQSTLever(int i)
} }
// 5A5590: using guessed type char TransVal; // 5A5590: using guessed type char TransVal;
//----- (004481D2) --------------------------------------------------------
void __fastcall SyncPedistal(int i) void __fastcall SyncPedistal(int i)
{ {
int v1; // esi int v1; // esi
@ -7154,7 +7027,6 @@ void __fastcall SyncPedistal(int i)
} }
// 5CF334: using guessed type int setpc_w; // 5CF334: using guessed type int setpc_w;
//----- (00448298) --------------------------------------------------------
void __fastcall SyncL2Doors(int i) void __fastcall SyncL2Doors(int i)
{ {
int v1; // eax int v1; // eax
@ -7202,7 +7074,6 @@ LABEL_18:
} }
} }
//----- (0044831E) --------------------------------------------------------
void __fastcall SyncL3Doors(int i) void __fastcall SyncL3Doors(int i)
{ {
int v1; // eax int v1; // eax
@ -7249,7 +7120,6 @@ LABEL_15:
} }
} }
//----- (004483B0) --------------------------------------------------------
void __fastcall SyncObjectAnim(int o) void __fastcall SyncObjectAnim(int o)
{ {
int v1; // edx int v1; // edx
@ -7322,7 +7192,6 @@ LABEL_24:
} }
} }
//----- (0044845E) --------------------------------------------------------
void __fastcall GetObjectStr(int i) void __fastcall GetObjectStr(int i)
{ {
int v1; // edi int v1; // edi

5
Source/objects.h
View File

@ -1,6 +1,7 @@
//HEADER_GOES_HERE //HEADER_GOES_HERE
#ifndef __OBJECTS_H__
#define __OBJECTS_H__
//objects
extern int trapid; // weak extern int trapid; // weak
extern int trapdir; // weak extern int trapdir; // weak
extern int pObjCels[40]; extern int pObjCels[40];
@ -158,3 +159,5 @@ extern unsigned char shrinemax[26];
extern unsigned char shrineavail[26]; extern unsigned char shrineavail[26];
extern char *StoryBookName[9]; extern char *StoryBookName[9];
extern int StoryText[3][3]; extern int StoryText[3][3];
#endif /* __OBJECTS_H__ */