summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-30 19:49:57 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-30 19:49:57 +0000
commit9c0c26a552ab3e66a6595d033988906eb8576e6e (patch)
treec68888dde66883cc97bb9b2c19b0e9cf1133eb9d /src/map
parent327439273a8addb07b4e05908ba5e931b2f679ea (diff)
downloadhercules-9c0c26a552ab3e66a6595d033988906eb8576e6e.tar.gz
hercules-9c0c26a552ab3e66a6595d033988906eb8576e6e.tar.bz2
hercules-9c0c26a552ab3e66a6595d033988906eb8576e6e.tar.xz
hercules-9c0c26a552ab3e66a6595d033988906eb8576e6e.zip
Made the map-server build cleanly using Microsoft Visual Studio [MouseJstr]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1345 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/Makefile.win3213
-rw-r--r--src/map/pc.c5
-rw-r--r--src/map/status.c5
3 files changed, 16 insertions, 7 deletions
diff --git a/src/map/Makefile.win32 b/src/map/Makefile.win32
index 9a0a0b174..2ab3f957a 100644
--- a/src/map/Makefile.win32
+++ b/src/map/Makefile.win32
@@ -15,25 +15,28 @@ txtobj:
sqlobj:
mkdir sqlobj
-ZLIBDIR = C:/eathena/zlib122
-PACKETDEF = -DPACKETVER=5 -DNEW_006b -D__WIN32
+ZLIBDIR = ../zlib
+PACKETDEF = -DPACKETVER=5 -DNEW_006b -D__WIN32 -DLOCALZLIB
# OPT = /MDd /D_DEBUG
OPT =
LINKOPT = /debug /SUBSYSTEM:CONSOLE
# OPT = /O2
CFLAGS = $(OPT) /nologo /I../common /I$(ZLIBDIR) $(PACKETDEF) /D_WIN32
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o ../common/strlib.o
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o ../common/strlib.o ../common/utils.o
+
LIBS = "WSOCK32.LIB"
# "WSOCK32.LIB" "USER32.LIB" "ADVAPI32.LIB" "MSVCRT.LIB" "OLDNAMES.LIB" "KERNEL32.LIB"
-TXTOBJS = txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o $(COMMON_OBJ) $(ZLIBDIR)/inflate.o $(ZLIBDIR)/adler32.o $(ZLIBDIR)/crc32.o $(ZLIBDIR)/inftrees.o $(ZLIBDIR)/zutil.o $(ZLIBDIR)/inffast.o
+TXTOBJS = txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/status.o txtobj/npc.o txtobj/npc_chat.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/charcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o txtobj/log.o $(COMMON_OBJ) $(ZLIBDIR)/inflate.o $(ZLIBDIR)/deflate.o $(ZLIBDIR)/trees.o $(ZLIBDIR)/adler32.o $(ZLIBDIR)/compress.o $(ZLIBDIR)/crc32.o $(ZLIBDIR)/inftrees.o $(ZLIBDIR)/zutil.o $(ZLIBDIR)/inffast.o
+
+SQLOBJS = sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/status.o sqlobj/npc.o sqlobj/npc_chat.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/charcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/log.o $(COMMON_OBJ) $(ZLIBDIR)/inflate.o $(ZLIBDIR)/adler32.o $(ZLIBDIR)/crc32.o $(ZLIBDIR)/inftrees.o $(ZLIBDIR)/zutil.o $(ZLIBDIR)/inffast.o
map-server: $(TXTOBJS)
link $(LINKOPT) /out:../../$@.exe $(TXTOBJS) $(LIBS)
-map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o $(COMMON_OBJ)
+map-server_sql: $(SQLOBJS)
link $(LINKOPT) /out:../../$@.exe $> $(LIBS)
txtobj/%.o: %.c
diff --git a/src/map/pc.c b/src/map/pc.c
index b9185c8b8..e82a5d246 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3236,7 +3236,10 @@ static int pc_walk(int tid,unsigned int tick,int id,int data)
int moveblock;
int x,y,dx,dy;
- nullpo_retr_f(0, (sd=map_id2sd(id)), "id=%d", id);
+ sd=map_id2sd(id);
+#ifndef _WIN32
+ nullpo_retr_f(0, sd, "id=%d", id);
+#endif
if(sd->walktimer != tid){
if(battle_config.error_log)
diff --git a/src/map/status.c b/src/map/status.c
index 65f9e0cd4..00dc50c74 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4300,7 +4300,10 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
// security system to prevent forgetting timer removal
int temp_timerid;
- nullpo_retr_f(0, bl=map_id2bl(id), "id=%d data=%d",id,data);
+ bl=map_id2bl(id);
+#ifndef _WIN32
+ nullpo_retr_f(0, bl, "id=%d data=%d",id,data);
+#endif
nullpo_retr(0, sc_data=status_get_sc_data(bl));
if(bl->type==BL_PC)