Updates

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@468 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 12/5
+	* removed stubbed out unfinished atcommands as per Cameri [MouseJstr]
+	* Fixed nullpo's for gcc 2.95 [MouseJstr]
 	* Fixed bug in which login-txt was crashing in do_final() due to some free's [MC Cameri]
 	* Added nullpo's to all atcommand's functions, phew... [MC Cameri]
 	  Note: I point out that MouseJstr has added some @commands that start with char which

Makefile

@@ -23,7 +23,7 @@ OS_TYPE = -DCYGWIN
 CFLAGS = $(OPT) -Wall -DFD_SETSIZE=4096 -I../common $(PACKETDEF) $(OS_TYPE)
 else
 OS_TYPE =
-CFLAGS = $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE)
+CFLAGS = -DTWILIGHT $(OPT) -Wall -I../common $(PACKETDEF) $(OS_TYPE)
 endif
 
 MYSQLFLAG_INCLUDE_DEFAULT = /usr/local/include/mysql

src/login_sql/login.c

@@ -576,7 +576,9 @@ int mmo_auth( struct mmo_account* account , int fd){
 
     if ( is_user_online(atol(sql_row[0])) ) {
         printf("User [%s] is already online - Rejected.\n",sql_row[1]);
-	    return 3; // Rejected
+#ifndef TWILIGHT
+	return 3; // Rejected
+#endif
     }
         
 	account->account_id = atoi(sql_row[0]);

src/map/atcommand.h

@@ -169,9 +169,6 @@ enum AtCommandType {
 	AtCommand_Killable, // by MouseJstr
 	AtCommand_CharKillable, // by MouseJstr
 	AtCommand_Chareffect, // by MouseJstr
-	AtCommand_Chardye, // by MouseJstr
-	AtCommand_Charhairstyle, // by MouseJstr
-	AtCommand_Charhaircolor, // by MouseJstr
 	AtCommand_Dropall, // by MouseJstr
 	AtCommand_Chardropall, // by MouseJstr
 	AtCommand_Storeall, // by MouseJstr