- Added defines script_getnum and script_getstr to further simplify variable reading code.

- Applied mass replacing of text to enforce usage of script_hasdata, script_getnum, script_getstr and data_isstring defines where possible.
- Cleaned up the 'input' command code.
- Minor other cleanups in script.c
- Removed OPTION_SIGHTTRASHER as there's no indication this value exists.
- Corrected OPTION_XMAS since 2007 clients have split it up from OPTION_FLYING (on previous clients both were the same option value)
- Removed GRF_PATH_FILENAME references (it wasn't used anymore)


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

Changelog-Trunk.txt

@@ -3,7 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
-2007/03/28
+2007/03/29
+	* Corrected OPTION_XMAS since 2007 clients have split it up from
+	  OPTION_FLYING (on previous clients both were the same option value).
 	* Corrected statp array not being long enough to actually hold the status
 	  points of ALL levels up to and including MAX_LEVEL. Fixes reaching final
 	  level and resetting giving you an unpredictable amount of status points.

src/map/map.c

@@ -110,7 +110,6 @@ char *ATCOMMAND_CONF_FILENAME;
 char *CHARCOMMAND_CONF_FILENAME;
 char *SCRIPT_CONF_NAME;
 char *MSG_CONF_NAME;
-char *GRF_PATH_FILENAME;
 
 // ‹É—Í static‚Ń�?ƒJƒ‹‚É?‚ß‚é
 static struct dbt * id_db=NULL;
@@ -3222,7 +3221,6 @@ int do_init(int argc, char *argv[]) {
 	CHARCOMMAND_CONF_FILENAME = "conf/charcommand_athena.conf";
 	SCRIPT_CONF_NAME = "conf/script_athena.conf";
 	MSG_CONF_NAME = "conf/msg_athena.conf";
-	GRF_PATH_FILENAME = "conf/grf-files.txt";
 
 	srand(gettick());
 
@@ -3243,8 +3241,6 @@ int do_init(int argc, char *argv[]) {
 			SCRIPT_CONF_NAME = argv[i+1];
 		else if (strcmp(argv[i],"--msg_config") == 0 || strcmp(argv[i],"--msg-config") == 0)
 			MSG_CONF_NAME = argv[i+1];
-		else if (strcmp(argv[i],"--grf_path_file") == 0 || strcmp(argv[i],"--grf-path-file") == 0)
-			GRF_PATH_FILENAME = argv[i+1];
 #ifndef TXT_ONLY
 		else if (strcmp(argv[i],"--inter_config") == 0 || strcmp(argv[i],"--inter-config") == 0)
 			INTER_CONF_NAME = argv[i+1];

src/map/map.h

@@ -1439,7 +1439,6 @@ extern char *ATCOMMAND_CONF_FILENAME;
 extern char *CHARCOMMAND_CONF_FILENAME;
 extern char *SCRIPT_CONF_NAME;
 extern char *MSG_CONF_NAME;
-extern char *GRF_PATH_FILENAME;
 
 extern char *map_server_dns;
 

src/map/status.c

@@ -5933,9 +5933,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 		case SC_ORCISH:
 			sc->option |= OPTION_ORCISH;
 			break;
-		case SC_SIGHTTRASHER:
-			sc->option |= OPTION_SIGHTTRASHER;
-			break;
 		case SC_FUSION:
 			sc->option |= OPTION_FLYING;
 			break;
@@ -6391,9 +6388,6 @@ int status_change_end( struct block_list* bl , int type,int tid )
 	case SC_RUWACH:
 		sc->option &= ~OPTION_RUWACH;
 		break;
-	case SC_SIGHTTRASHER:
-		sc->option &= ~OPTION_SIGHTTRASHER;
-		break;
 	case SC_FUSION:
 		sc->option &= ~OPTION_FLYING;
 		break;

src/map/status.h

@@ -480,11 +480,9 @@ enum {
 #define OPTION_WEDDING 0x00001000
 #define OPTION_RUWACH 0x00002000
 #define OPTION_CHASEWALK 0x00004000
-//Note that clientside Flying and Xmas are 0x8000!!
-#define OPTION_XMAS 0x00020000
+//Note that clientside Flying and Xmas are 0x8000 for clients prior to 2007.
 #define OPTION_FLYING 0x0008000
-//TODO: Get these Missing options...
-#define OPTION_SIGHTTRASHER 0x00010000
+#define OPTION_XMAS 0x00010000
 
 #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5)