- Fixed the server crashing on startup due to bad define

- Fixed the server crashing on a timer-queued disguise / undisguise (no sd check)
- re-added the item_group_list for consistency's sake, moved to itemdb.h (after some hacking to remove the ugly map.h dependency)
- Removed some overly verbose item group messages & code

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10112 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 13 insertions, 14 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 513d3be6f..b0f582b58 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10134,33 +10134,32 @@ BUILDIN_FUNC(clearitem)
 }
 
 /*==========================================
-	Disguise Player (returns Mob/NPC ID if success, 0 on fail) [Lupus]
- *------------------------------------------
- */
+ * Disguise Player (returns Mob/NPC ID if success, 0 on fail)
+ *------------------------------------------*/
 BUILDIN_FUNC(disguise)
 {
-	struct map_session_data *sd=script_rid2sd(st);
 	int id;
+	struct map_session_data* sd = script_rid2sd(st);
+	if (sd == NULL) return 0;
 
-	id	= script_getnum(st,2);
+	id = script_getnum(st,2);
 
-	if (!mobdb_checkid(id) && !npcdb_checkid(id)) {
+	if (mobdb_checkid(id) || npcdb_checkid(id)) {
+		pc_disguise(sd, id);
+		script_pushint(st,id);
+	} else
 		script_pushint(st,0);
-		return 0;
-	}
 
-	pc_disguise(sd, id);
-	script_pushint(st,id);
 	return 0;
 }
 
 /*==========================================
-	Undisguise Player (returns 1 if success, 0 on fail) [Lupus]
- *------------------------------------------
- */
+ * Undisguise Player (returns 1 if success, 0 on fail)
+ *------------------------------------------*/
 BUILDIN_FUNC(undisguise)
 {
-	struct map_session_data *sd=script_rid2sd(st);
+	struct map_session_data* sd = script_rid2sd(st);
+	if (sd == NULL) return 0;
 
 	if (sd->disguise) {
 		pc_disguise(sd, 0);