summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-16 17:09:43 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-16 17:09:43 +0000
commitc021f63e10a7dca24119e436e2450e0bbb2266a3 (patch)
tree481effe6e7aa8c7467b7bc6dc0e43570365515bd
parent718ea60b21903731c02613164262f6b81d0e08fb (diff)
downloadhercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.gz
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.bz2
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.tar.xz
hercules-c021f63e10a7dca24119e436e2450e0bbb2266a3.zip
- Removed outdated version number handling (follow-up to r11503).
- Fixed mapcache compilation issues in Linux. - Added some missing `svn:ignore` properties. - Moved `BLOCK_SIZE` definition from header to source file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15586 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/char/Makefile.in2
-rw-r--r--src/char/char.c1
-rw-r--r--src/common/Makefile.in2
-rw-r--r--src/common/core.c1
-rw-r--r--src/common/core.h6
-rw-r--r--src/common/plugins.c1
-rw-r--r--src/common/showmsg.c1
-rw-r--r--src/common/version.h30
-rw-r--r--src/login/Makefile.in2
-rw-r--r--src/login/login.c1
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/instance.c1
-rw-r--r--src/map/map.c8
-rw-r--r--src/map/map.h1
-rw-r--r--src/map/quest.c1
-rw-r--r--src/plugins/sig.c3
-rw-r--r--src/tool/Makefile.in8
-rw-r--r--vcproj-10/char-server_sql.vcxproj1
-rw-r--r--vcproj-10/char-server_sql.vcxproj.filters3
-rw-r--r--vcproj-10/login-server_sql.vcxproj1
-rw-r--r--vcproj-10/login-server_sql.vcxproj.filters3
-rw-r--r--vcproj-10/map-server_sql.vcxproj1
-rw-r--r--vcproj-10/map-server_sql.vcxproj.filters3
-rw-r--r--vcproj-10/mapcache.vcxproj1
-rw-r--r--vcproj-10/mapcache.vcxproj.filters3
-rw-r--r--vcproj-9/char-server_sql.vcproj4
-rw-r--r--vcproj-9/login-server_sql.vcproj4
-rw-r--r--vcproj-9/map-server_sql.vcproj4
-rw-r--r--vcproj-9/mapcache.vcproj4
29 files changed, 17 insertions, 87 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index f48f116b8..4ef8ae7ea 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -5,7 +5,7 @@ COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_a
../common/obj_all/strlib.o \
../common/obj_all/mapindex.o ../common/obj_all/ers.o ../common/obj_all/random.o ../common/obj_all/conf.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
- ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
+ ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h \
../common/strlib.h \
../common/mapindex.h ../common/ers.h ../common/random.h ../common/obj_all/conf.h
diff --git a/src/char/char.c b/src/char/char.c
index a569f5ca1..b1f0ee224 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -12,7 +12,6 @@
#include "../common/strlib.h"
#include "../common/timer.h"
#include "../common/utils.h"
-#include "../common/version.h"
#include "inter.h"
#include "int_guild.h"
#include "int_homun.h"
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 7897b6cfb..de591a59f 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -4,7 +4,7 @@ COMMON_OBJ = obj_all/core.o obj_all/socket.o obj_all/timer.o obj_all/db.o obj_al
obj_all/grfio.o obj_all/mapindex.o obj_all/ers.o obj_all/md5calc.o \
obj_all/minicore.o obj_all/minisocket.o obj_all/minimalloc.o obj_all/random.o obj_all/des.o \
obj_all/conf.o
-COMMON_H = mmo.h plugin.h version.h \
+COMMON_H = mmo.h plugin.h \
core.h socket.h timer.h db.h plugins.h lock.h \
nullpo.h malloc.h showmsg.h strlib.h utils.h \
grfio.h mapindex.h ers.h md5calc.h random.h des.h \
diff --git a/src/common/core.c b/src/common/core.c
index 60ba5d6cd..89a002ebe 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -2,7 +2,6 @@
// For more information, see LICENCE in the main folder
#include "../common/mmo.h"
-#include "../common/version.h"
#include "../common/showmsg.h"
#include "../common/malloc.h"
#include "core.h"
diff --git a/src/common/core.h b/src/common/core.h
index ecaa2a9d0..11b4f7c47 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -14,6 +14,12 @@ extern char **arg_v;
/// @see E_CORE_ST
extern int runflag;
extern char *SERVER_NAME;
+
+#define ATHENA_SERVER_NONE 0 // not defined
+#define ATHENA_SERVER_LOGIN 1 // login server
+#define ATHENA_SERVER_CHAR 2 // char server
+#define ATHENA_SERVER_INTER 4 // inter server
+#define ATHENA_SERVER_MAP 8 // map server
extern char SERVER_TYPE;
extern int parse_console(const char* buf);
diff --git a/src/common/plugins.c b/src/common/plugins.c
index 2d50fc9e8..937ec0aaa 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -7,7 +7,6 @@
#include "../common/utils.h" // findfile()
#include "../common/socket.h"
#include "../common/malloc.h"
-#include "../common/version.h"
#include "../common/showmsg.h"
#include "plugins.h"
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index b77bf3949..4d09e2c53 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -5,7 +5,6 @@
#include "../common/strlib.h" // StringBuf
#include "showmsg.h"
#include "core.h" //[Ind] - For SERVER_TYPE
-#include "version.h" //[Ind] - For SERVER_TYPE values
#include <stdio.h>
#include <string.h>
diff --git a/src/common/version.h b/src/common/version.h
deleted file mode 100644
index 71a93dcd9..000000000
--- a/src/common/version.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _VERSION_H_
-#define _VERSION_H_
-
-#define ATHENA_MAJOR_VERSION 1 // Major Version
-#define ATHENA_MINOR_VERSION 0 // Minor Version
-#define ATHENA_REVISION 0 // Revision
-
-#define ATHENA_RELEASE_FLAG 1 // 1=Develop,0=Stable
-#define ATHENA_OFFICIAL_FLAG 1 // 1=Mod,0=Official
-
-#define ATHENA_SERVER_NONE 0 // not defined
-#define ATHENA_SERVER_LOGIN 1 // login server
-#define ATHENA_SERVER_CHAR 2 // char server
-#define ATHENA_SERVER_INTER 4 // inter server
-#define ATHENA_SERVER_MAP 8 // map server
-
-// ATHENA_MOD_VERSIONはパッチ番号です。
-// これは無理に変えなくても気が向いたら変える程度の扱いで。
-// (毎回アップロードの度に変更するのも面倒と思われるし、そもそも
-//  この項目を参照する人がいるかどうかで疑問だから。)
-// その程度の扱いなので、サーバーに問い合わせる側も、あくまで目安程度の扱いで
-// あんまり信用しないこと。
-// 鯖snapshotの時や、大きな変更があった場合は設定してほしいです。
-// C言語の仕様上、最初に0を付けると8進数になるので間違えないで下さい。
-#define ATHENA_MOD_VERSION 1249 // mod version (patch No.)
-
-#endif /* _VERSION_H_ */
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index 7938640aa..348943403 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -6,7 +6,7 @@ COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_a
../common/obj_all/ers.o ../common/obj_all/md5calc.o ../common/obj_all/random.o \
../common/obj_all/conf.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
- ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
+ ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
../common/mapindex.h \
../common/ers.h ../common/md5calc.h ../common/random.h ../common/conf.h
diff --git a/src/login/login.c b/src/login/login.c
index 5a504ce2f..78211dc64 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -10,7 +10,6 @@
#include "../common/socket.h"
#include "../common/strlib.h"
#include "../common/timer.h"
-#include "../common/version.h"
#include "account.h"
#include "ipban.h"
#include "login.h"
diff --git a/src/map/clif.c b/src/map/clif.c
index 2770b61cc..8203ab7f5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6,7 +6,6 @@
#include "../common/timer.h"
#include "../common/grfio.h"
#include "../common/malloc.h"
-#include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/random.h"
#include "../common/showmsg.h"
@@ -270,7 +269,7 @@ static inline unsigned char clif_bl_type(struct block_list *bl) {
case BL_SKILL: return 0x3; //SKILL_TYPE
case BL_CHAT: return 0x4; //UNKNOWN_TYPE
case BL_MOB: return pcdb_checkid(status_get_viewdata(bl)->class_)?0x0:0x5; //NPC_MOB_TYPE
- case BL_NPC: return 0x6; //NPC_EVT_TYPE
+ case BL_NPC: return pcdb_checkid(status_get_viewdata(bl)->class_)?0x0:0x6; //NPC_EVT_TYPE
case BL_PET: return pcdb_checkid(status_get_viewdata(bl)->class_)?0x0:0x7; //NPC_PET_TYPE
case BL_HOM: return 0x8; //NPC_HOM_TYPE
case BL_MER: return 0x9; //NPC_MERSOL_TYPE
diff --git a/src/map/instance.c b/src/map/instance.c
index 52d0dfeef..c4e151d79 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -5,7 +5,6 @@
#include "../common/socket.h"
#include "../common/timer.h"
#include "../common/malloc.h"
-#include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
diff --git a/src/map/map.c b/src/map/map.c
index fd6f41202..4677e8753 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -8,7 +8,6 @@
#include "../common/malloc.h"
#include "../common/socket.h" // WFIFO*()
#include "../common/showmsg.h"
-#include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/random.h"
#include "../common/strlib.h"
@@ -105,6 +104,7 @@ static DBMap* regen_db=NULL; // int id -> struct block_list* (status_natural_hea
static int map_users=0;
+#define BLOCK_SIZE 8
#define block_free_max 1048576
struct block_list *block_free[block_free_max];
static int block_free_count = 0, block_free_lock = 0;
@@ -3553,12 +3553,10 @@ static void map_helpscreen(bool do_exit)
*------------------------------------------------------*/
static void map_versionscreen(bool do_exit)
{
- ShowInfo(CL_WHITE"RAthena version %d.%02d.%02d, Athena Mod version %d" CL_RESET"\n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION, ATHENA_MOD_VERSION);
+ ShowInfo(CL_WHITE"rAthena SVN version: %s" CL_RESET"\n", get_svn_revision());
ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n");
- ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#rthena\n");
+ ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rathena.net/#rathena\n");
ShowInfo("Open "CL_WHITE"readme.html"CL_RESET" for more information.\n");
- if(ATHENA_RELEASE_FLAG)
- ShowNotice("This version is not for release.\n");
if( do_exit )
exit(EXIT_SUCCESS);
}
diff --git a/src/map/map.h b/src/map/map.h
index 06e955b6e..97063bfbb 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -29,7 +29,6 @@ enum E_MAPSERVER_ST
#define MAX_NPC_PER_MAP 512
-#define BLOCK_SIZE 8
#define AREA_SIZE battle_config.area_size
#define DAMAGELOG_SIZE 30
#define LOOTITEM_SIZE 10
diff --git a/src/map/quest.c b/src/map/quest.c
index c01557974..ebb5b15c1 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -5,7 +5,6 @@
#include "../common/socket.h"
#include "../common/timer.h"
#include "../common/malloc.h"
-#include "../common/version.h"
#include "../common/nullpo.h"
#include "../common/showmsg.h"
#include "../common/strlib.h"
diff --git a/src/plugins/sig.c b/src/plugins/sig.c
index 15fd71846..8f7dead4b 100644
--- a/src/plugins/sig.c
+++ b/src/plugins/sig.c
@@ -7,7 +7,6 @@
#include <string.h>
#include <time.h>
#include "../common/plugin.h"
-#include "../common/version.h"
#include "../common/showmsg.h"
PLUGIN_INFO = {
@@ -121,8 +120,6 @@ void sig_dump(int sn)
ShowNotice ("Dumping stack to '"CL_WHITE"%s"CL_RESET"'...\n", file);
if ((revision = getrevision()) != NULL)
fprintf(fp, "Version: svn%s \n", revision);
- else
- fprintf(fp, "Version: %2d.%02d.%02d mod%02d \n", ATHENA_MAJOR_VERSION, ATHENA_MINOR_VERSION, ATHENA_REVISION, ATHENA_MOD_VERSION);
fprintf(fp, "Exception: %s \n", strsignal(sn));
fflush (fp);
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 8d14d9ed2..2ad022936 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -2,7 +2,7 @@
COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/malloc.o \
../common/obj_all/showmsg.o ../common/obj_all/strlib.o \
../common/obj_all/utils.o ../common/obj_all/des.o ../common/obj_all/grfio.o
-COMMON_H = ../common/core.h ../common/mmo.h ../common/version.h \
+COMMON_H = ../common/core.h ../common/mmo.h \
../common/malloc.h ../common/showmsg.h ../common/strlib.h \
../common/utils.h ../common/cbasetypes.h ../common/des.h ../common/grfio.h
@@ -40,8 +40,8 @@ help:
obj_all:
-mkdir obj_all
-obj_all/%.o: %.c $(COMMON_H)
- @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+obj_all/%.o: %.c $(COMMON_H) $(LIBCONFIG_H)
+ @CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o:
@@ -51,4 +51,4 @@ obj_all/%.o: %.c $(COMMON_H)
@$(MAKE) -C ../common txt
LIBCONFIG_OBJ:
- @$(MAKE) -C ../../3rdparty/libconfig \ No newline at end of file
+ @$(MAKE) -C ../../3rdparty/libconfig
diff --git a/vcproj-10/char-server_sql.vcxproj b/vcproj-10/char-server_sql.vcxproj
index afa7f85d3..e070d3e34 100644
--- a/vcproj-10/char-server_sql.vcxproj
+++ b/vcproj-10/char-server_sql.vcxproj
@@ -152,7 +152,6 @@
<ClInclude Include="..\src\common\strlib.h" />
<ClInclude Include="..\src\common\timer.h" />
<ClInclude Include="..\src\common\utils.h" />
- <ClInclude Include="..\src\common\version.h" />
<ClInclude Include="..\src\char\char.h" />
<ClInclude Include="..\src\char\int_auction.h" />
<ClInclude Include="..\src\char\int_guild.h" />
diff --git a/vcproj-10/char-server_sql.vcxproj.filters b/vcproj-10/char-server_sql.vcxproj.filters
index 3b11113ee..f47beddec 100644
--- a/vcproj-10/char-server_sql.vcxproj.filters
+++ b/vcproj-10/char-server_sql.vcxproj.filters
@@ -147,9 +147,6 @@
<ClInclude Include="..\src\common\utils.h">
<Filter>common</Filter>
</ClInclude>
- <ClInclude Include="..\src\common\version.h">
- <Filter>common</Filter>
- </ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>char_sql</Filter>
</ClInclude>
diff --git a/vcproj-10/login-server_sql.vcxproj b/vcproj-10/login-server_sql.vcxproj
index 6cd25c88c..d747c3e1e 100644
--- a/vcproj-10/login-server_sql.vcxproj
+++ b/vcproj-10/login-server_sql.vcxproj
@@ -159,7 +159,6 @@
<ClInclude Include="..\src\common\strlib.h" />
<ClInclude Include="..\src\common\timer.h" />
<ClInclude Include="..\src\common\utils.h" />
- <ClInclude Include="..\src\common\version.h" />
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
</ItemGroup>
<ItemGroup>
diff --git a/vcproj-10/login-server_sql.vcxproj.filters b/vcproj-10/login-server_sql.vcxproj.filters
index 4af055584..0d75bb624 100644
--- a/vcproj-10/login-server_sql.vcxproj.filters
+++ b/vcproj-10/login-server_sql.vcxproj.filters
@@ -90,9 +90,6 @@
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
</ClInclude>
- <ClInclude Include="..\src\common\version.h">
- <Filter>common</Filter>
- </ClInclude>
<ClInclude Include="..\src\common\core.h">
<Filter>common</Filter>
</ClInclude>
diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj
index 55ad74671..e90c3c4de 100644
--- a/vcproj-10/map-server_sql.vcxproj
+++ b/vcproj-10/map-server_sql.vcxproj
@@ -155,7 +155,6 @@
<ClInclude Include="..\src\common\strlib.h" />
<ClInclude Include="..\src\common\timer.h" />
<ClInclude Include="..\src\common\utils.h" />
- <ClInclude Include="..\src\common\version.h" />
<ClInclude Include="..\src\map\atcommand.h" />
<ClInclude Include="..\src\map\battle.h" />
<ClInclude Include="..\src\map\battleground.h" />
diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server_sql.vcxproj.filters
index a1b51acce..f5862c135 100644
--- a/vcproj-10/map-server_sql.vcxproj.filters
+++ b/vcproj-10/map-server_sql.vcxproj.filters
@@ -285,9 +285,6 @@
<ClInclude Include="..\src\map\vending.h">
<Filter>map_sql</Filter>
</ClInclude>
- <ClInclude Include="..\src\common\version.h">
- <Filter>common</Filter>
- </ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
</ClInclude>
diff --git a/vcproj-10/mapcache.vcxproj b/vcproj-10/mapcache.vcxproj
index b0f58b70b..5ff4a99b4 100644
--- a/vcproj-10/mapcache.vcxproj
+++ b/vcproj-10/mapcache.vcxproj
@@ -142,7 +142,6 @@
<ClInclude Include="..\src\common\showmsg.h" />
<ClInclude Include="..\src\common\strlib.h" />
<ClInclude Include="..\src\common\utils.h" />
- <ClInclude Include="..\src\common\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/vcproj-10/mapcache.vcxproj.filters b/vcproj-10/mapcache.vcxproj.filters
index 713cdb64b..41955216f 100644
--- a/vcproj-10/mapcache.vcxproj.filters
+++ b/vcproj-10/mapcache.vcxproj.filters
@@ -54,9 +54,6 @@
<ClInclude Include="..\src\common\utils.h">
<Filter>common</Filter>
</ClInclude>
- <ClInclude Include="..\src\common\version.h">
- <Filter>common</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj
index 43b959827..2ef9ec81b 100644
--- a/vcproj-9/char-server_sql.vcproj
+++ b/vcproj-9/char-server_sql.vcproj
@@ -412,10 +412,6 @@
RelativePath="..\src\common\utils.h"
>
</File>
- <File
- RelativePath="..\src\common\version.h"
- >
- </File>
</Filter>
<Filter
Name="char_sql"
diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj
index a0ce7ceae..2cf3c6e6c 100644
--- a/vcproj-9/login-server_sql.vcproj
+++ b/vcproj-9/login-server_sql.vcproj
@@ -382,10 +382,6 @@
RelativePath="..\src\common\utils.h"
>
</File>
- <File
- RelativePath="..\src\common\version.h"
- >
- </File>
</Filter>
<Filter
Name="3rdparty"
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj
index 39a58e47d..6fb497f09 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server_sql.vcproj
@@ -435,10 +435,6 @@
RelativePath="..\src\common\utils.h"
>
</File>
- <File
- RelativePath="..\src\common\version.h"
- >
- </File>
</Filter>
<Filter
Name="map_sql"
diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj
index e13f7ab27..461519d33 100644
--- a/vcproj-9/mapcache.vcproj
+++ b/vcproj-9/mapcache.vcproj
@@ -266,10 +266,6 @@
RelativePath="..\src\common\utils.h"
>
</File>
- <File
- RelativePath="..\src\common\version.h"
- >
- </File>
</Filter>
<Filter
Name="mapcache"