summaryrefslogtreecommitdiff
path: root/src/map/script.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-12-13 16:25:50 -0800
committerBen Longbons <b.r.longbons@gmail.com>2012-12-14 16:18:22 -0800
commit069f39e8a1ebee3e4a4ce8302d0099842876782b (patch)
tree57d8de5f57d65878f8ef560e2884b9dee08e9323 /src/map/script.hpp
parentf9563edf69f083287630f4b17db70d97524196d6 (diff)
downloadtmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.gz
tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.bz2
tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.xz
tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.zip
Some formatting fixes before I go insane
Also delete the French translation from ladmin.
Diffstat (limited to 'src/map/script.hpp')
-rw-r--r--src/map/script.hpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/map/script.hpp b/src/map/script.hpp
index e1803c2..6f6c910 100644
--- a/src/map/script.hpp
+++ b/src/map/script.hpp
@@ -42,14 +42,14 @@ struct script_data
ScriptCode type;
union
{
- int num;
+ int num;
const char *str;
} u;
};
struct script_stack
{
- int sp, sp_max;
+ int sp, sp_max;
struct script_data *stack_data;
};
@@ -58,20 +58,20 @@ class ScriptState
{
public:
struct script_stack *stack;
- int start, end;
- int pos, state;
- int rid, oid;
+ int start, end;
+ int pos, state;
+ int rid, oid;
const ScriptCode *script, *new_script;
- int defsp, new_pos, new_defsp;
+ int defsp, new_pos, new_defsp;
};
-const ScriptCode *parse_script (const char *, int);
+const ScriptCode *parse_script(const char *, int);
typedef struct argrec
{
const char *name;
union _aru
{
- int i;
+ int i;
const char *s;
_aru() = default;
@@ -79,15 +79,15 @@ typedef struct argrec
_aru(const char *z) : s(z) {}
} v;
} argrec_t;
-int run_script_l (const ScriptCode *, int, int, int, int, argrec_t * args);
-int run_script (const ScriptCode *, int, int, int);
+int run_script_l(const ScriptCode *, int, int, int, int, argrec_t * args);
+int run_script(const ScriptCode *, int, int, int);
-struct dbt *script_get_label_db (void);
-struct dbt *script_get_userfunc_db (void);
+struct dbt *script_get_label_db(void);
+struct dbt *script_get_userfunc_db(void);
-void script_config_read (const char *cfgName);
-void do_init_script (void);
-void do_final_script (void);
+void script_config_read(const char *cfgName);
+void do_init_script(void);
+void do_final_script(void);
extern char mapreg_txt[];