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

The big cheap fix (#446)

Browse source
This commit is contained in:
galaxyhaxz 2018-11-05 21:47:14 -06:00 • committed by GitHub
commit 1324082090
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10283 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -25,7 +25,7 @@ debug: CXXFLAGS += -D_DEBUG
debug: CPPFLAGS += -D_DEBUG
debug: devilution.exe
DIABLO_SRC=$(sort $(filter-out Source/_asm.cpp, $(wildcard Source/*.cpp)))
DIABLO_SRC=$(sort $(filter-out Source/_asm.cpp Source/_render.cpp, $(wildcard Source/*.cpp)))
OBJS=$(DIABLO_SRC:.cpp=.o)
PKWARE_SRC=$(wildcard 3rdParty/PKWare/*.cpp)

2
MakefileVC
View file

@ -53,7 +53,7 @@ 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=$(sort $(filter-out Source/_asm.cpp Source/_render.cpp Source/render.cpp, $(wildcard Source/*.cpp)))
DIABLO_SRC += Source/render.cpp
OBJS=$(DIABLO_SRC:.cpp=.obj)

10277
Source/_render.cpp Normal file
View file

File diff suppressed because it is too large Load diff

4
Source/render.cpp
View file

@ -77,6 +77,9 @@ int WorldTbl17_2[17] = { 0, 32, 60, 88, 112, 136, 156, 176, 192, 208, 220, 232,
|/
*/
#if (_MSC_VER >= 800) && (_MSC_VER <= 1200)
#include "_render.cpp"
#else
void __fastcall drawTopArchesUpperScreen(unsigned char *pbDst)
{
unsigned char *dst; // edi MAPDST
@ -5208,3 +5211,4 @@ void __fastcall world_draw_black_tile(unsigned char *pbDst)
yy_32 += 2;
} while (yy_32 != 32);
}
#endif