Revert "Add preliminary support for compiling on Linux"
galaxyhaxz
GitHub
parent
b4765fc121
commit
b1ee40f6e7
|
|
@ -1,4 +0,0 @@
|
|||
*.o
|
||||
*.lib
|
||||
*.dll
|
||||
*.exe
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,53 +2,36 @@ LIBRARY "Storm"
|
|||
|
||||
EXPORTS
|
||||
SNetCreateGame @101 NONAME
|
||||
SNetCreateGame@40 @101 NONAME
|
||||
SNetDestroy @102 NONAME
|
||||
SNetDestroy@0 @102 NONAME
|
||||
SNetEnumProviders @103 NONAME
|
||||
;SNetEnumDevices @104 NONAME
|
||||
SNetEnumGames @105 NONAME
|
||||
SNetDropPlayer @106 NONAME
|
||||
SNetDropPlayer@8 @106 NONAME
|
||||
SNetGetGameInfo @107 NONAME
|
||||
SNetGetGameInfo@16 @107 NONAME
|
||||
;SNetGetNetworkLatency @108 NONAME
|
||||
SNetGetNumPlayers @109 NONAME
|
||||
SNetGetOwnerTurnsWaiting @110 NONAME
|
||||
SNetGetOwnerTurnsWaiting@4 @110 NONAME
|
||||
;SNetGetPerformanceData @111 NONAME
|
||||
SNetGetPlayerCaps @112 NONAME
|
||||
SNetGetPlayerName @113 NONAME
|
||||
SNetGetProviderCaps @114 NONAME
|
||||
SNetGetProviderCaps@4 @114 NONAME
|
||||
SNetGetTurnsInTransit @115 NONAME
|
||||
SNetGetTurnsInTransit@4 @115 NONAME
|
||||
SNetInitializeDevice @116 NONAME
|
||||
SNetInitializeProvider @117 NONAME
|
||||
SNetInitializeProvider@20 @117 NONAME
|
||||
SNetJoinGame @118 NONAME
|
||||
SNetLeaveGame @119 NONAME
|
||||
SNetLeaveGame@4 @119 NONAME
|
||||
SNetPerformUpgrade @120 NONAME
|
||||
SNetPerformUpgrade@4 @120 NONAME
|
||||
SNetReceiveMessage @121 NONAME
|
||||
SNetReceiveMessage@12 @121 NONAME
|
||||
SNetReceiveTurns @122 NONAME
|
||||
SNetReceiveTurns@20 @122 NONAME
|
||||
SNetRegisterEventHandler @123 NONAME
|
||||
SNetRegisterEventHandler@8 @123 NONAME
|
||||
;SNetResetLatencyMeasurements @124 NONAME
|
||||
SNetSelectGame @125 NONAME
|
||||
;SNetSelectProvider @126 NONAME
|
||||
SNetSendMessage @127 NONAME
|
||||
SNetSendMessage@12 @127 NONAME
|
||||
SNetSendTurn @128 NONAME
|
||||
SNetSendTurn@8 @128 NONAME
|
||||
SNetSetBasePlayer @129 NONAME
|
||||
SNetSetBasePlayer@4 @129 NONAME
|
||||
SNetSetGameMode @130 NONAME
|
||||
SNetUnregisterEventHandler @131 NONAME
|
||||
SNetUnregisterEventHandler@8 @131 NONAME
|
||||
|
||||
SNetEnumGamesEx @133 NONAME
|
||||
SNetSendServerChatCommand @134 NONAME
|
||||
|
|
@ -74,7 +57,7 @@ EXPORTS
|
|||
;SDlgCreateDialogIndirectParam @204 NONAME
|
||||
;SDlgCreateDialogParam @205 NONAME
|
||||
SDlgDefDialogProc @206 NONAME
|
||||
|
||||
|
||||
SDlgDialogBoxIndirectParam @208 NONAME
|
||||
;SDlgDialogBoxParam @209 NONAME
|
||||
;SDlgDrawBitmap @210 NONAME
|
||||
|
|
@ -95,41 +78,25 @@ EXPORTS
|
|||
|
||||
;SFileAuthenticateArchive @251 NONAME
|
||||
SFileCloseArchive @252 NONAME
|
||||
SFileCloseArchive@4 @252 NONAME
|
||||
SFileCloseFile @253 NONAME
|
||||
SFileCloseFile@4 @253 NONAME
|
||||
;SFileDdaBegin @254 NONAME
|
||||
SFileDdaBeginEx @255 NONAME
|
||||
SFileDdaBeginEx@28 @255 NONAME
|
||||
SFileDdaDestroy @256 NONAME
|
||||
SFileDdaDestroy@0 @256 NONAME
|
||||
SFileDdaEnd @257 NONAME
|
||||
SFileDdaEnd@4 @257 NONAME
|
||||
SFileDdaGetPos @258 NONAME
|
||||
SFileDdaGetPos@12 @258 NONAME
|
||||
;SFileDdaGetVolume @259 NONAME
|
||||
SFileDdaInitialize @260 NONAME
|
||||
SFileDdaInitialize@4 @260 NONAME
|
||||
SFileDdaSetVolume @261 NONAME
|
||||
SFileDdaSetVolume@12 @261 NONAME
|
||||
SFileDestroy @262 NONAME
|
||||
;SFileEnableDirectAccess @263 NONAME
|
||||
SFileGetFileArchive @264 NONAME
|
||||
SFileGetFileArchive@8 @264 NONAME
|
||||
SFileGetFileSize @265 NONAME
|
||||
SFileGetFileSize@8 @265 NONAME
|
||||
SFileOpenArchive @266 NONAME
|
||||
SFileOpenArchive@16 @266 NONAME
|
||||
SFileOpenFile @267 NONAME
|
||||
SFileOpenFile@8 @267 NONAME
|
||||
SFileOpenFileEx @268 NONAME
|
||||
SFileOpenFileEx@16 @268 NONAME
|
||||
SFileReadFile @269 NONAME
|
||||
SFileReadFile@20 @269 NONAME
|
||||
SFileSetBasePath @270 NONAME
|
||||
SFileSetBasePath@4 @270 NONAME
|
||||
SFileSetFilePointer @271 NONAME
|
||||
SFileSetFilePointer@16 @271 NONAME
|
||||
SFileSetLocale @272 NONAME
|
||||
;SFileGetBasePath @273 NONAME
|
||||
SFileSetIoErrorMode @274 NONAME
|
||||
|
|
@ -178,7 +145,7 @@ EXPORTS
|
|||
|
||||
SCodeCompile @331 NONAME
|
||||
SCodeDelete @332 NONAME
|
||||
|
||||
|
||||
SCodeExecute @334 NONAME
|
||||
;SCodeGetPseudocode @335 NONAME
|
||||
|
||||
|
|
@ -188,21 +155,17 @@ EXPORTS
|
|||
SDrawDestroy @344 NONAME
|
||||
;SDrawFlipPage @345 NONAME
|
||||
SDrawGetFrameWindow @346 NONAME
|
||||
SDrawGetFrameWindow@4 @346 NONAME
|
||||
SDrawGetObjects @347 NONAME
|
||||
SDrawGetScreenSize @348 NONAME
|
||||
;SDrawGetServiceLevel @349 NONAME
|
||||
SDrawLockSurface @350 NONAME
|
||||
SDrawManualInitialize @351 NONAME
|
||||
SDrawManualInitialize@32 @351 NONAME
|
||||
SDrawMessageBox @352 NONAME
|
||||
SDrawMessageBox@12 @352 NONAME
|
||||
SDrawPostClose @353 NONAME
|
||||
SDrawRealizePalette @354 NONAME
|
||||
;SDrawSelectGdiSurface @355 NONAME
|
||||
SDrawUnlockSurface @356 NONAME
|
||||
SDrawUpdatePalette @357 NONAME
|
||||
SDrawUpdatePalette@16 @357 NONAME
|
||||
;SDrawUpdateScreen @358 NONAME
|
||||
;SDrawWaitForVerticalBlank @359 NONAME
|
||||
|
||||
|
|
@ -229,12 +192,10 @@ EXPORTS
|
|||
Ordinal393 @393 NONAME
|
||||
|
||||
;SMem399 @399 NONAME
|
||||
|
||||
|
||||
SMemAlloc @401 NONAME
|
||||
SMemAlloc@16 @401 NONAME
|
||||
;SMemDestroy @402 NONAME
|
||||
SMemFree @403 NONAME
|
||||
SMemFree@16 @403 NONAME
|
||||
;SMemGetSize @404 NONAME
|
||||
SMemReAlloc @405 NONAME
|
||||
;Storm406 @406 NONAME
|
||||
|
|
@ -249,17 +210,11 @@ EXPORTS
|
|||
;SMsgPushRegisterState @419 NONAME
|
||||
;SMsg420 @420 NONAME
|
||||
SRegLoadData @421 NONAME
|
||||
SRegLoadData@24 @421 NONAME
|
||||
SRegLoadString @422 NONAME
|
||||
SRegLoadString@20 @422 NONAME
|
||||
SRegLoadValue @423 NONAME
|
||||
SRegLoadValue@16 @423 NONAME
|
||||
SRegSaveData @424 NONAME
|
||||
SRegSaveData@20 @424 NONAME
|
||||
SRegSaveString @425 NONAME
|
||||
SRegSaveString@16 @425 NONAME
|
||||
SRegSaveValue @426 NONAME
|
||||
SRegSaveValue@16 @426 NONAME
|
||||
;SRegGetBaseKey @427 NONAME
|
||||
SRegDeleteValue @428 NONAME
|
||||
;SReg429 @429 NONAME
|
||||
|
|
@ -268,7 +223,7 @@ EXPORTS
|
|||
STransBltUsingMask @432 NONAME
|
||||
;STransCreateI @433 NONAME
|
||||
STransDelete @434 NONAME
|
||||
|
||||
|
||||
STransDuplicate @436 NONAME
|
||||
STransIntersectDirtyArray @437 NONAME
|
||||
STransInvertMask @438 NONAME
|
||||
|
|
@ -283,27 +238,20 @@ EXPORTS
|
|||
;STransLoadE @447 NONAME
|
||||
|
||||
SVidDestroy @451 NONAME
|
||||
SVidDestroy@0 @451 NONAME
|
||||
SVidGetSize @452 NONAME
|
||||
SVidInitialize @453 NONAME
|
||||
SVidInitialize@4 @453 NONAME
|
||||
SVidPlayBegin @454 NONAME
|
||||
SVidPlayBegin@28 @454 NONAME
|
||||
;SVidPlayBeginFromMemory @455 NONAME
|
||||
SVidPlayContinue @456 NONAME
|
||||
SVidPlayContinueSingle @457 NONAME
|
||||
SVidPlayEnd @458 NONAME
|
||||
SVidPlayEnd@4 @458 NONAME
|
||||
;SVidSetVolume @459 NONAME
|
||||
;Storm460 @460 NONAME
|
||||
SErrDisplayError @461 NONAME
|
||||
SErrGetErrorStr @462 NONAME
|
||||
SErrGetErrorStr@12 @462 NONAME
|
||||
SErrGetLastError @463 NONAME
|
||||
SErrGetLastError@0 @463 NONAME
|
||||
;SErrRegisterMessageSource @464 NONAME
|
||||
SErrSetLastError @465 NONAME
|
||||
SErrSetLastError@4 @465 NONAME
|
||||
;SErrReportNamedResourceLeak @466 NONAME
|
||||
;SErrReportResourceLeak @467 NONAME
|
||||
SErrSuppressErrors @468 NONAME
|
||||
|
|
@ -339,7 +287,6 @@ EXPORTS
|
|||
;Ordinal498 @498 NONAME
|
||||
|
||||
SStrCopy @501 NONAME
|
||||
SStrCopy@12 @501 NONAME
|
||||
SStrHash @502 NONAME
|
||||
SStrNCat @503 NONAME
|
||||
;SStrTokenize @504 NONAME
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,29 +9,29 @@
|
|||
*/
|
||||
|
||||
|
||||
extern "C" void UiDestroy(); // { return; }
|
||||
extern "C" void __stdcall UiTitleDialog(int a1); // { return; }
|
||||
extern "C" void __cdecl UiInitialize(); // { return; }
|
||||
extern "C" void __stdcall UiCopyProtError(int a1); // { return; }
|
||||
extern "C" void __stdcall UiAppActivate(int a1); // { return; }
|
||||
extern "C" int __stdcall UiValidPlayerName(char *a1); // { return 0; }
|
||||
extern "C" int __stdcall UiSelHeroMultDialog(void *fninfo, void *fncreate, void *fnremove, void *fnstats, int *a5, int *a6, char *name); // { return 0; }
|
||||
extern "C" int __stdcall UiSelHeroSingDialog(void *fninfo, void *fncreate, void *fnremove, void *fnstats, int *a5, char *name, int *difficulty); // { return 0; }
|
||||
extern "C" void __stdcall UiCreditsDialog(int a1); // { return; }
|
||||
extern "C" int __stdcall UiMainMenuDialog(char *name, int *a2, void *fnSound, int a4); // { return 0; }
|
||||
extern "C" int __stdcall UiProgressDialog(HWND window, char *msg, int a3, void *fnfunc, int a5); // { return 0; }
|
||||
extern "C" int __cdecl UiProfileGetString(); // { return; }
|
||||
extern "C" void __cdecl UiProfileCallback(); // { return; }
|
||||
extern "C" void __cdecl UiProfileDraw(); // { return; }
|
||||
extern "C" void __cdecl UiCategoryCallback(); // { return; }
|
||||
extern "C" void __cdecl UiGetDataCallback(); // { return; }
|
||||
extern "C" void __cdecl UiAuthCallback(); // { return; }
|
||||
extern "C" void __cdecl UiSoundCallback(); // { return; }
|
||||
extern "C" void __cdecl UiMessageBoxCallback(); // { return; }
|
||||
extern "C" void __cdecl UiDrawDescCallback(); // { return; }
|
||||
extern "C" void __cdecl UiCreateGameCallback(); // { return; }
|
||||
extern "C" void __cdecl UiArtCallback(); // { return; }
|
||||
extern "C" int __stdcall UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6); // { return 0; }
|
||||
extern "C" int __stdcall UiSelectProvider(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *type); // { return 0; }
|
||||
extern "C" int __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc); // { return 0; }
|
||||
extern "C" int __stdcall UiSetupPlayerInfo(char *str, _uiheroinfo *info, int mode); // { return 0; }
|
||||
void __cdecl UiDestroy(); // { return; }
|
||||
void __stdcall UiTitleDialog(int a1); // { return; }
|
||||
void __cdecl UiInitialize(); // { return; }
|
||||
void __stdcall UiCopyProtError(int a1); // { return; }
|
||||
void __stdcall UiAppActivate(int a1); // { return; }
|
||||
int __stdcall UiValidPlayerName(char *a1); // { return 0; }
|
||||
int __stdcall UiSelHeroMultDialog(void *fninfo, void *fncreate, void *fnremove, void *fnstats, int *a5, int *a6, char *name); // { return 0; }
|
||||
int __stdcall UiSelHeroSingDialog(void *fninfo, void *fncreate, void *fnremove, void *fnstats, int *a5, char *name, int *difficulty); // { return 0; }
|
||||
void __stdcall UiCreditsDialog(int a1); // { return; }
|
||||
int __stdcall UiMainMenuDialog(char *name, int *a2, void *fnSound, int a4); // { return 0; }
|
||||
int __stdcall UiProgressDialog(HWND window, char *msg, int a3, void *fnfunc, int a5); // { return 0; }
|
||||
int __cdecl UiProfileGetString(); // { return; }
|
||||
void __cdecl UiProfileCallback(); // { return; }
|
||||
void __cdecl UiProfileDraw(); // { return; }
|
||||
void __cdecl UiCategoryCallback(); // { return; }
|
||||
void __cdecl UiGetDataCallback(); // { return; }
|
||||
void __cdecl UiAuthCallback(); // { return; }
|
||||
void __cdecl UiSoundCallback(); // { return; }
|
||||
void __cdecl UiMessageBoxCallback(); // { return; }
|
||||
void __cdecl UiDrawDescCallback(); // { return; }
|
||||
void __cdecl UiCreateGameCallback(); // { return; }
|
||||
void __cdecl UiArtCallback(); // { return; }
|
||||
int __stdcall UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6); // { return 0; }
|
||||
int __stdcall UiSelectProvider(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *type); // { return 0; }
|
||||
int __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc); // { return 0; }
|
||||
int __stdcall UiSetupPlayerInfo(char *str, _uiheroinfo *info, int mode); // { return 0; }
|
||||
|
|
|
|||
24
Makefile
24
Makefile
|
|
@ -1,24 +0,0 @@
|
|||
DIABLO_SRC=$(wildcard Source/*.cpp)
|
||||
DIABLO_OBJ=$(DIABLO_SRC:.cpp=.o)
|
||||
|
||||
PKWARE_SRC=$(wildcard 3rdParty/PKWare/*.cpp)
|
||||
PKWARE_OBJ=$(PKWARE_SRC:.cpp=.o)
|
||||
|
||||
all: diablo.exe
|
||||
|
||||
diablo.exe: $(DIABLO_OBJ) $(PKWARE_OBJ) storm.lib
|
||||
i686-w64-mingw32-gcc -L./ -o $@ $^ -lgdi32 -lversion -ldiabloui -lstorm
|
||||
|
||||
%.o: %.cpp
|
||||
i686-w64-mingw32-gcc -c -fpermissive -o $@ $<
|
||||
|
||||
storm.lib: storm.dll
|
||||
i686-w64-mingw32-dlltool -d 3rdParty/Storm/Source/storm.def -D storm.dll -l storm.lib
|
||||
|
||||
storm.dll:
|
||||
echo "Please copy storm.dll (version 1.09b) here."
|
||||
|
||||
clean:
|
||||
rm -f $(DIABLO_OBJ) $(PKWARE_OBJ)
|
||||
|
||||
.PHONY: clean all
|
||||
|
|
@ -485,7 +485,7 @@ LABEL_10:
|
|||
}
|
||||
v20 = &spelldata[1].sTownSpell;
|
||||
v4 = 1;
|
||||
v26 = 1;
|
||||
v26 = 1i64;
|
||||
v23 = 1;
|
||||
v22 = xp - 216;
|
||||
do
|
||||
|
|
@ -621,7 +621,7 @@ LABEL_66:
|
|||
LABEL_68:
|
||||
v20 += 56;
|
||||
++v4;
|
||||
v26 *= 2;
|
||||
v26 *= 2i64;
|
||||
v23 = v4;
|
||||
}
|
||||
while ( (signed int)v20 < (signed int)&spelldata[37].sTownSpell );
|
||||
|
|
@ -753,7 +753,7 @@ void __fastcall ToggleSpell(int slot)
|
|||
v8 = plr[v3]._pAblSpells[0];
|
||||
v9 = plr[v3]._pAblSpells[1];
|
||||
}
|
||||
if ( v9 & ((unsigned __int64)(1 << ((unsigned char)v2 - 1)) >> 32) | v8 & (unsigned int)(1 << ((unsigned char)v2 - 1)) )
|
||||
if ( v9 & ((unsigned __int64)(1i64 << ((unsigned char)v2 - 1)) >> 32) | v8 & (unsigned int)(1i64 << ((unsigned char)v2 - 1)) )
|
||||
{
|
||||
drawpanflag = 255;
|
||||
plr[v3]._pRSpell = v12;
|
||||
|
|
@ -2754,7 +2754,7 @@ int __fastcall GetSBookTrans(int ii, unsigned char townok)
|
|||
v7 = townok;
|
||||
v6 = 1;
|
||||
v3 = myplr;
|
||||
if ( ((unsigned __int64)(1 << ((unsigned char)ii - 1)) >> 32) & plr[v3]._pISpells[1] | (unsigned int)(1 << ((unsigned char)ii - 1)) & plr[v3]._pISpells[0] )
|
||||
if ( ((unsigned __int64)(1i64 << ((unsigned char)ii - 1)) >> 32) & plr[v3]._pISpells[1] | (unsigned int)(1i64 << ((unsigned char)ii - 1)) & plr[v3]._pISpells[0] )
|
||||
v6 = 3;
|
||||
result = plr[v3]._pAblSpells[1] & (1 << (ii - 1) >> 31) | plr[v3]._pAblSpells[0] & (1 << (ii - 1));
|
||||
if ( result )
|
||||
|
|
@ -2800,7 +2800,7 @@ void __cdecl DrawSpellBook()
|
|||
{
|
||||
v2 = *(&attribute_inc_rects[3].h + v9 + 7 * sbooktab);
|
||||
if ( v2 != -1
|
||||
&& v1 & ((unsigned __int64)(1 << ((unsigned char)v2 - 1)) >> 32) | v0 & (unsigned int)(1 << ((unsigned char)v2 - 1)) )
|
||||
&& v1 & ((unsigned __int64)(1i64 << ((unsigned char)v2 - 1)) >> 32) | v0 & (unsigned int)(1i64 << ((unsigned char)v2 - 1)) )
|
||||
{
|
||||
v7 = GetSBookTrans(v2, 1u);
|
||||
SetSpellTrans(v7);
|
||||
|
|
@ -2929,7 +2929,7 @@ void __cdecl CheckSBook()
|
|||
v3 = myplr;
|
||||
LODWORD(v6) = plr[myplr]._pAblSpells[0];
|
||||
HIDWORD(v6) = plr[myplr]._pAblSpells[1];
|
||||
v4 = 1 << ((unsigned char)v2 - 1);
|
||||
v4 = 1i64 << ((unsigned char)v2 - 1);
|
||||
if ( HIDWORD(v4) & (HIDWORD(v6) | plr[myplr]._pISpells[1] | plr[myplr]._pMemSpells[1]) | (unsigned int)v4 & ((unsigned int)v6 | plr[myplr]._pISpells[0] | plr[myplr]._pMemSpells[0]) )
|
||||
{
|
||||
v5 = 3;
|
||||
|
|
|
|||
|
|
@ -543,7 +543,7 @@ LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM
|
|||
}
|
||||
|
||||
//----- (0041B184) --------------------------------------------------------
|
||||
LRESULT (__stdcall *SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LRESULT (__stdcall *result)(HWND, UINT, WPARAM, LPARAM); // eax
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ void __cdecl init_get_file_info();
|
|||
LRESULT __stdcall init_palette(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
void __fastcall init_activate_window(HWND hWnd, bool activated);
|
||||
LRESULT __stdcall init_redraw_window(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT (__stdcall *SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT (__stdcall *__fastcall SetWindowProc(void *func))(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
/* data */
|
||||
extern int init_inf; // weak
|
||||
|
|
@ -48,4 +48,4 @@ extern int init_inf; // weak
|
|||
/* rdata */
|
||||
|
||||
extern char gszVersionNumber[260];
|
||||
extern char gszProductName[260];
|
||||
extern char gszProductName[260];
|
||||
|
|
@ -851,7 +851,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
|
|||
v60 = 0;
|
||||
v52 = 0;
|
||||
v61 = 0;
|
||||
v37 = 0;
|
||||
v37 = 0i64;
|
||||
v49 = 0;
|
||||
v48 = 0;
|
||||
v47 = 0;
|
||||
|
|
@ -878,7 +878,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
|
|||
v40 = v3;
|
||||
v41 = v2;
|
||||
if ( v7 )
|
||||
v37 |= 1 << ((unsigned char)v7 - 1);
|
||||
v37 |= 1i64 << ((unsigned char)v7 - 1);
|
||||
if ( !*((_BYTE *)v6 - 296) || *(v6 - 75) )
|
||||
{
|
||||
v57 += *(v6 - 28);
|
||||
|
|
@ -979,7 +979,7 @@ void __fastcall CalcPlrItemVals(int p, bool Loadgfx)
|
|||
plr[v5]._pISpells[0] = v37;
|
||||
plr[v5]._pISpells[1] = HIDWORD(v37);
|
||||
plr[v5]._pDamageMod = v15 / v16;
|
||||
if ( v17 && !(v37 & (1 << (_LOBYTE(plr[v5]._pRSpell) - 1))) )
|
||||
if ( v17 && !(v37 & (1i64 << (_LOBYTE(plr[v5]._pRSpell) - 1))) )
|
||||
{
|
||||
plr[v5]._pRSpell = -1;
|
||||
_LOBYTE(plr[v5]._pRSplType) = 4;
|
||||
|
|
@ -1143,7 +1143,7 @@ void __fastcall CalcPlrScrolls(int p)
|
|||
{
|
||||
if ( *(v3 - 53) != -1 && (*v3 == IMISC_SCROLL || *v3 == IMISC_SCROLLT) && v3[34] )
|
||||
{
|
||||
v5 = 1 << (*((_BYTE *)v3 + 4) - 1);
|
||||
v5 = 1i64 << (*((_BYTE *)v3 + 4) - 1);
|
||||
plr[v1]._pScrlSpells[0] |= v5;
|
||||
plr[v1]._pScrlSpells[1] |= HIDWORD(v5);
|
||||
}
|
||||
|
|
@ -1158,7 +1158,7 @@ void __fastcall CalcPlrScrolls(int p)
|
|||
{
|
||||
if ( *(v6 - 53) != -1 && (*v6 == IMISC_SCROLL || *v6 == IMISC_SCROLLT) && v6[34] )
|
||||
{
|
||||
v8 = 1 << (*((_BYTE *)v6 + 4) - 1);
|
||||
v8 = 1i64 << (*((_BYTE *)v6 + 4) - 1);
|
||||
plr[v1]._pScrlSpells[0] |= v8;
|
||||
plr[v1]._pScrlSpells[1] |= HIDWORD(v8);
|
||||
}
|
||||
|
|
@ -1192,7 +1192,7 @@ void __fastcall CalcPlrStaff(int pnum)
|
|||
plr[v1]._pISpells[1] = 0;
|
||||
if ( !v2 && plr[v1].InvBody[4]._iStatFlag && plr[v1].InvBody[4]._iCharges > 0 )
|
||||
{
|
||||
v3 = 1 << (_LOBYTE(plr[v1].InvBody[4]._iSpell) - 1);
|
||||
v3 = 1i64 << (_LOBYTE(plr[v1].InvBody[4]._iSpell) - 1);
|
||||
plr[v1]._pISpells[0] = v3;
|
||||
plr[v1]._pISpells[1] = HIDWORD(v3);
|
||||
}
|
||||
|
|
@ -4668,7 +4668,7 @@ LABEL_71:
|
|||
if ( v24 != 2 )
|
||||
return;
|
||||
v25 = p;
|
||||
*(_QWORD *)plr[p]._pMemSpells |= 1 << ((unsigned char)spl - 1);
|
||||
*(_QWORD *)plr[p]._pMemSpells |= 1i64 << ((unsigned char)spl - 1);
|
||||
v26 = &plr[p]._pSplLvl[spl];
|
||||
if ( *v26 < 15 )
|
||||
++*v26;
|
||||
|
|
|
|||
|
|
@ -912,40 +912,40 @@ int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
|
|||
v9 = y1;
|
||||
v4 = x1;
|
||||
strcpy((char *)Dirs, "c");
|
||||
*(_QWORD *)&Dirs[0][2] = 0;
|
||||
*(_QWORD *)&Dirs[0][2] = 0i64;
|
||||
*(_DWORD *)&Dirs[0][10] = 0;
|
||||
*(_WORD *)&Dirs[0][14] = 0;
|
||||
*(_QWORD *)&Dirs[1][0] = 0x1010102;
|
||||
*(_QWORD *)&Dirs[1][8] = 0;
|
||||
*(_QWORD *)&Dirs[2][0] = 0x1010101010102;
|
||||
*(_QWORD *)&Dirs[2][8] = 0;
|
||||
*(_QWORD *)&Dirs[3][0] = 0x101010101010102;
|
||||
*(_QWORD *)&Dirs[3][8] = 1;
|
||||
*(_QWORD *)&Dirs[4][0] = 0x101010101010202;
|
||||
*(_QWORD *)&Dirs[4][8] = 0x1010101;
|
||||
*(_QWORD *)&Dirs[5][0] = 0x101010101010202;
|
||||
*(_QWORD *)&Dirs[5][8] = 0x10101010101;
|
||||
*(_QWORD *)&Dirs[6][0] = 0x101010101010202;
|
||||
*(_QWORD *)&Dirs[6][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[7][0] = 0x101010101020202;
|
||||
*(_QWORD *)&Dirs[7][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[8][0] = 0x101010101020202;
|
||||
*(_QWORD *)&Dirs[8][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[9][0] = 0x101010102020202;
|
||||
*(_QWORD *)&Dirs[9][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[10][0] = 0x101010102020202;
|
||||
*(_QWORD *)&Dirs[10][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[11][0] = 0x101010102020202;
|
||||
*(_QWORD *)&Dirs[11][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[12][0] = 0x101010202020202;
|
||||
*(_QWORD *)&Dirs[12][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[13][0] = 0x101010202020202;
|
||||
*(_QWORD *)&Dirs[13][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[14][0] = 0x101020202020202;
|
||||
*(_QWORD *)&Dirs[14][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[1][0] = 0x1010102i64;
|
||||
*(_QWORD *)&Dirs[1][8] = 0i64;
|
||||
*(_QWORD *)&Dirs[2][0] = 0x1010101010102i64;
|
||||
*(_QWORD *)&Dirs[2][8] = 0i64;
|
||||
*(_QWORD *)&Dirs[3][0] = 0x101010101010102i64;
|
||||
*(_QWORD *)&Dirs[3][8] = 1i64;
|
||||
*(_QWORD *)&Dirs[4][0] = 0x101010101010202i64;
|
||||
*(_QWORD *)&Dirs[4][8] = 0x1010101i64;
|
||||
*(_QWORD *)&Dirs[5][0] = 0x101010101010202i64;
|
||||
*(_QWORD *)&Dirs[5][8] = 0x10101010101i64;
|
||||
*(_QWORD *)&Dirs[6][0] = 0x101010101010202i64;
|
||||
*(_QWORD *)&Dirs[6][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[7][0] = 0x101010101020202i64;
|
||||
*(_QWORD *)&Dirs[7][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[8][0] = 0x101010101020202i64;
|
||||
*(_QWORD *)&Dirs[8][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[9][0] = 0x101010102020202i64;
|
||||
*(_QWORD *)&Dirs[9][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[10][0] = 0x101010102020202i64;
|
||||
*(_QWORD *)&Dirs[10][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[11][0] = 0x101010102020202i64;
|
||||
*(_QWORD *)&Dirs[11][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[12][0] = 0x101010202020202i64;
|
||||
*(_QWORD *)&Dirs[12][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[13][0] = 0x101010202020202i64;
|
||||
*(_QWORD *)&Dirs[13][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[14][0] = 0x101020202020202i64;
|
||||
*(_QWORD *)&Dirs[14][8] = 0x101010101010101i64;
|
||||
lltour[1] = 0;
|
||||
*(_QWORD *)&Dirs[15][0] = 0x101020202020202;
|
||||
*(_QWORD *)&Dirs[15][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[15][0] = 0x101020202020202i64;
|
||||
*(_QWORD *)&Dirs[15][8] = 0x101010101010101i64;
|
||||
lrtoul[0] = 3;
|
||||
lrtoul[1] = 4;
|
||||
lrtoul[2] = 5;
|
||||
|
|
@ -1000,40 +1000,40 @@ int __fastcall GetDirection16(int x1, int y1, int x2, int y2)
|
|||
v9 = y1;
|
||||
v4 = x1;
|
||||
strcpy((char *)Dirs, "c");
|
||||
*(_QWORD *)&Dirs[0][2] = 0;
|
||||
*(_QWORD *)&Dirs[0][2] = 0i64;
|
||||
*(_DWORD *)&Dirs[0][10] = 0;
|
||||
*(_WORD *)&Dirs[0][14] = 0;
|
||||
*(_QWORD *)&Dirs[1][0] = 0x1010204;
|
||||
*(_QWORD *)&Dirs[1][8] = 0;
|
||||
*(_QWORD *)&Dirs[2][0] = 0x101010101020304;
|
||||
*(_QWORD *)&Dirs[2][8] = 0;
|
||||
*(_QWORD *)&Dirs[3][0] = 0x101010202030304;
|
||||
*(_QWORD *)&Dirs[3][8] = 0x1010101;
|
||||
*(_QWORD *)&Dirs[4][0] = 0x101010202030404;
|
||||
*(_QWORD *)&Dirs[4][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[5][0] = 0x102020203030404;
|
||||
*(_QWORD *)&Dirs[5][8] = 0x101010101010101;
|
||||
*(_QWORD *)&Dirs[6][0] = 0x202020203030404;
|
||||
*(_QWORD *)&Dirs[6][8] = 0x101010101010102;
|
||||
*(_QWORD *)&Dirs[7][0] = 0x202030303030404;
|
||||
*(_QWORD *)&Dirs[7][8] = 0x101010101010202;
|
||||
*(_QWORD *)&Dirs[8][0] = 0x202030303040404;
|
||||
*(_QWORD *)&Dirs[8][8] = 0x101010101020202;
|
||||
*(_QWORD *)&Dirs[9][0] = 0x203030303040404;
|
||||
*(_QWORD *)&Dirs[9][8] = 0x101010102020202;
|
||||
*(_QWORD *)&Dirs[10][0] = 0x303030303040404;
|
||||
*(_QWORD *)&Dirs[10][8] = 0x101020202020202;
|
||||
*(_QWORD *)&Dirs[11][0] = 0x303030303040404;
|
||||
*(_QWORD *)&Dirs[11][8] = 0x102020202020203;
|
||||
*(_QWORD *)&Dirs[12][0] = 0x303030304040404;
|
||||
*(_QWORD *)&Dirs[12][8] = 0x202020202020303;
|
||||
*(_QWORD *)&Dirs[13][0] = 0x303030304040404;
|
||||
*(_QWORD *)&Dirs[13][8] = 0x202020202020303;
|
||||
*(_QWORD *)&Dirs[14][0] = 0x303030304040404;
|
||||
*(_QWORD *)&Dirs[14][8] = 0x202020202030303;
|
||||
*(_QWORD *)&Dirs[1][0] = 0x1010204i64;
|
||||
*(_QWORD *)&Dirs[1][8] = 0i64;
|
||||
*(_QWORD *)&Dirs[2][0] = 0x101010101020304i64;
|
||||
*(_QWORD *)&Dirs[2][8] = 0i64;
|
||||
*(_QWORD *)&Dirs[3][0] = 0x101010202030304i64;
|
||||
*(_QWORD *)&Dirs[3][8] = 0x1010101i64;
|
||||
*(_QWORD *)&Dirs[4][0] = 0x101010202030404i64;
|
||||
*(_QWORD *)&Dirs[4][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[5][0] = 0x102020203030404i64;
|
||||
*(_QWORD *)&Dirs[5][8] = 0x101010101010101i64;
|
||||
*(_QWORD *)&Dirs[6][0] = 0x202020203030404i64;
|
||||
*(_QWORD *)&Dirs[6][8] = 0x101010101010102i64;
|
||||
*(_QWORD *)&Dirs[7][0] = 0x202030303030404i64;
|
||||
*(_QWORD *)&Dirs[7][8] = 0x101010101010202i64;
|
||||
*(_QWORD *)&Dirs[8][0] = 0x202030303040404i64;
|
||||
*(_QWORD *)&Dirs[8][8] = 0x101010101020202i64;
|
||||
*(_QWORD *)&Dirs[9][0] = 0x203030303040404i64;
|
||||
*(_QWORD *)&Dirs[9][8] = 0x101010102020202i64;
|
||||
*(_QWORD *)&Dirs[10][0] = 0x303030303040404i64;
|
||||
*(_QWORD *)&Dirs[10][8] = 0x101020202020202i64;
|
||||
*(_QWORD *)&Dirs[11][0] = 0x303030303040404i64;
|
||||
*(_QWORD *)&Dirs[11][8] = 0x102020202020203i64;
|
||||
*(_QWORD *)&Dirs[12][0] = 0x303030304040404i64;
|
||||
*(_QWORD *)&Dirs[12][8] = 0x202020202020303i64;
|
||||
*(_QWORD *)&Dirs[13][0] = 0x303030304040404i64;
|
||||
*(_QWORD *)&Dirs[13][8] = 0x202020202020303i64;
|
||||
*(_QWORD *)&Dirs[14][0] = 0x303030304040404i64;
|
||||
*(_QWORD *)&Dirs[14][8] = 0x202020202030303i64;
|
||||
lrtoul[2] = 0;
|
||||
*(_QWORD *)&Dirs[15][0] = 0x303030304040404;
|
||||
*(_QWORD *)&Dirs[15][8] = 0x202020203030303;
|
||||
*(_QWORD *)&Dirs[15][0] = 0x303030304040404i64;
|
||||
*(_QWORD *)&Dirs[15][8] = 0x202020203030303i64;
|
||||
urtoll[0] = 6;
|
||||
urtoll[1] = 7;
|
||||
urtoll[2] = 8;
|
||||
|
|
|
|||
|
|
@ -141,105 +141,105 @@ int ObjTypeConv[113] =
|
|||
};
|
||||
ObjDataStruct AllObjects[99] =
|
||||
{
|
||||
{ 1, OFILE_L1BRAZ, 1, 4, 1, -1, -1, 1, 1, 26, 64, 1, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_L1DOORS, 1, 4, 1, -1, -1, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L1DOORS, 1, 4, 1, -1, -1, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 3, OFILE_SKULFIRE, 0, 0, 0, 3, -1, 1, 2, 11, 96, 1, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_LEVER, 1, 4, 1, -1, -1, 0, 1, 1, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST1, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST2, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST3, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 3, OFILE_CANDLE2, 0, 0, 0, 1, -1, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, -1, 0, 2, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, -1, 0, 1, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, -1, 0, 3, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_SKULPILE, 1, 4, 0, -1, -1, 0, 0, 1, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_CRUXSK1, 0, 0, 0, -1, -1, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 2, OFILE_CRUXSK2, 0, 0, 0, -1, -1, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 2, OFILE_CRUXSK3, 0, 0, 0, -1, -1, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 1, OFILE_ROCKSTAN, 5, 5, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_ANGEL, 0, 0, 0, -1, -1, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_BOOK2, 0, 0, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_BURNCROS, 0, 0, 0, -1, -1, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_NUDE2, 0, 0, 0, -1, -1, 1, 3, 6, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_SWITCH4, 16, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_TNUDEM, 13, 16, 0, -1, 6, 0, 1, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_L1BRAZ, 1, 4, 1, 255, 255, 1, 1, 26, 64, 1, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_L1DOORS, 1, 4, 1, 255, 255, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L1DOORS, 1, 4, 1, 255, 255, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 3, OFILE_SKULFIRE, 0, 0, 0, 3, 255, 1, 2, 11, 96, 1, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_LEVER, 1, 4, 1, 255, 255, 0, 1, 1, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST1, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST2, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST3, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 3, OFILE_CANDLE2, 0, 0, 0, 1, 255, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, 255, 0, 2, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, 255, 0, 1, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BANNER, 0, 0, 0, 3, 255, 0, 3, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_SKULPILE, 1, 4, 0, 255, 255, 0, 0, 1, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_L1BRAZ, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_CRUXSK1, 0, 0, 0, 255, 255, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 2, OFILE_CRUXSK2, 0, 0, 0, 255, 255, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 2, OFILE_CRUXSK3, 0, 0, 0, 255, 255, 0, 1, 15, 96, 1, 0, 1, 1, 3, 0 },
|
||||
{ 1, OFILE_ROCKSTAN, 5, 5, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_ANGEL, 0, 0, 0, 255, 255, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_BOOK2, 0, 0, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_BURNCROS, 0, 0, 0, 255, 255, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_NUDE2, 0, 0, 0, 255, 255, 1, 3, 6, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_SWITCH4, 16, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_TNUDEM, 13, 16, 0, 255, 6, 0, 1, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEM, 13, 16, 0, 6, 6, 0, 2, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEM, 13, 16, 0, 6, 6, 0, 3, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEM, 13, 16, 0, 6, 6, 0, 4, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEW, 13, 16, 0, 6, 6, 0, 1, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEW, 13, 16, 0, 6, 6, 0, 2, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TNUDEW, 13, 16, 0, 6, 6, 0, 3, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, -1, 6, 0, 1, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, -1, 6, 0, 2, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, -1, 6, 0, 3, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, -1, 6, 0, 4, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, -1, 6, 0, 5, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK2, 6, 6, 0, -1, -1, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_L2DOORS, 5, 8, 2, -1, -1, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L2DOORS, 5, 8, 2, -1, -1, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_WTORCH4, 5, 8, 2, -1, -1, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH3, 5, 8, 2, -1, -1, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH1, 5, 8, 2, -1, -1, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH2, 5, 8, 2, -1, -1, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_SARC, 1, 4, 1, -1, -1, 0, 1, 5, 128, 1, 1, 1, 0, 3, 1 },
|
||||
{ 2, OFILE_FLAME1, 1, 4, 1, -1, -1, 0, 1, 20, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_LEVER, 1, 4, 1, -1, -1, 0, 1, 2, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 2, OFILE_MINIWATR, 1, 4, 1, -1, -1, 1, 1, 10, 64, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK1, 3, 4, 1, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_TRAPHOLE, 1, 16, 0, -1, -1, 0, 1, 0, 64, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TRAPHOLE, 1, 16, 0, -1, -1, 0, 2, 0, 64, 0, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_BCASE, 0, 0, 0, -1, -1, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, -1, -1, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BARREL, 1, 16, 0, -1, -1, 0, 1, 9, 96, 1, 1, 1, 1, 3, 0 },
|
||||
{ 1, OFILE_BARRELEX, 1, 16, 0, -1, -1, 0, 1, 10, 96, 1, 1, 1, 1, 3, 0 },
|
||||
{ 3, OFILE_LSHRINEG, 0, 0, 0, 1, -1, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_RSHRINEG, 0, 0, 0, 1, -1, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BOOK2, 0, 0, 0, 3, -1, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BCASE, 0, 0, 0, 5, -1, 0, 3, 0, 96, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BCASE, 0, 0, 0, 5, -1, 0, 4, 0, 96, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BOOK2, 0, 0, 0, 5, -1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_CANDLE2, 0, 0, 0, 5, -1, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BLOODFNT, 0, 0, 0, 7, -1, 1, 2, 10, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_DECAP, 13, 16, 0, 8, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 0 },
|
||||
{ 1, OFILE_CHEST1, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST2, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST3, 1, 16, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_BOOK1, 7, 7, 2, -1, 8, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_BOOK1, 5, 5, 2, -1, 9, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_PEDISTL, 5, 5, 2, -1, 9, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_L3DOORS, 9, 12, 3, -1, -1, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L3DOORS, 9, 12, 3, -1, -1, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 3, OFILE_PFOUNTN, 0, 0, 0, 9, -1, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_ARMSTAND, 0, 0, 0, 10, -1, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_ARMSTAND, 0, 0, 0, 10, -1, 0, 2, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_GOATSHRN, 0, 0, 0, 11, -1, 1, 2, 10, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_CAULDREN, 13, 16, 0, -1, -1, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_MFOUNTN, 0, 0, 0, 13, -1, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_TFOUNTN, 0, 0, 0, 14, -1, 1, 2, 4, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_ALTBOY, 0, 0, 1, -1, 15, 0, 1, 0, 128, 1, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_MCIRL, 0, 0, 1, -1, 15, 0, 1, 0, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_MCIRL, 0, 0, 1, -1, 15, 0, 1, 0, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BKSLBRNT, 4, 12, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_CANDLE2, 2, 12, 0, -1, 15, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK1, 13, 13, 4, -1, 11, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_ARMSTAND, 13, 13, 0, -1, 11, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 13, 13, 0, -1, 11, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_BURNCROS, 0, 0, 0, 15, -1, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, 16, -1, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, 16, -1, 0, 2, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_MUSHPTCH, 0, 0, 0, -1, 1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 1 },
|
||||
{ 2, OFILE_LZSTAND, 0, 0, 0, -1, 15, 0, 1, 0, 128, 1, 0, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_DECAP, 9, 9, 3, -1, -1, 0, 2, 0, 96, 1, 1, 1, 0, 1, 0 },
|
||||
{ 2, OFILE_CHEST3, 0, 0, 0, -1, -1, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ -1, 0, 0, 0, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, 255, 6, 0, 1, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, 255, 6, 0, 2, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, 255, 6, 0, 3, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, 255, 6, 0, 4, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TSOUL, 13, 16, 0, 255, 6, 0, 5, 0, 128, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK2, 6, 6, 0, 255, 255, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_L2DOORS, 5, 8, 2, 255, 255, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L2DOORS, 5, 8, 2, 255, 255, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_WTORCH4, 5, 8, 2, 255, 255, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH3, 5, 8, 2, 255, 255, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH1, 5, 8, 2, 255, 255, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_WTORCH2, 5, 8, 2, 255, 255, 1, 1, 9, 96, 0, 1, 0, 0, 0, 0 },
|
||||
{ 1, OFILE_SARC, 1, 4, 1, 255, 255, 0, 1, 5, 128, 1, 1, 1, 0, 3, 1 },
|
||||
{ 2, OFILE_FLAME1, 1, 4, 1, 255, 255, 0, 1, 20, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_LEVER, 1, 4, 1, 255, 255, 0, 1, 2, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 2, OFILE_MINIWATR, 1, 4, 1, 255, 255, 1, 1, 10, 64, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK1, 3, 4, 1, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_TRAPHOLE, 1, 16, 0, 255, 255, 0, 1, 0, 64, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_TRAPHOLE, 1, 16, 0, 255, 255, 0, 2, 0, 64, 0, 1, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_BCASE, 0, 0, 0, 255, 255, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, 255, 255, 0, 1, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BARREL, 1, 16, 0, 255, 255, 0, 1, 9, 96, 1, 1, 1, 1, 3, 0 },
|
||||
{ 1, OFILE_BARRELEX, 1, 16, 0, 255, 255, 0, 1, 10, 96, 1, 1, 1, 1, 3, 0 },
|
||||
{ 3, OFILE_LSHRINEG, 0, 0, 0, 1, 255, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_RSHRINEG, 0, 0, 0, 1, 255, 0, 1, 11, 128, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BOOK2, 0, 0, 0, 3, 255, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BCASE, 0, 0, 0, 5, 255, 0, 3, 0, 96, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BCASE, 0, 0, 0, 5, 255, 0, 4, 0, 96, 0, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_BOOK2, 0, 0, 0, 5, 255, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_CANDLE2, 0, 0, 0, 5, 255, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_BLOODFNT, 0, 0, 0, 7, 255, 1, 2, 10, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_DECAP, 13, 16, 0, 8, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 0 },
|
||||
{ 1, OFILE_CHEST1, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST2, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_CHEST3, 1, 16, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ 1, OFILE_BOOK1, 7, 7, 2, 255, 8, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_BOOK1, 5, 5, 2, 255, 9, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_PEDISTL, 5, 5, 2, 255, 9, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_L3DOORS, 9, 12, 3, 255, 255, 0, 1, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 1, OFILE_L3DOORS, 9, 12, 3, 255, 255, 0, 2, 0, 64, 0, 0, 1, 0, 3, 1 },
|
||||
{ 3, OFILE_PFOUNTN, 0, 0, 0, 9, 255, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_ARMSTAND, 0, 0, 0, 10, 255, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_ARMSTAND, 0, 0, 0, 10, 255, 0, 2, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 3, OFILE_GOATSHRN, 0, 0, 0, 11, 255, 1, 2, 10, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_CAULDREN, 13, 16, 0, 255, 255, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_MFOUNTN, 0, 0, 0, 13, 255, 1, 2, 10, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 3, OFILE_TFOUNTN, 0, 0, 0, 14, 255, 1, 2, 4, 128, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_ALTBOY, 0, 0, 1, 255, 15, 0, 1, 0, 128, 1, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_MCIRL, 0, 0, 1, 255, 15, 0, 1, 0, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_MCIRL, 0, 0, 1, 255, 15, 0, 1, 0, 96, 0, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BKSLBRNT, 4, 12, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_CANDLE2, 2, 12, 0, 255, 15, 1, 2, 4, 96, 1, 1, 1, 0, 0, 0 },
|
||||
{ 1, OFILE_BOOK1, 13, 13, 4, 255, 11, 0, 4, 0, 96, 1, 1, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_ARMSTAND, 13, 13, 0, 255, 11, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 13, 13, 0, 255, 11, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_BURNCROS, 0, 0, 0, 15, 255, 1, 0, 10, 160, 1, 0, 0, 0, 0, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, 16, 255, 0, 1, 0, 96, 1, 0, 1, 0, 3, 0 },
|
||||
{ 2, OFILE_WEAPSTND, 0, 0, 0, 16, 255, 0, 2, 0, 96, 1, 0, 1, 0, 0, 0 },
|
||||
{ 2, OFILE_MUSHPTCH, 0, 0, 0, 255, 1, 0, 1, 0, 96, 1, 1, 1, 0, 3, 1 },
|
||||
{ 2, OFILE_LZSTAND, 0, 0, 0, 255, 15, 0, 1, 0, 128, 1, 0, 1, 0, 3, 0 },
|
||||
{ 1, OFILE_DECAP, 9, 9, 3, 255, 255, 0, 2, 0, 96, 1, 1, 1, 0, 1, 0 },
|
||||
{ 2, OFILE_CHEST3, 0, 0, 0, 255, 255, 0, 1, 0, 96, 1, 1, 1, 0, 1, 1 },
|
||||
{ -1, 0, 0, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
|
||||
};
|
||||
char *ObjMasterLoadList[56] =
|
||||
{
|
||||
|
|
@ -5456,7 +5456,7 @@ LABEL_47:
|
|||
v60 = random(v7, 37);
|
||||
v7 = v60;
|
||||
}
|
||||
while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)(1 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)(1 << v60)) );
|
||||
while ( !(plr[v53]._pMemSpells[1] & ((unsigned __int64)(1i64 << v60) >> 32) | plr[v53]._pMemSpells[0] & (unsigned int)(1i64 << v60)) );
|
||||
v61 = &plr[v53]._pSplLvl[v60 + 1];
|
||||
if ( *v61 < 2 )
|
||||
*v61 = 0;
|
||||
|
|
|
|||
|
|
@ -3938,14 +3938,14 @@ int __fastcall PM_DoSpell(int pnum)
|
|||
if ( !plr[v2]._pSplFrom )
|
||||
{
|
||||
if ( _LOBYTE(plr[v2]._pRSplType) == 2
|
||||
&& !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
|
||||
&& !(plr[v2]._pScrlSpells[1] & ((unsigned __int64)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pScrlSpells[0] & (unsigned int)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
|
||||
{
|
||||
plr[v2]._pRSpell = -1;
|
||||
_LOBYTE(plr[v2]._pRSplType) = 4;
|
||||
drawpanflag = 255;
|
||||
}
|
||||
if ( _LOBYTE(plr[v2]._pRSplType) == 3
|
||||
&& !(plr[v2]._pISpells[1] & ((unsigned __int64)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)(1 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
|
||||
&& !(plr[v2]._pISpells[1] & ((unsigned __int64)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1)) >> 32) | plr[v2]._pISpells[0] & (unsigned int)(1i64 << (_LOBYTE(plr[v2]._pRSpell) - 1))) )
|
||||
{
|
||||
plr[v2]._pRSpell = -1;
|
||||
_LOBYTE(plr[v2]._pRSplType) = 4;
|
||||
|
|
@ -4663,7 +4663,7 @@ void __cdecl ValidatePlayer()
|
|||
__int64 v14; // [esp+Ch] [ebp-8h]
|
||||
|
||||
v0 = 0;
|
||||
v14 = 0;
|
||||
v14 = 0i64;
|
||||
if ( (unsigned int)myplr >= 4 )
|
||||
TermMsg("ValidatePlayer: illegal player %d", myplr);
|
||||
v1 = myplr;
|
||||
|
|
@ -4711,7 +4711,7 @@ void __cdecl ValidatePlayer()
|
|||
{
|
||||
if ( *v11 != -1 )
|
||||
{
|
||||
v14 |= 1 << ((unsigned char)v12 - 1);
|
||||
v14 |= 1i64 << ((unsigned char)v12 - 1);
|
||||
v13 = &plr[v1]._pSplLvl[v12];
|
||||
if ( *v13 > 15 )
|
||||
*v13 = 15;
|
||||
|
|
|
|||
|
|
@ -27,21 +27,21 @@ int ReturnLvl; // idb
|
|||
|
||||
QuestData questlist[16] =
|
||||
{
|
||||
{ 5, -1, DTYPE_NONE, 0, 100, 0, 0, QUEST_INFRA5, "The Magic Rock" },
|
||||
{ 9, -1, DTYPE_NONE, 1, 100, 0, 0, QUEST_MUSH8, "Black Mushroom" },
|
||||
{ 4, -1, DTYPE_NONE, 2, 100, 0, 0, QUEST_GARBUD1, "Gharbad The Weak" },
|
||||
{ 8, -1, DTYPE_NONE, 3, 100, 0, 0, QUEST_ZHAR1, "Zhar the Mad" },
|
||||
{ 14, -1, DTYPE_NONE, 4, 100, 0, 0, QUEST_VEIL9, "Lachdanan" },
|
||||
{ 15, -1, DTYPE_NONE, 5, 100, 0, 1, QUEST_VILE3, "Diablo" },
|
||||
{ 5, 255, DTYPE_NONE, 0, 100, 0, 0, QUEST_INFRA5, "The Magic Rock" },
|
||||
{ 9, 255, DTYPE_NONE, 1, 100, 0, 0, QUEST_MUSH8, "Black Mushroom" },
|
||||
{ 4, 255, DTYPE_NONE, 2, 100, 0, 0, QUEST_GARBUD1, "Gharbad The Weak" },
|
||||
{ 8, 255, DTYPE_NONE, 3, 100, 0, 0, QUEST_ZHAR1, "Zhar the Mad" },
|
||||
{ 14, 255, DTYPE_NONE, 4, 100, 0, 0, QUEST_VEIL9, "Lachdanan" },
|
||||
{ 15, 255, DTYPE_NONE, 5, 100, 0, 1, QUEST_VILE3, "Diablo" },
|
||||
{ 2, 2, DTYPE_NONE, 6, 100, 0, 1, QUEST_BUTCH9, "The Butcher" },
|
||||
{ 4, -1, DTYPE_NONE, 7, 100, 0, 0, QUEST_BANNER2, "Ogden's Sign" },
|
||||
{ 7, -1, DTYPE_NONE, 8, 100, 0, 0, QUEST_BLINDING, "Halls of the Blind" },
|
||||
{ 5, -1, DTYPE_NONE, 9, 100, 0, 0, QUEST_BLOODY, "Valor" },
|
||||
{ 10, -1, DTYPE_NONE, 10, 100, 0, 0, QUEST_ANVIL5, "Anvil of Fury" },
|
||||
{ 13, -1, DTYPE_NONE, 11, 100, 0, 0, QUEST_BLOODWAR, "Warlord of Blood" },
|
||||
{ 4, 255, DTYPE_NONE, 7, 100, 0, 0, QUEST_BANNER2, "Ogden's Sign" },
|
||||
{ 7, 255, DTYPE_NONE, 8, 100, 0, 0, QUEST_BLINDING, "Halls of the Blind" },
|
||||
{ 5, 255, DTYPE_NONE, 9, 100, 0, 0, QUEST_BLOODY, "Valor" },
|
||||
{ 10, 255, DTYPE_NONE, 10, 100, 0, 0, QUEST_ANVIL5, "Anvil of Fury" },
|
||||
{ 13, 255, DTYPE_NONE, 11, 100, 0, 0, QUEST_BLOODWAR, "Warlord of Blood" },
|
||||
{ 3, 3, DTYPE_CATHEDRAL, 12, 100, 1, 1, QUEST_KING2, "The Curse of King Leoric" },
|
||||
{ 2, -1, DTYPE_CAVES, 13, 100, 4, 0, QUEST_POISON3, "Poisoned Water Supply" },
|
||||
{ 6, -1, DTYPE_CATACOMBS, 14, 100, 2, 0, QUEST_BONER, "The Chamber of Bone" },
|
||||
{ 2, 255, DTYPE_CAVES, 13, 100, 4, 0, QUEST_POISON3, "Poisoned Water Supply" },
|
||||
{ 6, 255, DTYPE_CATACOMBS, 14, 100, 2, 0, QUEST_BONER, "The Chamber of Bone" },
|
||||
{ 15, 15, DTYPE_CATHEDRAL, 15, 100, 5, 1, QUEST_VILE1, "Archbishop Lazarus" }
|
||||
};
|
||||
char questxoff[7] = { 0, -1, 0, -1, -2, -1, -2 };
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ char *sgszMusicTracks[6] =
|
|||
"Music\\DLvlD.wav",
|
||||
"Music\\Dintro.wav"
|
||||
};
|
||||
RECT8 QSRect[2] = { { { 15, -16 }, { 15, -16 } }, { { 30, -31 }, { 30, -31 } } }; /* psx version? */
|
||||
RECT8 QSRect[2] = { { { 15u, 240u }, { 15u, 240u } }, { { 30u, 225u }, { 30u, 225u } } }; /* psx version? */
|
||||
|
||||
//----- (00456CC0) --------------------------------------------------------
|
||||
struct sound_cpp_init
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ int world_4B325C = 0; // truncated with & 1, some kind of bool??
|
|||
unsigned char world_4B3260[5] = { 0u, 0u, 0u, 0u, 0u }; // single mask, int nTileMask
|
||||
int world_4B3265 = 0; // speed cel num
|
||||
int world_4B3269[5] = { 0, 0, 0, 0, 0 }; // seems to be a single pointer, void *pTileMask
|
||||
unsigned int tile_draw_masks[3][32] =
|
||||
int tile_draw_masks[3][32] =
|
||||
{
|
||||
{
|
||||
0xEAAAAAAA, 0xF5555555, 0xFEAAAAAA, 0xFF555555, 0xFFEAAAAA, 0xFFF55555, 0xFFFEAAAA, 0xFFFF5555,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ extern int world_4B325C;
|
|||
extern unsigned char world_4B3260[5];
|
||||
extern int world_4B3265;
|
||||
extern int world_4B3269[5];
|
||||
extern unsigned int tile_draw_masks[3][32];
|
||||
extern int tile_draw_masks[3][32];
|
||||
extern int world_4B33FD[48];
|
||||
extern int world_4B34BD[17];
|
||||
extern int world_4B3501[17];
|
||||
|
|
|
|||
6
enums.h
6
enums.h
|
|
@ -69,7 +69,7 @@ enum unique_base_item
|
|||
UITYPE_GRISWOLD = 0x42,
|
||||
UITYPE_LGTFORGE = 0x43,
|
||||
UITYPE_LAZSTAFF = 0x44,
|
||||
UITYPE_INVALID = -1,
|
||||
UITYPE_INVALID = 0xFF,
|
||||
};
|
||||
|
||||
enum item_effect_type
|
||||
|
|
@ -145,7 +145,7 @@ enum item_effect_type
|
|||
IPL_ADDMANAAC = 0x4D,
|
||||
IPL_FIRERESCLVL = 0x4E,
|
||||
IPL_AC_CURSE = 0x4F,
|
||||
IPL_INVALID = -1,
|
||||
IPL_INVALID = 0xFF,
|
||||
};
|
||||
|
||||
enum affix_item_type
|
||||
|
|
@ -1031,7 +1031,7 @@ enum item_equip_type
|
|||
ILOC_AMULET = 0x6,
|
||||
ILOC_UNEQUIPABLE = 0x7,
|
||||
ILOC_BELT = 0x8,
|
||||
ILOC_INVALID = -1,
|
||||
ILOC_INVALID = 0xFF,
|
||||
};
|
||||
|
||||
enum missile_id
|
||||
|
|
|
|||
10
structs.h
10
structs.h
|
|
@ -76,7 +76,7 @@ struct TSFX
|
|||
|
||||
struct TMenuItem
|
||||
{
|
||||
unsigned int dwFlags;
|
||||
int dwFlags;
|
||||
char *pszStr;
|
||||
void (__cdecl *fnMenu)(); /* fix, should have one arg */
|
||||
};
|
||||
|
|
@ -248,8 +248,8 @@ struct SpellData
|
|||
|
||||
struct Coord
|
||||
{
|
||||
char x;
|
||||
char y;
|
||||
unsigned char x;
|
||||
unsigned char y;
|
||||
};
|
||||
|
||||
struct RECT8
|
||||
|
|
@ -813,7 +813,7 @@ struct PlayerStruct
|
|||
char _pSBkSplType;
|
||||
char _pSplLvl[64];
|
||||
int remove_1;
|
||||
int _pMemSpells[2]; // __declspec(align(8))
|
||||
int _pMemSpells[2]; // __declspec(align(8))
|
||||
int _pAblSpells[2];
|
||||
int _pScrlSpells[2];
|
||||
int _pSpellFlags;
|
||||
|
|
@ -909,7 +909,7 @@ struct PlayerStruct
|
|||
int _pIBonusAC;
|
||||
int _pIBonusDamMod;
|
||||
int remove_2;
|
||||
int _pISpells[2]; //__declspec(align(8))
|
||||
int _pISpells[2]; //__declspec(align(8))
|
||||
int _pIFlags;
|
||||
int _pIGetHit;
|
||||
char _pISplLvlAdd;
|
||||
|
|
|
|||
Loading…
Reference in New Issue