summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-12 08:08:19 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-12 08:08:19 +0000
commitcef84b99cace2357a872ac2939f62ce08f916318 (patch)
treeaeedbcec13042d63bd2425c63ec856d3e40b9e11 /src
parentb14078da1a3de5447a158cbfab324512e158b9b6 (diff)
downloadhercules-cef84b99cace2357a872ac2939f62ce08f916318.tar.gz
hercules-cef84b99cace2357a872ac2939f62ce08f916318.tar.bz2
hercules-cef84b99cace2357a872ac2939f62ce08f916318.tar.xz
hercules-cef84b99cace2357a872ac2939f62ce08f916318.zip
* Fixed npc class HIDDEN_WARP_NPC (139) being sent to the client, causing client crashes in poring war. It's a server-side "sprite" only.
- Updated Aegis NPC ID constants from current npcidentity.lub (569~603). - Reintroduced HIDDEN_WARP_NPC script constant, which was removed by accident (since r14679). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14993 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/npc.h14
2 files changed, 10 insertions, 6 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 897475f73..dae395876 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -96,7 +96,7 @@ static struct script_event_s
struct view_data* npc_get_viewdata(int class_)
{ //Returns the viewdata for normal npc classes.
- if (class_ == INVISIBLE_CLASS)
+ if( class_ == HIDDEN_WARP_CLASS || class_ == INVISIBLE_CLASS )
return &npc_viewdb[0];
if (npcdb_checkid(class_) || class_ == WARP_CLASS)
return &npc_viewdb[class_];
diff --git a/src/map/npc.h b/src/map/npc.h
index 29e3d79cb..d40fb63b4 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -69,15 +69,19 @@ struct npc_data {
#define START_NPC_NUM 110000000
-#define WARP_CLASS 45
-#define WARP_DEBUG_CLASS 722
-#define FLAG_CLASS 722
-#define INVISIBLE_CLASS 32767
+enum actor_classes
+{
+ WARP_CLASS = 45,
+ HIDDEN_WARP_CLASS = 139, // server-side only, never sent to client
+ WARP_DEBUG_CLASS = 722,
+ FLAG_CLASS = 722,
+ INVISIBLE_CLASS = 32767,
+};
#define MAX_NPC_CLASS 1000
//Checks if a given id is a valid npc id. [Skotlex]
//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
-#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == 139 || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS )
+#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS )
#ifdef PCRE_SUPPORT
void npc_chat_finalize(struct npc_data* nd);