Browse Source

Make missiles.cpp compile as C (#531)

pull/25/head
Anders Jenbo 7 years ago committed by Robin Eklind
parent
commit
06554e6db8
  1. 2
      MakefileVC
  2. 12
      Source/missiles.cpp

2
MakefileVC

@ -58,7 +58,7 @@ DIABLO_SRC += Source/render.cpp
OBJS=$(DIABLO_SRC:.cpp=.obj)
# hardcoded list of src files, because only some of them are ready to be compiled as C instead of C++
# once all files compile as C we should use the /TC flag abd DIABLO_SRC instead
DIABLO_SRC_FIXED = Source/appfat.cpp /TcSource/automap.cpp Source/capture.cpp /TcSource/codec.cpp Source/control.cpp /TcSource/cursor.cpp /TcSource/dead.cpp /TcSource/debug.cpp Source/diablo.cpp /TcSource/doom.cpp /TcSource/drlg_l1.cpp /TcSource/drlg_l2.cpp Source/drlg_l3.cpp /TcSource/drlg_l4.cpp Source/dthread.cpp Source/dx.cpp /TcSource/effects.cpp /TcSource/encrypt.cpp Source/engine.cpp /TcSource/error.cpp Source/fault.cpp /TcSource/gamemenu.cpp /TcSource/gendung.cpp /TcSource/gmenu.cpp /TcSource/help.cpp /TcSource/init.cpp /TcSource/interfac.cpp /TcSource/inv.cpp Source/items.cpp Source/lighting.cpp /TcSource/loadsave.cpp Source/logging.cpp /TcSource/mainmenu.cpp /TcSource/minitext.cpp Source/missiles.cpp Source/monster.cpp /TcSource/movie.cpp Source/mpqapi.cpp /TcSource/msg.cpp Source/msgcmd.cpp /TcSource/multi.cpp Source/nthread.cpp Source/objects.cpp /TcSource/pack.cpp Source/palette.cpp /TcSource/path.cpp /TcSource/pfile.cpp /TcSource/player.cpp /TcSource/plrmsg.cpp /TcSource/portal.cpp /TcSource/quests.cpp /TcSource/restrict.cpp Source/scrollrt.cpp /TcSource/setmaps.cpp /TcSource/sha.cpp Source/sound.cpp /TcSource/spells.cpp Source/stores.cpp /TcSource/sync.cpp /TcSource/textdat.cpp /TcSource/themes.cpp /TcSource/tmsg.cpp /TcSource/town.cpp /TcSource/towners.cpp /TcSource/track.cpp /TcSource/trigs.cpp /TcSource/wave.cpp Source/render.cpp
DIABLO_SRC_FIXED = Source/appfat.cpp /TcSource/automap.cpp Source/capture.cpp /TcSource/codec.cpp Source/control.cpp /TcSource/cursor.cpp /TcSource/dead.cpp /TcSource/debug.cpp Source/diablo.cpp /TcSource/doom.cpp /TcSource/drlg_l1.cpp /TcSource/drlg_l2.cpp Source/drlg_l3.cpp /TcSource/drlg_l4.cpp Source/dthread.cpp Source/dx.cpp /TcSource/effects.cpp /TcSource/encrypt.cpp Source/engine.cpp /TcSource/error.cpp Source/fault.cpp /TcSource/gamemenu.cpp /TcSource/gendung.cpp /TcSource/gmenu.cpp /TcSource/help.cpp /TcSource/init.cpp /TcSource/interfac.cpp /TcSource/inv.cpp Source/items.cpp Source/lighting.cpp /TcSource/loadsave.cpp Source/logging.cpp /TcSource/mainmenu.cpp /TcSource/minitext.cpp /TcSource/missiles.cpp Source/monster.cpp /TcSource/movie.cpp Source/mpqapi.cpp /TcSource/msg.cpp Source/msgcmd.cpp /TcSource/multi.cpp Source/nthread.cpp Source/objects.cpp /TcSource/pack.cpp Source/palette.cpp /TcSource/path.cpp /TcSource/pfile.cpp /TcSource/player.cpp /TcSource/plrmsg.cpp /TcSource/portal.cpp /TcSource/quests.cpp /TcSource/restrict.cpp Source/scrollrt.cpp /TcSource/setmaps.cpp /TcSource/sha.cpp Source/sound.cpp /TcSource/spells.cpp Source/stores.cpp /TcSource/sync.cpp /TcSource/textdat.cpp /TcSource/themes.cpp /TcSource/tmsg.cpp /TcSource/town.cpp /TcSource/towners.cpp /TcSource/track.cpp /TcSource/trigs.cpp /TcSource/wave.cpp Source/render.cpp
PKWARE_SRC=$(sort $(wildcard 3rdParty/PKWare/*.cpp))
PKWARE_OBJS=$(PKWARE_SRC:.cpp=.obj)

12
Source/missiles.cpp

@ -515,19 +515,17 @@ int __fastcall GetSpellLevel(int id, int sn)
int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
{
int v4; // edi
int v5; // esi
int v6; // eax
int v7; // eax
int result; // eax
int v9; // [esp+8h] [ebp-110h]
char lrtoul[3]; // [esp+10Ch] [ebp-Ch]
char urtoll[3]; // [esp+10Fh] [ebp-9h]
char lltour[3]; // [esp+112h] [ebp-6h]
char ultolr[3]; // [esp+115h] [ebp-3h]
v9 = y1;
v4 = x1;
int v9 = y1;
int v4 = x1;
unsigned char Dirs[16][16] = {
{ 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@ -582,19 +580,17 @@ int __fastcall GetDirection8(int x1, int y1, int x2, int y2)
int __fastcall GetDirection16(int x1, int y1, int x2, int y2)
{
int v4; // edi
int v5; // esi
int v6; // eax
int v7; // eax
int result; // eax
int v9; // [esp+8h] [ebp-124h]
char lrtoul[5]; // [esp+10Ch] [ebp-20h]
char urtoll[5]; // [esp+114h] [ebp-18h]
char lltour[5]; // [esp+11Ch] [ebp-10h]
char ultolr[5]; // [esp+124h] [ebp-8h]
v9 = y1;
v4 = x1;
int v9 = y1;
int v4 = x1;
unsigned char Dirs[16][16] = {
{ 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },

Loading…
Cancel
Save