diasurgical/devilution
1
0
Fork 0
mirror of https://github.com/diasurgical/devilution.git synced 2026-05-21 05:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bunch of unmerged stuff

Browse Source
This commit is contained in:
aperturesecurity
2018-10-09 22:09:27 +03:00
parent a26c634e79
commit 80eb28fa91
15 changed files with 21 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-3
View File
@@ -1,9 +1,6 @@
<<<<<<< HEAD
=======
# Generated by VC++ 6 builds
/vc60.idb
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# ELF object file.
*.o
.travis.yml
+3 -40
View File
@@ -1,39 +1,3 @@
<<<<<<< HEAD
language: cpp
os:
- linux
- osx
notifications:
email:
on_failure: change # default: always
addons:
# Packages for Linux
apt:
packages:
- mingw-w64
env:
- MAKE_BUILD=make
- MAKE_BUILD=debug
before_install:
# Packages for OSX
- if [ $TRAVIS_OS_NAME = osx ]; then brew install mingw-w64; fi
before_script:
- touch storm.dll
- touch diabloui.dll
script:
- if [ $MAKE_BUILD = make ]; then make; fi
- if [ $MAKE_BUILD = debug ]; then make debug; fi
after_script:
- make clean
=======
language: cpp
os:
@@ -93,8 +57,8 @@ jobs:
script:
- |
set -e
wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.3.4/devilution-comparer-v0.3.4-x86_64-unknown-linux-gnu.tar.xz
tar xf devilution-comparer-v0.3.4-x86_64-unknown-linux-gnu.tar.xz
wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.3.5/devilution-comparer-v0.3.5-x86_64-unknown-linux-gnu.tar.xz
tar xf devilution-comparer-v0.3.5-x86_64-unknown-linux-gnu.tar.xz
echo '#!/bin/sh' | sudo tee /bin/wine
echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
sudo chmod +x /bin/wine
@@ -104,5 +68,4 @@ jobs:
after_success:
- |
set -e
.travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
.travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK
3rdParty/Storm/Source/storm.cpp
Vendored
+2 -24
View File
@@ -7,13 +7,7 @@
BOOL STORMAPI SNetCreateGame(const char *pszGameName, const char *pszGamePassword, const char *pszGameStatString, DWORD dwGameType, char *GameTemplateData, int GameTemplateSize, int playerCount, char *creatorName, char *a11, int *playerID) rBool;
BOOL STORMAPI SNetDestroy() rBool;
<<<<<<< HEAD
BOOL STORMAPI SNetEnumProviders(int (STORMAPI *callback)(DWORD, DWORD, DWORD, DWORD), int mincaps) rBool;
BOOL STORMAPI SNetEnumGames(int (STORMAPI *callback)(DWORD, DWORD, DWORD), int *hintnextcall) rBool;
=======
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
BOOL STORMAPI SNetDropPlayer(int playerid, DWORD flags) rBool;
BOOL STORMAPI SNetGetGameInfo(int type, void *dst, size_t length, size_t *byteswritten) rBool;
@@ -61,10 +55,7 @@ BOOL STORMAPI SDlgEndDialog(HWND hDlg, HANDLE nResult) rBool;
BOOL STORMAPI SDlgSetControlBitmaps(HWND parentwindow, int *id, int a3, char *buffer2, char *buffer, int flags, int mask) rBool;
<<<<<<< HEAD
=======
BOOL STORMAPI SDlgBltToWindowI(HWND hWnd, HRGN a2, char *a3, int a4, void *buffer, RECT *rct, SIZE *size, int a8, int a9, DWORD rop) rBool;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
BOOL STORMAPI SDlgBltToWindowE(HWND hWnd, HRGN a2, char *a3, int a4, void *buffer, RECT *rct, SIZE *size, int a8, int a9, DWORD rop) rBool;
BOOL STORMAPI SDlgSetBitmapE(HWND hWnd, int a2, char *src, int mask1, int flags, int a6, int a7, int width, int a9, int mask2) rBool;
@@ -101,10 +92,7 @@ BOOL STORMAPI SFileLoadFileEx(void *hArchive, char *filename, int a3, int a4, in
BOOL STORMAPI SBltROP3(void *lpDstBuffer, void *lpSrcBuffer, int width, int height, int a5, int a6, int a7, DWORD rop) rBool;
BOOL STORMAPI SBltROP3Clipped(void *lpDstBuffer, RECT *lpDstRect, POINT *lpDstPt, int a4, void *lpSrcBuffer, RECT *lpSrcRect, POINT *lpSrcPt, int a8, int a9, DWORD rop) rBool;
<<<<<<< HEAD
=======
BOOL STORMAPI SBltROP3Tiled(void *lpDstBuffer, RECT *lpDstRect, POINT *lpDstPt, int a4, void *lpSrcBuffer, RECT *lpSrcRect, POINT *lpSrcPt, int a8, int a9, DWORD rop) rBool;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
BOOL STORMAPI SBmpDecodeImage(DWORD dwImgType, void *pSrcBuffer, DWORD dwSrcBuffersize, PALETTEENTRY *pPalette, void *pDstBuffer, DWORD dwDstBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp) rBool;
@@ -176,10 +164,7 @@ BOOL STORMAPI STransPointInMask(HANDLE hTrans, int x, int y) rBool;
BOOL STORMAPI STransCombineMasks(HANDLE hTransA, HANDLE hTransB, int left, int top, int flags, HANDLE * phTransResult) rBool;
BOOL STORMAPI STransCreateE(void *pBuffer, int width, int height, int bpp, int a5, int bufferSize, HANDLE *phTransOut) rBool;
<<<<<<< HEAD
=======
BOOL STORMAPI STransCreateI(void *pBuffer, int width, int height, int bpp, int a5, int bufferSize, HANDLE *phTransOut) rBool;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
BOOL STORMAPI SVidDestroy() rBool;
BOOL STORMAPI SVidGetSize(HANDLE video, int width, int height, int zero) rBool;
@@ -205,11 +190,7 @@ int STORMAPI SMemCmp(void *location1, void *location2, DWORD size) rInt;
int STORMAPI SStrCopy(char *dest, const char *src, int max_length) rInt;
DWORD STORMAPI SStrHash(const char *string, DWORD flags, DWORD Seed) rInt;
<<<<<<< HEAD
int STORMAPI SStrNCat(char *dest, const char *src, DWORD max_length) rInt;
=======
int STORMAPI SStrPack(char *dest, const char *src, DWORD max_length) rInt;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
int STORMAPI SStrLen(const char* string) rInt;
@@ -248,7 +229,7 @@ void __cdecl SDrawDestroy(void) rVoid;
bool __cdecl StormDestroy(void) rBool;
bool __stdcall SFileSetBasePath(char *) rBool;
void __cdecl SDrawRealizePalette(void) rVoid;
bool __cdecl SVidPlayContinue(void) rBool;
BOOL __cdecl SVidPlayContinue(void) rBool;
bool __stdcall SNetGetOwnerTurnsWaiting(int *) rBool;
void * __stdcall SNetUnregisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *)) rPVoid;
void * __stdcall SNetRegisterEventHandler(int,void (__stdcall*)(struct _SNETEVENT *)) rPVoid;
@@ -256,8 +237,6 @@ bool __stdcall SNetSetBasePlayer(int) rBool;
int __stdcall SNetInitializeProvider(unsigned long,struct _SNETPROGRAMDATA *,struct _SNETPLAYERDATA *,struct _SNETUIDATA *,struct _SNETVERSIONDATA *) rInt;
int __stdcall SNetGetProviderCaps(struct _SNETCAPS *) rInt;
int __stdcall SFileSetFilePointer(HANDLE,int,HANDLE,int) rInt;
<<<<<<< HEAD
=======
void __stdcall SDrawClearSurface(int a1) rVoid;
BOOL __stdcall SDlgSetBitmapI(HWND hWnd, int a2, char *src, int mask1, int flags, void *pBuff, int a7, int width, int height, int mask2) rBool;
void __stdcall SDlgBeginPaint(HWND hWnd, char *a2) rVoid;
@@ -268,5 +247,4 @@ BOOL __stdcall SDlgSetTimer(int a1, int a2, int a3, void (__stdcall *a4)(int, in
BOOL __stdcall SDlgKillTimer(int a1, int a2) rBool;
BOOL __stdcall SDlgDrawBitmap(HWND hWnd, int a2, int a3, int a4, int a5, int a6, int a7) rBool;
BOOL __stdcall SDlgDialogBoxParam(HINSTANCE hInst, char *szDialog, int a3, WNDPROC func, int a5) rBool;
BOOL __stdcall SGdiTextOut(void *pBuffer, int x, int y, int mask, char *str, int len) rBool;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
BOOL __stdcall SGdiTextOut(void *pBuffer, int x, int y, int mask, char *str, int len) rBool;
3rdParty/Storm/Source/storm.def
Vendored
+1 -46
View File
@@ -3,15 +3,9 @@ LIBRARY "Storm"
EXPORTS
SNetCreateGame @101 NONAME
SNetDestroy @102 NONAME
<<<<<<< HEAD
SNetEnumProviders @103 NONAME
;SNetEnumDevices @104 NONAME
SNetEnumGames @105 NONAME
=======
;SNetEnumDevices @103 NONAME
;SNetEnumGames @104 NONAME
;SNetEnumProviders @105 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SNetDropPlayer @106 NONAME
SNetGetGameInfo @107 NONAME
;SNetGetNetworkLatency @108 NONAME
@@ -57,32 +51,14 @@ EXPORTS
;Ordinal150 @150 NONAME
;Ordinal151 @151 NONAME
<<<<<<< HEAD
;SDlgBeginPaint @201 NONAME
;SDlgBltToWindowI @202 NONAME
=======
SDlgBeginPaint @201 NONAME
SDlgBltToWindowI @202 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SDlgCheckTimers @203 NONAME
;SDlgCreateDialogIndirectParam @204 NONAME
;SDlgCreateDialogParam @205 NONAME
SDlgDefDialogProc @206 NONAME
SDlgDialogBoxIndirectParam @208 NONAME
<<<<<<< HEAD
;SDlgDialogBoxParam @209 NONAME
;SDlgDrawBitmap @210 NONAME
SDlgEndDialog @211 NONAME
;SDlgEndPaint @212 NONAME
;SDlgKillTimer @213 NONAME
;SDlgSetBaseFont @214 NONAME
;SDlgSetBitmapI @215 NONAME
SDlgSetControlBitmaps @216 NONAME
;SDlgSetCursor @217 NONAME
;SDlgSetSystemCursor @218 NONAME
;SDlgSetTimer @219 NONAME
=======
SDlgDialogBoxParam @209 NONAME
SDlgDrawBitmap @210 NONAME
SDlgEndDialog @211 NONAME
@@ -94,7 +70,6 @@ EXPORTS
SDlgSetCursor @217 NONAME
SDlgSetSystemCursor @218 NONAME
SDlgSetTimer @219 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SDlgUpdateCursor @220 NONAME
SDlgBltToWindowE @221 NONAME
SDlgSetBitmapE @222 NONAME
@@ -159,11 +134,7 @@ EXPORTS
;SBltGetSCode @312 NONAME
SBltROP3 @313 NONAME
SBltROP3Clipped @314 NONAME
<<<<<<< HEAD
;SBltROP3Tiled @315 NONAME
=======
SBltROP3Tiled @315 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SBmpDecodeImage @321 NONAME
@@ -180,11 +151,7 @@ EXPORTS
SDrawAutoInitialize @341 NONAME
SDrawCaptureScreen @342 NONAME
<<<<<<< HEAD
;SDrawClearSurface @343 NONAME
=======
SDrawClearSurface @343 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SDrawDestroy @344 NONAME
;SDrawFlipPage @345 NONAME
SDrawGetFrameWindow @346 NONAME
@@ -220,11 +187,7 @@ EXPORTS
;SGdiRectangle @388 NONAME
SGdiSelectObject @389 NONAME
SGdiSetPitch @390 NONAME
<<<<<<< HEAD
;SGdiTextOut @391 NONAME
=======
SGdiTextOut @391 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SGdi392 @392 NONAME
Ordinal393 @393 NONAME
@@ -258,11 +221,7 @@ EXPORTS
;SReg430 @430 NONAME
STransBlt @431 NONAME
STransBltUsingMask @432 NONAME
<<<<<<< HEAD
;STransCreateI @433 NONAME
=======
STransCreateI @433 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
STransDelete @434 NONAME
STransDuplicate @436 NONAME
@@ -329,11 +288,7 @@ EXPORTS
SStrCopy @501 NONAME
SStrHash @502 NONAME
<<<<<<< HEAD
SStrNCat @503 NONAME
=======
SStrPack @503 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SStrTokenize @504 NONAME
;SStrPack @505 NONAME
SStrLen @506 NONAME
@@ -483,4 +438,4 @@ EXPORTS
;SUniConvert913 @913 NONAME
;SUniConvert914 @914 NONAME
;SUniConvertUTF8ToWin @915 NONAME
; END
; END
3rdParty/Storm/Source/storm_gcc.def
Vendored
+1 -61
View File
@@ -5,15 +5,9 @@ EXPORTS
SNetCreateGame@40 @101 NONAME
SNetDestroy @102 NONAME
SNetDestroy@0 @102 NONAME
<<<<<<< HEAD
SNetEnumProviders @103 NONAME
;SNetEnumDevices @104 NONAME
SNetEnumGames @105 NONAME
=======
;SNetEnumDevices @103 NONAME
;SNetEnumGames @104 NONAME
;SNetEnumProviders @105 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SNetDropPlayer @106 NONAME
SNetDropPlayer@8 @106 NONAME
SNetGetGameInfo @107 NONAME
@@ -75,34 +69,14 @@ EXPORTS
;Ordinal150 @150 NONAME
;Ordinal151 @151 NONAME
<<<<<<< HEAD
;SDlgBeginPaint @201 NONAME
;SDlgBltToWindowI @202 NONAME
=======
SDlgBeginPaint @201 NONAME
SDlgBeginPaint@8 @201 NONAME
SDlgBltToWindowI @202 NONAME
SDlgBltToWindowI@40 @202 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SDlgCheckTimers @203 NONAME
;SDlgCreateDialogIndirectParam @204 NONAME
;SDlgCreateDialogParam @205 NONAME
SDlgDefDialogProc @206 NONAME
<<<<<<< HEAD
SDlgDialogBoxIndirectParam @208 NONAME
;SDlgDialogBoxParam @209 NONAME
;SDlgDrawBitmap @210 NONAME
SDlgEndDialog @211 NONAME
;SDlgEndPaint @212 NONAME
;SDlgKillTimer @213 NONAME
;SDlgSetBaseFont @214 NONAME
;SDlgSetBitmapI @215 NONAME
SDlgSetControlBitmaps @216 NONAME
;SDlgSetCursor @217 NONAME
;SDlgSetSystemCursor @218 NONAME
;SDlgSetTimer @219 NONAME
=======
SDlgDefDialogProc@16 @206 NONAME
SDlgDialogBoxIndirectParam @208 NONAME
@@ -127,7 +101,6 @@ EXPORTS
SDlgSetSystemCursor@16 @218 NONAME
SDlgSetTimer @219 NONAME
SDlgSetTimer@16 @219 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SDlgUpdateCursor @220 NONAME
SDlgBltToWindowE @221 NONAME
SDlgSetBitmapE @222 NONAME
@@ -207,23 +180,15 @@ EXPORTS
;SBltGetSCode @312 NONAME
SBltROP3 @313 NONAME
<<<<<<< HEAD
SBltROP3Clipped @314 NONAME
;SBltROP3Tiled @315 NONAME
=======
SBltROP3@32 @313 NONAME
SBltROP3Clipped @314 NONAME
SBltROP3Tiled @315 NONAME
SBltROP3Tiled@40 @315 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SBmpDecodeImage @321 NONAME
SBmpLoadImage @323 NONAME
<<<<<<< HEAD
=======
SBmpLoadImage@28 @323 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SBmpSaveImage @324 NONAME
SBmpAllocLoadImage @325 NONAME
;SBmpSaveImageEx @326 NONAME
@@ -236,12 +201,8 @@ EXPORTS
SDrawAutoInitialize @341 NONAME
SDrawCaptureScreen @342 NONAME
<<<<<<< HEAD
;SDrawClearSurface @343 NONAME
=======
SDrawClearSurface @343 NONAME
SDrawClearSurface@4 @343 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
SDrawDestroy @344 NONAME
;SDrawFlipPage @345 NONAME
SDrawGetFrameWindow @346 NONAME
@@ -274,16 +235,6 @@ EXPORTS
;SGdiBitBlt @381 NONAME
;SGdiCreateFont @382 NONAME
SGdiDeleteObject @383 NONAME
<<<<<<< HEAD
;SGdiDestroy @384 NONAME
SGdiExtTextOut @385 NONAME
SGdiImportFont @386 NONAME
;SGdiLoadFont @387 NONAME
;SGdiRectangle @388 NONAME
SGdiSelectObject @389 NONAME
SGdiSetPitch @390 NONAME
;SGdiTextOut @391 NONAME
=======
SGdiDeleteObject@4 @383 NONAME
;SGdiDestroy @384 NONAME
SGdiExtTextOut @385 NONAME
@@ -297,7 +248,6 @@ EXPORTS
SGdiSetPitch@4 @390 NONAME
SGdiTextOut @391 NONAME
SGdiTextOut@24 @391 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SGdi392 @392 NONAME
Ordinal393 @393 NONAME
@@ -338,18 +288,12 @@ EXPORTS
;SReg429 @429 NONAME
;SReg430 @430 NONAME
STransBlt @431 NONAME
<<<<<<< HEAD
STransBltUsingMask @432 NONAME
;STransCreateI @433 NONAME
STransDelete @434 NONAME
=======
STransBlt@20 @431 NONAME
STransBltUsingMask @432 NONAME
STransCreateI @433 NONAME
STransCreateI@28 @433 NONAME
STransDelete @434 NONAME
STransDelete@4 @434 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
STransDuplicate @436 NONAME
STransIntersectDirtyArray @437 NONAME
@@ -423,12 +367,8 @@ EXPORTS
SStrCopy @501 NONAME
SStrCopy@12 @501 NONAME
SStrHash @502 NONAME
<<<<<<< HEAD
SStrNCat @503 NONAME
=======
SStrPack @503 NONAME
SStrPack@12 @503 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
;SStrTokenize @504 NONAME
;SStrPack @505 NONAME
SStrLen @506 NONAME
@@ -578,4 +518,4 @@ EXPORTS
;SUniConvert913 @913 NONAME
;SUniConvert914 @914 NONAME
;SUniConvertUTF8ToWin @915 NONAME
; END
; END
Diablo.dsp
+1 -41
View File
@@ -7,22 +7,6 @@
CFG=Diablo - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
<<<<<<< HEAD
!MESSAGE
!MESSAGE NMAKE /f "Diablo.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Diablo.mak" CFG="Diablo - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Diablo - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "Diablo - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "Diablo - Win32 Release with PDB" (based on "Win32 (x86) Application")
!MESSAGE
=======
!MESSAGE
!MESSAGE NMAKE /f "Diablo.mak".
!MESSAGE
@@ -37,7 +21,6 @@ CFG=Diablo - Win32 Debug
!MESSAGE "Diablo - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "Diablo - Win32 Release with PDB" (based on "Win32 (x86) Application")
!MESSAGE
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -62,10 +45,6 @@ RSC=rc.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
<<<<<<< HEAD
# SUBTRACT CPP /WX
=======
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -90,17 +69,6 @@ LINK32=link.exe
# PROP Intermediate_Dir "Source/WinDebug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
<<<<<<< HEAD
# ADD BASE CPP /nologo /MT /W3 /Gm /GX /Zi /O1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "NDEBUG" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /D "NDEBUG" /mktyplib203 /o "NUL" /win32 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "NDEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
=======
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /O1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -109,7 +77,6 @@ BSC32=bscmake.exe
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /machine:I386
@@ -143,11 +110,7 @@ LINK32=link.exe
# ADD BASE LINK32 DiabloUI/WinRel/DiabloUI.lib 3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 DiabloUI/WinRel/DiabloUI.lib 3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib version.lib /nologo /subsystem:windows /debug /machine:I386
<<<<<<< HEAD
!ENDIF
=======
!ENDIF
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# Begin Target
@@ -445,8 +408,6 @@ SOURCE=.\Diablo.rc
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
<<<<<<< HEAD
=======
# Begin Source File
@@ -736,7 +697,6 @@ SOURCE=.\Source\trigs.h
SOURCE=.\Source\wave.h
# End Source File
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# Begin Source File
SOURCE=.\resource.h
@@ -755,4 +715,4 @@ SOURCE=.\3rdParty\PKWare\implode.cpp
# End Source File
# End Group
# End Target
# End Project
# End Project
Diablo.dsw
-4
View File
@@ -29,12 +29,9 @@ Package=<5>
Package=<4>
{{{
<<<<<<< HEAD
=======
Begin Project Dependency
Project_Dep_Name Storm
End Project Dependency
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
}}}
###############################################################################
@@ -62,4 +59,3 @@ Package=<3>
}}}
###############################################################################
DiabloUI/DiabloUI.dsp
+1 -12
View File
@@ -52,11 +52,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
<<<<<<< HEAD
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /def:"diabloui.def"
=======
# ADD LINK32 ../3rdParty/Storm/Source/WinRel/Storm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /def:"diabloui.def"
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
!ELSEIF "$(CFG)" == "DiabloUI - Win32 Debug"
@@ -81,11 +77,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
<<<<<<< HEAD
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:"diabloui.def" /pdbtype:sept
=======
# ADD LINK32 ../3rdParty/Storm/Source/WinDebug/Storm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:"diabloui.def" /pdbtype:sept
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
!ENDIF
@@ -97,12 +89,9 @@ LINK32=link.exe
SOURCE=.\diabloui.cpp
# End Source File
<<<<<<< HEAD
=======
# Begin Source File
SOURCE=.\diabloui.res
# End Source File
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
# End Target
# End Project
# End Project
DiabloUI/DiabloUI.vcxproj
+1 -13
View File
@@ -86,11 +86,7 @@
<ModuleDefinitionFile>diabloui.def</ModuleDefinitionFile>
<OutputFile>.\WinRel\DiabloUI.dll</OutputFile>
<ImportLibrary>.\WinRel\DiabloUI.lib</ImportLibrary>
<<<<<<< HEAD
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
=======
<AdditionalDependencies>../3rdParty/Storm/Source/WinRel/Storm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -132,11 +128,7 @@
<ModuleDefinitionFile>diabloui.def</ModuleDefinitionFile>
<OutputFile>.\WinDebug\DiabloUI.dll</OutputFile>
<ImportLibrary>.\WinDebug\DiabloUI.lib</ImportLibrary>
<<<<<<< HEAD
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
=======
<AdditionalDependencies>../3rdParty/Storm/Source/WinDebug/Storm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -151,8 +143,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<<<<<<< HEAD
</Project>
=======
</Project>
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
</Project>
DiabloUI/diabloui.cpp
+1 -48
View File
@@ -15,52 +15,6 @@
#include "..\defs.h"
#include "..\enums.h"
#include "..\structs.h"
<<<<<<< HEAD
#include "diabloui.h"
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
switch (ul_reason_for_call)
{
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:
case DLL_THREAD_DETACH:
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
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 0; }
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; }
=======
#include "..\3rdParty\Storm\Source\storm.h"
#include "diabloui.h"
@@ -197,5 +151,4 @@ void __cdecl DiabloUI_cpp_init()
DiabloUI_cpp_float = DiabloUI_cpp_float_value;
}
// 1001F410: using guessed type int DiabloUI_cpp_float_value;
// 10029710: using guessed type int DiabloUI_cpp_float;
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
// 10029710: using guessed type int DiabloUI_cpp_float;
DiabloUI/diabloui.def
+1 -30
View File
@@ -1,34 +1,6 @@
LIBRARY "DiabloUI"
EXPORTS
<<<<<<< HEAD
UiDestroy
UiTitleDialog
UiInitialize
UiCopyProtError
UiAppActivate
UiValidPlayerName
UiSelHeroMultDialog
UiSelHeroSingDialog
UiCreditsDialog
UiMainMenuDialog
UiProgressDialog
UiProfileGetString
UiProfileCallback
UiProfileDraw
UiCategoryCallback
UiGetDataCallback
UiAuthCallback
UiSoundCallback
UiMessageBoxCallback
UiDrawDescCallback
UiCreateGameCallback
UiArtCallback
UiSelectGame
UiSelectProvider
UiCreatePlayerDescription
UiSetupPlayerInfo
=======
UiValidPlayerName
UiAppActivate
UiArtCallback
@@ -61,5 +33,4 @@ EXPORTS
UiSetSpawned
UiSetupPlayerInfo
UiSoundCallback
UiTitleDialog
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
UiTitleDialog
DiabloUI/diabloui_gcc.def
+1 -52
View File
@@ -1,53 +1,3 @@
<<<<<<< HEAD
LIBRARY "DiabloUI"
EXPORTS
UiValidPlayerName @1 NONAME
UiValidPlayerName@4 @1 NONAME
UiAppActivate @2 NONAME
UiAppActivate@4 @2 NONAME
UiArtCallback @3 NONAME
UiAuthCallback @4 NONAME
UiBetaDisclaimer @5 NONAME
UiCategoryCallback @6 NONAME
UiCopyProtError @7 NONAME
UiCreateGameCallback @8 NONAME
UiCreateGameCriteria @9 NONAME
UiCreatePlayerDescription @10 NONAME
UiCreatePlayerDescription@12 @10 NONAME
UiCreditsDialog @11 NONAME
UiCreditsDialog@4 @11 NONAME
UiDestroy @12 NONAME
UiDrawDescCallback @13 NONAME
UiGetDataCallback @14 NONAME
UiGetDefaultStats @15 NONAME
UiInitialize @16 NONAME
UiMainMenuDialog @17 NONAME
UiMainMenuDialog@16 @17 NONAME
UiMessageBoxCallback @18 NONAME
UiOnPaint @19 NONAME
UiProfileCallback @20 NONAME
UiProfileDraw @21 NONAME
UiProfileGetString @22 NONAME
UiProgressDialog @23 NONAME
UiProgressDialog@20 @23 NONAME
UiSelHeroMultDialog @24 NONAME
UiSelHeroMultDialog@28 @24 NONAME
UiSelHeroSingDialog @25 NONAME
UiSelHeroSingDialog@28 @25 NONAME
UiSelectGame @26 NONAME
UiSelectGame@24 @26 NONAME
UiSelectProvider @27 NONAME
UiSelectProvider@24 @27 NONAME
UiSelectRegion @28 NONAME
UiSetBackgroundBitmap @29 NONAME
UiSetSpawned @30 NONAME
UiSetupPlayerInfo @31 NONAME
UiSetupPlayerInfo@12 @31 NONAME
UiSoundCallback @32 NONAME
UiTitleDialog @33 NONAME
UiTitleDialog@4 @33 NONAME
=======
LIBRARY "DiabloUI"
EXPORTS
@@ -104,5 +54,4 @@ EXPORTS
UiSoundCallback @32
UiSoundCallback@12 @32 NONAME
UiTitleDialog @33
UiTitleDialog@4 @33 NONAME
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
UiTitleDialog@4 @33 NONAME
MakefileVC
+6 -89
View File
@@ -1,88 +1,3 @@
<<<<<<< HEAD
VC5_DIR ?= $(HOME)/DevStudio_5.10/VC
# The $(VS6_DIR) directory is a copy of the "Microsoft Visual Studio" directory.
#
# To get a working setup on Linux or other "portable" copies of VS,
# the following DLLs have to be compied to the
# $(VS6_DIR)/VC98/Bin directory.
#
# - $(VS6_DIR)/Common/MSDev98/Bin/MSPDB60.DLL
VS6_DIR ?= $(HOME)/VS6
VC6_DIR = $(VS6_DIR)/VC98
VC6_BIN_DIR = $(VC6_DIR)/Bin
VC6_INC_DIR = $(VC6_DIR)/Include
VC6_LIB_DIR = $(VC6_DIR)/Lib
VC5_LIB_DIR = $(VC5_DIR)/lib
IDE_DIR ?= $(VS6_DIR)/Common/MSDev98
IDE_BIN_DIR = $(IDE_DIR)/bin
ifeq ($(OS),Windows_NT)
CL = $(VC6_BIN_DIR)/CL.EXE
RC = $(IDE_BIN_DIR)/RC.EXE
VC5_LINK = $(VC5_DIR)/bin/link.exe
VC6_LINK = $(VC6_BIN_DIR)/link.exe
else
CL = wine $(VC6_BIN_DIR)/CL.EXE
RC = wine $(IDE_BIN_DIR)/RC.EXE
VC5_LINK = wine $(VC5_DIR)/bin/link.exe
VC6_LINK = wine $(VC6_BIN_DIR)/link.exe
endif
CFLAGS=/nologo /c /GX /W3 /O1 /I $(VC6_INC_DIR) /FD /MT /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"Diablo.pch" /YX /Gm /Zi
LINKFLAGS=/nologo /subsystem:windows /machine:I386 /incremental:no
ifeq ($(MAKE_BUILD),pdb)
VC_LINK = $(VC6_LINK)
LINKFLAGS += /pdb:"Diablo.pdb" /LIBPATH:$(VC6_LIB_DIR) /debug
else
VC_LINK=$(VC5_LINK)
LINKFLAGS+= /LIBPATH:$(VC5_LIB_DIR)
endif
all: Diablo.exe
# fix compilation order to match the VC6 workspace files
DIABLO_SRC=$(sort $(filter-out Source/render.cpp, $(wildcard Source/*.cpp)))
DIABLO_SRC += Source/render.cpp
OBJS=$(DIABLO_SRC:.cpp=.obj)
PKWARE_SRC=$(sort $(wildcard 3rdParty/PKWare/*.cpp))
PKWARE_OBJS=$(PKWARE_SRC:.cpp=.obj)
STORM_SRC=$(sort $(wildcard 3rdParty/Storm/Source/*.cpp))
STORM_OBJS=$(STORM_SRC:.cpp=.obj)
DIABLOUI_SRC=$(sort $(wildcard DiabloUI/*.cpp))
DIABLOUI_OBJS=$(DIABLOUI_SRC:.cpp=.obj)
Diablo.exe: main_files $(PKWARE_OBJS) diablo.res DiabloUI/diabloui.lib 3rdParty/Storm/Source/storm.lib
$(VC_LINK) /OUT:$@ $(LINKFLAGS) $(OBJS) $(PKWARE_OBJS) diablo.res advapi32.lib gdi32.lib shell32.lib user32.lib version.lib DiabloUI/diabloui.lib 3rdParty/Storm/Source/storm.lib
DiabloUI/diabloui.lib: $(DIABLOUI_OBJS)
$(CL) $^ /link /LINK50COMPAT /nologo /dll /subsystem:windows /machine:I386 /LIBPATH:$(VC6_LIB_DIR) /def:"DiabloUI/diabloui.def" /out:DiabloUI/diabloui.dll
3rdParty/Storm/Source/storm.lib: $(STORM_OBJS)
$(CL) $^ /link /LINK50COMPAT /nologo /dll /subsystem:windows /machine:I386 /LIBPATH:$(VC6_LIB_DIR) /def:"3rdParty/Storm/Source/storm.def" /out:3rdParty/Storm/Source/storm.dll
# compiles all main source files with once compiler call
main_files:
$(CL) $(CFLAGS) /FoSource/ $(DIABLO_SRC)
%.obj: %.cpp
$(CL) $(CFLAGS) /Fo$@ $<
diablo.res: Diablo.rc
$(RC) /i $(VC6_INC_DIR) /i $(VC6_DIR)/MFC/Include /l 0x409 /fo $@ $<
clean:
@$(RM) -v $(OBJS) $(PKWARE_OBJS) $(STORM_OBJS) $(DIABLOUI_OBJS) DiabloUI/diabloui.{exp,lib,dll} 3rdParty/Storm/Source/storm.{exp,lib,dll}
.PHONY: clean all
=======
VC5_DIR ?= $(HOME)/DevStudio_5.10/VC
# The $(VS6_DIR) directory is a copy of the "Microsoft Visual Studio" directory.
@@ -134,8 +49,11 @@ endif
all: Diablo.exe
# fix compilation order to match the VC6 workspace files
DIABLO_SRC=$(sort $(filter-out Source/render.cpp, $(wildcard Source/*.cpp)))
debug: CFLAGS += /D "_DEBUG"
debug: Diablo.exe
# fix compilation order to match the VC6 workspace files and exclude local assembly functions
DIABLO_SRC=$(sort $(filter-out Source/_asm.cpp Source/render.cpp, $(wildcard Source/*.cpp)))
DIABLO_SRC += Source/render.cpp
OBJS=$(DIABLO_SRC:.cpp=.obj)
@@ -170,5 +88,4 @@ diablo.res: Diablo.rc
clean:
@$(RM) -v $(OBJS) $(PKWARE_OBJS) $(STORM_OBJS) $(DIABLOUI_OBJS) DiabloUI/diabloui.{exp,lib,dll} 3rdParty/Storm/Source/storm.{exp,lib,dll}
.PHONY: clean all
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
.PHONY: clean all
README.md
-11
View File
@@ -1,14 +1,6 @@
<<<<<<< HEAD
Devilution: [![Build Status](https://travis-ci.org/diasurgical/devilution.svg?branch=master)](https://travis-ci.org/diasurgical/devilution)
[![Build status](https://ci.appveyor.com/api/projects/status/ssk0xjhoka1uu940?svg=true)](https://ci.appveyor.com/project/galaxyhaxz/devilution)
Nightly: [![Build Status](https://travis-ci.com/diasurgical/devil-nightly.svg?branch=master)](https://travis-ci.com/diasurgical/devil-nightly)
=======
[![Build Status](https://travis-ci.org/diasurgical/devilution.svg?branch=master)](https://travis-ci.org/diasurgical/devilution)
[![Build status](https://ci.appveyor.com/api/projects/status/ssk0xjhoka1uu940?svg=true)](https://ci.appveyor.com/project/galaxyhaxz/devilution)
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
[Discord](https://discord.gg/XEKDxHK)
# Devilution
@@ -53,7 +45,6 @@ Make sure to enable these when installing (or modify your installation):
- Requires "Visual C++ MFC for x86 and x64" (For afxres.h)
- Requires "Windows Universal CRT SDK" (For ctype.h)
<<<<<<< HEAD
### Building XDiablo (For Linux)
Install the following libs on your machine.
- apt-get install g++-multilib libc6-dev-i386
@@ -84,8 +75,6 @@ Keep in mind please that this is still being worked on and is missing parts of U
=======
>>>>>>> f6e2020b172a7b4e6592aa3703c0c2245f69cc6f
### Building with MinGW
- Execute `make MINGW32=1` for **MinGW32** or `make` for **MinGW64**. Optionally add `debug` to build with debug features.
Stub/sdlrender.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include <SDL_mixer.h>
int SCREEN_WIDTH = 640;
int SCREEN_HEIGHT = 480;
int SCREEN_HEIGHT = 500;
int LogoWidth;
int LogoHeight;
@@ -254,7 +254,7 @@ void SDL_RenderDiabloMainPage()
if (FontLoaded == 0) {
FC_LoadFont(Subfont, renderer, LDirectory, 12, FC_MakeColor(112, 106, 70, 255), TTF_STYLE_NORMAL);
FC_LoadFont(Subfont, renderer, LDirectory, 13, FC_MakeColor(112, 106, 70, 255), TTF_STYLE_NORMAL);
printf("LoadFont\n\n");
FontLoaded = 1;