5 files changed, 4 insertions, 10 deletions
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"