summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-10 13:59:23 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-10 13:59:23 +0000
commite691cff48424675b5d6f3ca0e5ded1b2aebbecd1 (patch)
treec74873c5e9d29f636c35704397cb259e8136e020 /src/map
parentd8872dabd55e5db6962e5bcddd5d0ac469ef9312 (diff)
downloadhercules-e691cff48424675b5d6f3ca0e5ded1b2aebbecd1.tar.gz
hercules-e691cff48424675b5d6f3ca0e5ded1b2aebbecd1.tar.bz2
hercules-e691cff48424675b5d6f3ca0e5ded1b2aebbecd1.tar.xz
hercules-e691cff48424675b5d6f3ca0e5ded1b2aebbecd1.zip
Fixed some more gcc incompatibilities...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11706 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c40
-rw-r--r--src/map/script.h40
2 files changed, 40 insertions, 40 deletions
diff --git a/src/map/script.c b/src/map/script.c
index d9a0faead..77d7e44bb 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -259,46 +259,6 @@ int run_func(struct script_state *st);
int mapreg_setreg(int num,int val);
int mapreg_setregstr(int num,const char *str);
-enum c_op {
- C_NOP, // end of script/no value (nil)
- C_POS,
- C_INT, // number
- C_PARAM, // parameter variable (see pc_readparam/pc_setparam)
- C_FUNC, // buildin function call
- C_STR, // string (free'd automatically)
- C_CONSTSTR, // string (not free'd)
- C_ARG, // start of argument list
- C_NAME,
- C_EOL, // end of line (extra stack values are cleared)
- C_RETINFO,
- C_USERFUNC, // internal script function
- C_USERFUNC_POS, // internal script function label
-
- // operators
- C_OP3, // a ? b : c
- C_LOR, // a || b
- C_LAND, // a && b
- C_LE, // a <= b
- C_LT, // a < b
- C_GE, // a >= b
- C_GT, // a > b
- C_EQ, // a == b
- C_NE, // a != b
- C_XOR, // a ^ b
- C_OR, // a | b
- C_AND, // a & b
- C_ADD, // a + b
- C_SUB, // a - b
- C_MUL, // a * b
- C_DIV, // a / b
- C_MOD, // a % b
- C_NEG, // - a
- C_LNOT, // ! a
- C_NOT, // ~ a
- C_R_SHIFT, // a >> b
- C_L_SHIFT // a << b
-};
-
enum {
MF_NOMEMO, //0
MF_NOTELEPORT,
diff --git a/src/map/script.h b/src/map/script.h
index 46a2b2910..2769a3163 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -25,6 +25,46 @@ extern struct Script_Config {
char joblvup_event_name[NAME_LENGTH];
} script_config;
+enum c_op {
+ C_NOP, // end of script/no value (nil)
+ C_POS,
+ C_INT, // number
+ C_PARAM, // parameter variable (see pc_readparam/pc_setparam)
+ C_FUNC, // buildin function call
+ C_STR, // string (free'd automatically)
+ C_CONSTSTR, // string (not free'd)
+ C_ARG, // start of argument list
+ C_NAME,
+ C_EOL, // end of line (extra stack values are cleared)
+ C_RETINFO,
+ C_USERFUNC, // internal script function
+ C_USERFUNC_POS, // internal script function label
+
+ // operators
+ C_OP3, // a ? b : c
+ C_LOR, // a || b
+ C_LAND, // a && b
+ C_LE, // a <= b
+ C_LT, // a < b
+ C_GE, // a >= b
+ C_GT, // a > b
+ C_EQ, // a == b
+ C_NE, // a != b
+ C_XOR, // a ^ b
+ C_OR, // a | b
+ C_AND, // a & b
+ C_ADD, // a + b
+ C_SUB, // a - b
+ C_MUL, // a * b
+ C_DIV, // a / b
+ C_MOD, // a % b
+ C_NEG, // - a
+ C_LNOT, // ! a
+ C_NOT, // ~ a
+ C_R_SHIFT, // a >> b
+ C_L_SHIFT // a << b
+};
+
struct script_data {
enum c_op type;
union script_data_val {