diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-12 14:34:09 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-12 14:34:09 +0000 |
| commit | 3ac1244f49189bf911922bef61686e75a7fc9d6b (patch) | |
| tree | e240e563e1defdac6fb5acdb4f621304cb866745 /src/map | |
| parent | 4b6eeee3694eec68f5e891a3abed473391d3c75a (diff) | |
| download | hercules-3ac1244f49189bf911922bef61686e75a7fc9d6b.tar.gz hercules-3ac1244f49189bf911922bef61686e75a7fc9d6b.tar.bz2 hercules-3ac1244f49189bf911922bef61686e75a7fc9d6b.tar.xz hercules-3ac1244f49189bf911922bef61686e75a7fc9d6b.zip | |
Fixed some badly merged code in the #include part of map.c.
Updated effect_list.txt according to data from latest exe.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11422 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/map/map.c b/src/map/map.c index d4f33ee3c..3df8bee8e 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -32,25 +32,14 @@ #include "script.h" #include "guild.h" #include "pet.h" -#include "mercenary.h" //[orn] +#include "mercenary.h" #include "atcommand.h" #include "charcommand.h" #include "log.h" #include "irc.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> -#include <math.h> - -#ifndef _WIN32 -#include <unistd.h> -#endif - #ifndef TXT_ONLY #include "mail.h" #endif - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -60,7 +49,6 @@ #include <unistd.h> #endif - #ifndef TXT_ONLY char default_codepage[32] = ""; |