summaryrefslogtreecommitdiff
path: root/src/map/script.cpp
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.cpp
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.cpp')
-rw-r--r--src/map/script.cpp3568
1 files changed, 1773 insertions, 1795 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp
index b3f44b3..e2181e2 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -51,38 +51,38 @@ static ScriptCode *script_buf;
static int script_pos, script_size;
char *str_buf;
-int str_pos, str_size;
+int str_pos, str_size;
static struct str_data_t
{
ScriptCode type;
- int str;
- int backpatch;
- int label;
- void (*func) (ScriptState *);
- int val;
- int next;
+ int str;
+ int backpatch;
+ int label;
+ void(*func)(ScriptState *);
+ int val;
+ int next;
} *str_data;
-int str_num = LABEL_START, str_data_size;
-int str_hash[16];
+int str_num = LABEL_START, str_data_size;
+int str_hash[16];
static struct dbt *mapreg_db = NULL;
static struct dbt *mapregstr_db = NULL;
static int mapreg_dirty = -1;
char mapreg_txt[256] = "save/mapreg.txt";
-#define MAPREG_AUTOSAVE_INTERVAL (10*1000)
+#define MAPREG_AUTOSAVE_INTERVAL (10*1000)
static struct dbt *scriptlabel_db = NULL;
static struct dbt *userfunc_db = NULL;
-struct dbt *script_get_label_db (void)
+struct dbt *script_get_label_db(void)
{
return scriptlabel_db;
}
-struct dbt *script_get_userfunc_db (void)
+struct dbt *script_get_userfunc_db(void)
{
if (!userfunc_db)
- userfunc_db = strdb_init (50);
+ userfunc_db = strdb_init(50);
return userfunc_db;
}
@@ -93,12 +93,12 @@ static char pos[11][100] =
static struct Script_Config
{
- int warn_func_no_comma;
- int warn_cmd_no_comma;
- int warn_func_mismatch_paramnum;
- int warn_cmd_mismatch_paramnum;
- int check_cmdcount;
- int check_gotocount;
+ int warn_func_no_comma;
+ int warn_cmd_no_comma;
+ int warn_func_mismatch_paramnum;
+ int warn_cmd_mismatch_paramnum;
+ int check_cmdcount;
+ int check_gotocount;
} script_config;
static int parse_cmd_if = 0;
static int parse_cmd;
@@ -107,7 +107,7 @@ static int parse_cmd;
* ローカルプロトタイプ宣言 (必要な物のみ)
*------------------------------------------
*/
-const char *parse_subexpr (const char *, int);
+const char *parse_subexpr(const char *, int);
void builtin_mes(ScriptState *st);
void builtin_goto(ScriptState *st);
void builtin_callsub(ScriptState *st);
@@ -136,7 +136,7 @@ void builtin_copyarray(ScriptState *st);
void builtin_getarraysize(ScriptState *st);
void builtin_deletearray(ScriptState *st);
void builtin_getelementofarray(ScriptState *st);
-void builtin_if(ScriptState *st);
+void builtin_if (ScriptState *st);
void builtin_getitem(ScriptState *st);
void builtin_getitem2(ScriptState *st);
void builtin_makeitem(ScriptState *st);
@@ -296,15 +296,15 @@ void builtin_gety(ScriptState *st); // [Kage]
void builtin_getmap(ScriptState *st);
-void push_val (struct script_stack *stack, int type, int val);
-void run_func (ScriptState *st);
+void push_val(struct script_stack *stack, int type, int val);
+void run_func(ScriptState *st);
-void mapreg_setreg (int num, int val);
-void mapreg_setregstr (int num, const char *str);
+void mapreg_setreg(int num, int val);
+void mapreg_setregstr(int num, const char *str);
struct
{
- void (*func) (ScriptState *);
+ void(*func)(ScriptState *);
const char *name;
const char *arg;
} builtin_functions[] =
@@ -520,10 +520,10 @@ enum class ScriptCode : uint8_t
* 文字列のハッシュを計算
*------------------------------------------
*/
-static int calc_hash (const char *s)
+static int calc_hash(const char *s)
{
const unsigned char *p = (const unsigned char *)s;
- int h = 0;
+ int h = 0;
while (*p)
{
h = (h << 1) + (h >> 3) + (h >> 5) + (h >> 8);
@@ -537,13 +537,13 @@ static int calc_hash (const char *s)
*------------------------------------------
*/
// 既存のであれば番号、無ければ-1
-static int search_str (const char *p)
+static int search_str(const char *p)
{
- int i;
- i = str_hash[calc_hash (p)];
+ int i;
+ i = str_hash[calc_hash(p)];
while (i)
{
- if (strcmp (str_buf + str_data[i].str, p) == 0)
+ if (strcmp(str_buf + str_data[i].str, p) == 0)
{
return i;
}
@@ -557,22 +557,22 @@ static int search_str (const char *p)
*------------------------------------------
*/
// 既存のであれば番号、無ければ登録して新規番号
-static int add_str (const char *p)
+static int add_str(const char *p)
{
- int i;
+ int i;
char *lowcase;
- lowcase = strdup (p);
+ lowcase = strdup(p);
for (i = 0; lowcase[i]; i++)
- lowcase[i] = tolower (lowcase[i]);
- if ((i = search_str (lowcase)) >= 0)
+ lowcase[i] = tolower(lowcase[i]);
+ if ((i = search_str(lowcase)) >= 0)
{
- free (lowcase);
+ free(lowcase);
return i;
}
- free (lowcase);
+ free(lowcase);
- i = calc_hash (p);
+ i = calc_hash(p);
if (str_hash[i] == 0)
{
str_hash[i] = str_num;
@@ -582,7 +582,7 @@ static int add_str (const char *p)
i = str_hash[i];
for (;;)
{
- if (strcmp (str_buf + str_data[i].str, p) == 0)
+ if (strcmp(str_buf + str_data[i].str, p) == 0)
{
return i;
}
@@ -595,23 +595,23 @@ static int add_str (const char *p)
if (str_num >= str_data_size)
{
str_data_size += 128;
- RECREATE (str_data, struct str_data_t, str_data_size);
- memset (str_data + (str_data_size - 128), '\0', 128);
+ RECREATE(str_data, struct str_data_t, str_data_size);
+ memset(str_data + (str_data_size - 128), '\0', 128);
}
- while (str_pos + strlen (p) + 1 >= str_size)
+ while (str_pos + strlen(p) + 1 >= str_size)
{
str_size += 256;
- str_buf = (char *) realloc (str_buf, str_size);
- memset (str_buf + (str_size - 256), '\0', 256);
+ str_buf = (char *) realloc(str_buf, str_size);
+ memset(str_buf + (str_size - 256), '\0', 256);
}
- strcpy (str_buf + str_pos, p);
+ strcpy(str_buf + str_pos, p);
str_data[str_num].type = ScriptCode::NOP;
str_data[str_num].str = str_pos;
str_data[str_num].next = 0;
str_data[str_num].func = NULL;
str_data[str_num].backpatch = -1;
str_data[str_num].label = -1;
- str_pos += strlen (p) + 1;
+ str_pos += strlen(p) + 1;
return str_num++;
}
@@ -619,13 +619,13 @@ static int add_str (const char *p)
* スクリプトバッファサイズの確認と拡張
*------------------------------------------
*/
-static void check_script_buf (int size)
+static void check_script_buf(int size)
{
if (script_pos + size >= script_size)
{
script_size += SCRIPT_BLOCK_SIZE;
- script_buf = (ScriptCode *) realloc (script_buf, script_size);
- memset (script_buf + script_size - SCRIPT_BLOCK_SIZE, '\0',
+ script_buf = (ScriptCode *) realloc(script_buf, script_size);
+ memset(script_buf + script_size - SCRIPT_BLOCK_SIZE, '\0',
SCRIPT_BLOCK_SIZE);
}
}
@@ -635,9 +635,9 @@ static void check_script_buf (int size)
*------------------------------------------
*/
static
-void add_scriptc (ScriptCode a)
+void add_scriptc(ScriptCode a)
{
- check_script_buf (1);
+ check_script_buf(1);
script_buf[script_pos++] = a;
}
@@ -646,7 +646,7 @@ void add_scriptc (ScriptCode a)
*------------------------------------------
*/
static
-void add_scriptb (uint8_t a)
+void add_scriptb(uint8_t a)
{
add_scriptc(static_cast<ScriptCode>(a));
}
@@ -655,14 +655,14 @@ void add_scriptb (uint8_t a)
* スクリプトバッファに整数を書き込む
*------------------------------------------
*/
-static void add_scripti (unsigned int a)
+static void add_scripti(unsigned int a)
{
while (a >= 0x40)
{
- add_scriptb (a | 0xc0);
+ add_scriptb(a | 0xc0);
a = (a - 0x40) >> 6;
}
- add_scriptb (a | 0x80);
+ add_scriptb(a | 0x80);
}
/*==========================================
@@ -670,35 +670,35 @@ static void add_scripti (unsigned int a)
*------------------------------------------
*/
// 最大16Mまで
-static void add_scriptl (int l)
+static void add_scriptl(int l)
{
- int backpatch = str_data[l].backpatch;
+ int backpatch = str_data[l].backpatch;
switch (str_data[l].type)
{
case ScriptCode::POS:
- add_scriptc (ScriptCode::POS);
- add_scriptb ({uint8_t(str_data[l].label)});
- add_scriptb ({uint8_t(str_data[l].label >> 8)});
- add_scriptb ({uint8_t(str_data[l].label >> 16)});
+ add_scriptc(ScriptCode::POS);
+ add_scriptb({uint8_t(str_data[l].label)});
+ add_scriptb({uint8_t(str_data[l].label >> 8)});
+ add_scriptb({uint8_t(str_data[l].label >> 16)});
break;
case ScriptCode::NOP:
// ラベルの可能性があるのでbackpatch用データ埋め込み
- add_scriptc (ScriptCode::NAME);
+ add_scriptc(ScriptCode::NAME);
str_data[l].backpatch = script_pos;
- add_scriptb ({uint8_t(backpatch)});
- add_scriptb ({uint8_t(backpatch >> 8)});
- add_scriptb ({uint8_t(backpatch >> 16)});
+ add_scriptb({uint8_t(backpatch)});
+ add_scriptb({uint8_t(backpatch >> 8)});
+ add_scriptb({uint8_t(backpatch >> 16)});
break;
case ScriptCode::INT:
- add_scripti (str_data[l].val);
+ add_scripti(str_data[l].val);
break;
default:
// もう他の用途と確定してるので数字をそのまま
- add_scriptc (ScriptCode::NAME);
- add_scriptb ({uint8_t(l)});
- add_scriptb ({uint8_t(l >> 8)});
- add_scriptb ({uint8_t(l >> 16)});
+ add_scriptc(ScriptCode::NAME);
+ add_scriptb({uint8_t(l)});
+ add_scriptb({uint8_t(l >> 8)});
+ add_scriptb({uint8_t(l >> 16)});
break;
}
}
@@ -708,15 +708,15 @@ static void add_scriptl (int l)
*------------------------------------------
*/
static
-void set_label (int l, int pos_)
+void set_label(int l, int pos_)
{
- int i, next;
+ int i, next;
str_data[l].type = ScriptCode::POS;
str_data[l].label = pos_;
for (i = str_data[l].backpatch; i >= 0 && i != 0x00ffffff;)
{
- next = (*(int *) (script_buf + i)) & 0x00ffffff;
+ next = (*(int *)(script_buf + i)) & 0x00ffffff;
script_buf[i - 1] = ScriptCode::POS;
script_buf[i] = static_cast<ScriptCode>(pos_);
script_buf[i + 1] = static_cast<ScriptCode>(pos_ >> 8);
@@ -729,11 +729,11 @@ void set_label (int l, int pos_)
* スペース/コメント読み飛ばし
*------------------------------------------
*/
-static const char *skip_space (const char *p)
+static const char *skip_space(const char *p)
{
while (1)
{
- while (isspace (*p))
+ while (isspace(*p))
p++;
if (p[0] == '/' && p[1] == '/')
{
@@ -759,7 +759,7 @@ static const char *skip_space (const char *p)
*------------------------------------------
*/
static
-const char *skip_word (const char *p)
+const char *skip_word(const char *p)
{
// prefix
if (*p == '$')
@@ -773,7 +773,7 @@ const char *skip_word (const char *p)
if (*p == 'l')
p++; // 一時的変数用(like weiss)
- while (isalnum (*p) || *p == '_')
+ while (isalnum(*p) || *p == '_')
p++;
// postfix
@@ -790,7 +790,7 @@ static int startline;
* エラーメッセージ出力
*------------------------------------------
*/
-static void disp_error_message (const char *mes, const char *pos_)
+static void disp_error_message(const char *mes, const char *pos_)
{
int line;
const char *p;
@@ -798,7 +798,7 @@ static void disp_error_message (const char *mes, const char *pos_)
for (line = startline, p = startptr; p && *p; line++)
{
const char *linestart = p;
- char *lineend = const_cast<char *>(strchr (p, '\n'));
+ char *lineend = const_cast<char *>(strchr(p, '\n'));
char c;
if (lineend)
{
@@ -807,17 +807,17 @@ static void disp_error_message (const char *mes, const char *pos_)
}
if (lineend == NULL || pos_ < lineend)
{
- printf ("%s line %d : ", mes, line);
+ printf("%s line %d : ", mes, line);
for (int i = 0;
(linestart[i] != '\r') && (linestart[i] != '\n')
&& linestart[i]; i++)
{
if (linestart + i != pos_)
- printf ("%c", linestart[i]);
+ printf("%c", linestart[i]);
else
- printf ("\'%c\'", linestart[i]);
+ printf("\'%c\'", linestart[i]);
}
- printf ("\a\n");
+ printf("\a\n");
if (lineend)
*lineend = c;
return;
@@ -832,41 +832,41 @@ static void disp_error_message (const char *mes, const char *pos_)
*------------------------------------------
*/
static
-const char *parse_simpleexpr (const char *p)
+const char *parse_simpleexpr(const char *p)
{
- int i;
- p = skip_space (p);
+ int i;
+ p = skip_space(p);
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_simpleexpr %s\n", p);
+ printf("parse_simpleexpr %s\n", p);
#endif
if (*p == ';' || *p == ',')
{
- disp_error_message ("unexpected expr end", p);
- exit (1);
+ disp_error_message("unexpected expr end", p);
+ exit(1);
}
if (*p == '(')
{
- p = parse_subexpr (p + 1, -1);
- p = skip_space (p);
+ p = parse_subexpr(p + 1, -1);
+ p = skip_space(p);
if ((*p++) != ')')
{
- disp_error_message ("unmatch ')'", p);
- exit (1);
+ disp_error_message("unmatch ')'", p);
+ exit(1);
}
}
- else if (isdigit (*p) || ((*p == '-' || *p == '+') && isdigit (p[1])))
+ else if (isdigit(*p) || ((*p == '-' || *p == '+') && isdigit(p[1])))
{
char *np;
- i = strtoul (p, &np, 0);
- add_scripti (i);
+ i = strtoul(p, &np, 0);
+ add_scripti(i);
p = np;
}
else if (*p == '"')
{
- add_scriptc (ScriptCode::STR);
+ add_scriptc(ScriptCode::STR);
p++;
while (*p && *p != '"')
{
@@ -874,44 +874,44 @@ const char *parse_simpleexpr (const char *p)
p++;
else if (*p == '\n')
{
- disp_error_message ("unexpected newline @ string", p);
- exit (1);
+ disp_error_message("unexpected newline @ string", p);
+ exit(1);
}
- add_scriptb (*p++);
+ add_scriptb(*p++);
}
if (!*p)
{
- disp_error_message ("unexpected eof @ string", p);
- exit (1);
+ disp_error_message("unexpected eof @ string", p);
+ exit(1);
}
- add_scriptb (0);
+ add_scriptb(0);
p++; //'"'
}
else
{
int l;
// label , register , function etc
- if (skip_word (p) == p)
+ if (skip_word(p) == p)
{
- disp_error_message ("unexpected character", p);
- exit (1);
+ disp_error_message("unexpected character", p);
+ exit(1);
}
char *p2 = const_cast<char *>(skip_word(p));
char c = *p2;
*p2 = 0; // 名前をadd_strする
- l = add_str (p);
+ l = add_str(p);
parse_cmd = l; // warn_*_mismatch_paramnumのために必要
- if (l == search_str ("if")) // warn_cmd_no_commaのために必要
+ if (l == search_str("if")) // warn_cmd_no_commaのために必要
parse_cmd_if++;
/*
- // 廃止予定のl14/l15,およびプレフィックスｌの警告
- if( strcmp(str_buf+str_data[l].str,"l14")==0 ||
- strcmp(str_buf+str_data[l].str,"l15")==0 ){
- disp_error_message("l14 and l15 is DEPRECATED. use @menu instead of l15.",p);
- }else if(str_buf[str_data[l].str]=='l'){
- disp_error_message("prefix 'l' is DEPRECATED. use prefix '@' instead.",p2);
- }
+ // 廃止予定のl14/l15,およびプレフィックスｌの警告
+ if ( strcmp(str_buf+str_data[l].str,"l14")==0 ||
+ strcmp(str_buf+str_data[l].str,"l15")==0 ){
+ disp_error_message("l14 and l15 is DEPRECATED. use @menu instead of l15.",p);
+ }else if (str_buf[str_data[l].str]=='l'){
+ disp_error_message("prefix 'l' is DEPRECATED. use prefix '@' instead.",p2);
+ }
*/
*p2 = c;
p = p2;
@@ -919,26 +919,26 @@ const char *parse_simpleexpr (const char *p)
if (str_data[l].type != ScriptCode::FUNC && c == '[')
{
// array(name[i] => getelementofarray(name,i) )
- add_scriptl (search_str ("getelementofarray"));
- add_scriptc (ScriptCode::ARG);
- add_scriptl (l);
- p = parse_subexpr (p + 1, -1);
- p = skip_space (p);
+ add_scriptl(search_str("getelementofarray"));
+ add_scriptc(ScriptCode::ARG);
+ add_scriptl(l);
+ p = parse_subexpr(p + 1, -1);
+ p = skip_space(p);
if ((*p++) != ']')
{
- disp_error_message ("unmatch ']'", p);
- exit (1);
+ disp_error_message("unmatch ']'", p);
+ exit(1);
}
- add_scriptc (ScriptCode::FUNC);
+ add_scriptc(ScriptCode::FUNC);
}
else
- add_scriptl (l);
+ add_scriptl(l);
}
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_simpleexpr end %s\n", p);
+ printf("parse_simpleexpr end %s\n", p);
#endif
return p;
}
@@ -947,23 +947,23 @@ const char *parse_simpleexpr (const char *p)
* 式の解析
*------------------------------------------
*/
-const char *parse_subexpr (const char *p, int limit)
+const char *parse_subexpr(const char *p, int limit)
{
ScriptCode op;
int opl, len;
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_subexpr %s\n", p);
+ printf("parse_subexpr %s\n", p);
#endif
- p = skip_space (p);
+ p = skip_space(p);
if (*p == '-')
{
- const char *tmpp = skip_space (p + 1);
+ const char *tmpp = skip_space(p + 1);
if (*tmpp == ';' || *tmpp == ',')
{
- add_scriptl (LABEL_NEXTLINE);
+ add_scriptl(LABEL_NEXTLINE);
p++;
return p;
}
@@ -972,12 +972,12 @@ const char *parse_subexpr (const char *p, int limit)
if ((op = ScriptCode::NEG, *p == '-') || (op = ScriptCode::LNOT, *p == '!')
|| (op = ScriptCode::NOT, *p == '~'))
{
- p = parse_subexpr (p + 1, 100);
- add_scriptc (op);
+ p = parse_subexpr(p + 1, 100);
+ add_scriptc(op);
}
else
- p = parse_simpleexpr (p);
- p = skip_space (p);
+ p = parse_simpleexpr(p);
+ p = skip_space(p);
while (((op = ScriptCode::ADD, opl = 6, len = 1, *p == '+') ||
(op = ScriptCode::SUB, opl = 6, len = 1, *p == '-') ||
(op = ScriptCode::MUL, opl = 7, len = 1, *p == '*') ||
@@ -1001,63 +1001,63 @@ const char *parse_subexpr (const char *p, int limit)
p += len;
if (op == ScriptCode::FUNC)
{
- int i = 0, func = parse_cmd;
+ int i = 0, func = parse_cmd;
const char *plist[128];
if (str_data[func].type != ScriptCode::FUNC)
{
- disp_error_message ("expect function", tmpp);
- exit (0);
+ disp_error_message("expect function", tmpp);
+ exit(0);
}
- add_scriptc (ScriptCode::ARG);
+ add_scriptc(ScriptCode::ARG);
while (*p && *p != ')' && i < 128)
{
plist[i] = p;
- p = parse_subexpr (p, -1);
- p = skip_space (p);
+ p = parse_subexpr(p, -1);
+ p = skip_space(p);
if (*p == ',')
p++;
else if (*p != ')' && script_config.warn_func_no_comma)
{
- disp_error_message ("expect ',' or ')' at func params",
+ disp_error_message("expect ',' or ')' at func params",
p);
}
- p = skip_space (p);
+ p = skip_space(p);
i++;
}
plist[i] = p;
if (*(p++) != ')')
{
- disp_error_message ("func request '(' ')'", p);
- exit (1);
+ disp_error_message("func request '(' ')'", p);
+ exit(1);
}
if (str_data[func].type == ScriptCode::FUNC
&& script_config.warn_func_mismatch_paramnum)
{
const char *arg = builtin_functions[str_data[func].val].arg;
- int j = 0;
+ int j = 0;
for (j = 0; arg[j]; j++)
if (arg[j] == '*')
break;
if ((arg[j] == 0 && i != j) || (arg[j] == '*' && i < j))
{
- disp_error_message ("illegal number of parameters",
+ disp_error_message("illegal number of parameters",
plist[(i < j) ? i : j]);
}
}
}
else // not op == ScriptCode::FUNC
{
- p = parse_subexpr (p, opl);
+ p = parse_subexpr(p, opl);
}
- add_scriptc (op);
- p = skip_space (p);
+ add_scriptc(op);
+ p = skip_space(p);
}
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_subexpr end %s\n", p);
+ printf("parse_subexpr end %s\n", p);
#endif
return p; /* return first untreated operator */
}
@@ -1067,11 +1067,11 @@ const char *parse_subexpr (const char *p, int limit)
*------------------------------------------
*/
static
-const char *parse_expr (const char *p)
+const char *parse_expr(const char *p)
{
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_expr %s\n", p);
+ printf("parse_expr %s\n", p);
#endif
switch (*p)
{
@@ -1081,13 +1081,13 @@ const char *parse_expr (const char *p)
case '[':
case ']':
case '}':
- disp_error_message ("unexpected char", p);
- exit (1);
+ disp_error_message("unexpected char", p);
+ exit(1);
}
- p = parse_subexpr (p, -1);
+ p = parse_subexpr(p, -1);
#ifdef DEBUG_FUNCIN
if (battle_config.etc_log)
- printf ("parse_expr end %s\n", p);
+ printf("parse_expr end %s\n", p);
#endif
return p;
}
@@ -1097,12 +1097,12 @@ const char *parse_expr (const char *p)
*------------------------------------------
*/
static
-const char *parse_line (const char *p)
+const char *parse_line(const char *p)
{
- int i = 0, cmd;
+ int i = 0, cmd;
const char *plist[128];
- p = skip_space (p);
+ p = skip_space(p);
if (*p == ';')
return p;
@@ -1110,53 +1110,53 @@ const char *parse_line (const char *p)
// 最初は関数名
const char *p2 = p;
- p = parse_simpleexpr (p);
- p = skip_space (p);
+ p = parse_simpleexpr(p);
+ p = skip_space(p);
cmd = parse_cmd;
if (str_data[cmd].type != ScriptCode::FUNC)
{
- disp_error_message ("expect command", p2);
+ disp_error_message("expect command", p2);
// exit(0);
}
- add_scriptc (ScriptCode::ARG);
+ add_scriptc(ScriptCode::ARG);
while (p && *p && *p != ';' && i < 128)
{
plist[i] = p;
- p = parse_expr (p);
- p = skip_space (p);
+ p = parse_expr(p);
+ p = skip_space(p);
// 引数区切りの,処理
if (*p == ',')
p++;
else if (*p != ';' && script_config.warn_cmd_no_comma
&& parse_cmd_if * 2 <= i)
{
- disp_error_message ("expect ',' or ';' at cmd params", p);
+ disp_error_message("expect ',' or ';' at cmd params", p);
}
- p = skip_space (p);
+ p = skip_space(p);
i++;
}
plist[i] = p;
if (!p || *(p++) != ';')
{
- disp_error_message ("need ';'", p);
- exit (1);
+ disp_error_message("need ';'", p);
+ exit(1);
}
- add_scriptc (ScriptCode::FUNC);
+ add_scriptc(ScriptCode::FUNC);
if (str_data[cmd].type == ScriptCode::FUNC
&& script_config.warn_cmd_mismatch_paramnum)
{
const char *arg = builtin_functions[str_data[cmd].val].arg;
- int j = 0;
+ int j = 0;
for (j = 0; arg[j]; j++)
if (arg[j] == '*')
break;
if ((arg[j] == 0 && i != j) || (arg[j] == '*' && i < j))
{
- disp_error_message ("illegal number of parameters",
+ disp_error_message("illegal number of parameters",
plist[(i < j) ? i : j]);
}
}
@@ -1168,12 +1168,12 @@ const char *parse_line (const char *p)
* 組み込み関数の追加
*------------------------------------------
*/
-static void add_builtin_functions (void)
+static void add_builtin_functions(void)
{
- int i, n;
+ int i, n;
for (i = 0; builtin_functions[i].func; i++)
{
- n = add_str (builtin_functions[i].name);
+ n = add_str(builtin_functions[i].name);
str_data[n].type = ScriptCode::FUNC;
str_data[n].val = i;
str_data[n].func = builtin_functions[i].func;
@@ -1184,29 +1184,29 @@ static void add_builtin_functions (void)
* 定数データベースの読み込み
*------------------------------------------
*/
-static void read_constdb (void)
+static void read_constdb(void)
{
FILE *fp;
char line[1024], name[1024];
- int val, n, i, type;
+ int val, n, i, type;
- fp = fopen_ ("db/const.txt", "r");
+ fp = fopen_("db/const.txt", "r");
if (fp == NULL)
{
- printf ("can't read db/const.txt\n");
+ printf("can't read db/const.txt\n");
return;
}
- while (fgets (line, 1020, fp))
+ while (fgets(line, 1020, fp))
{
if (line[0] == '/' && line[1] == '/')
continue;
type = 0;
- if (sscanf (line, "%[A-Za-z0-9_],%d,%d", name, &val, &type) >= 2 ||
- sscanf (line, "%[A-Za-z0-9_] %d %d", name, &val, &type) >= 2)
+ if (sscanf(line, "%[A-Za-z0-9_],%d,%d", name, &val, &type) >= 2 ||
+ sscanf(line, "%[A-Za-z0-9_] %d %d", name, &val, &type) >= 2)
{
for (i = 0; name[i]; i++)
- name[i] = tolower (name[i]);
- n = add_str (name);
+ name[i] = tolower(name[i]);
+ n = add_str(name);
if (type == 0)
str_data[n].type = ScriptCode::INT;
else
@@ -1214,26 +1214,26 @@ static void read_constdb (void)
str_data[n].val = val;
}
}
- fclose_ (fp);
+ fclose_(fp);
}
/*==========================================
* スクリプトの解析
*------------------------------------------
*/
-const ScriptCode *parse_script (const char *src, int line)
+const ScriptCode *parse_script(const char *src, int line)
{
const char *p;
- int i;
+ int i;
static int first = 1;
if (first)
{
- add_builtin_functions ();
- read_constdb ();
+ add_builtin_functions();
+ read_constdb();
}
first = 0;
- script_buf = (ScriptCode *) calloc (SCRIPT_BLOCK_SIZE, 1);
+ script_buf = (ScriptCode *) calloc(SCRIPT_BLOCK_SIZE, 1);
script_pos = 0;
script_size = SCRIPT_BLOCK_SIZE;
str_data[LABEL_NEXTLINE].type = ScriptCode::NOP;
@@ -1251,70 +1251,70 @@ const ScriptCode *parse_script (const char *src, int line)
// 外部用label dbの初期化
if (scriptlabel_db != NULL)
- strdb_final (scriptlabel_db, NULL);
- scriptlabel_db = strdb_init (50);
+ strdb_final(scriptlabel_db, NULL);
+ scriptlabel_db = strdb_init(50);
// for error message
startptr = src;
startline = line;
p = src;
- p = skip_space (p);
+ p = skip_space(p);
if (*p != '{')
{
- disp_error_message ("not found '{'", p);
+ disp_error_message("not found '{'", p);
return NULL;
}
for (p++; p && *p && *p != '}';)
{
- p = skip_space (p);
+ p = skip_space(p);
// labelだけ特殊処理
- if (*skip_space (skip_word (p)) == ':')
+ if (*skip_space(skip_word(p)) == ':')
{
char *tmpp = const_cast<char *>(skip_word(p));
char c = *tmpp;
*tmpp = '\0';
- int l = add_str (p);
+ int l = add_str(p);
if (str_data[l].label != -1)
{
*tmpp = c;
- disp_error_message ("dup label ", p);
- exit (1);
+ disp_error_message("dup label ", p);
+ exit(1);
}
- set_label (l, script_pos);
- strdb_insert (scriptlabel_db, (const char*)p, script_pos); // 外部用label db登録
+ set_label(l, script_pos);
+ strdb_insert(scriptlabel_db, (const char*)p, script_pos); // 外部用label db登録
*tmpp = c;
p = tmpp + 1;
continue;
}
// 他は全部一緒くた
- p = parse_line (p);
- p = skip_space (p);
- add_scriptc (ScriptCode::EOL);
+ p = parse_line(p);
+ p = skip_space(p);
+ add_scriptc(ScriptCode::EOL);
- set_label (LABEL_NEXTLINE, script_pos);
+ set_label(LABEL_NEXTLINE, script_pos);
str_data[LABEL_NEXTLINE].type = ScriptCode::NOP;
str_data[LABEL_NEXTLINE].backpatch = -1;
str_data[LABEL_NEXTLINE].label = -1;
}
- add_scriptc (ScriptCode::NOP);
+ add_scriptc(ScriptCode::NOP);
script_size = script_pos;
- script_buf = (ScriptCode *) realloc (script_buf, script_pos + 1);
+ script_buf = (ScriptCode *) realloc(script_buf, script_pos + 1);
// 未解決のラベルを解決
for (i = LABEL_START; i < str_num; i++)
{
if (str_data[i].type == ScriptCode::NOP)
{
- int j, next;
+ int j, next;
str_data[i].type = ScriptCode::NAME;
str_data[i].label = i;
for (j = str_data[i].backpatch; j >= 0 && j != 0x00ffffff;)
{
- next = (*(int *) (script_buf + j)) & 0x00ffffff;
+ next = (*(int *)(script_buf + j)) & 0x00ffffff;
script_buf[j] = static_cast<ScriptCode>(i);
script_buf[j + 1] = static_cast<ScriptCode>(i >> 8);
script_buf[j + 2] = static_cast<ScriptCode>(i >> 16);
@@ -1327,12 +1327,12 @@ const ScriptCode *parse_script (const char *src, int line)
for (i = 0; i < script_pos; i++)
{
if ((i & 15) == 0)
- printf ("%04x : ", i);
- printf ("%02x ", script_buf[i]);
+ printf("%04x : ", i);
+ printf("%02x ", script_buf[i]);
if ((i & 15) == 15)
- printf ("\n");
+ printf("\n");
}
- printf ("\n");
+ printf("\n");
#endif
return script_buf;
@@ -1349,12 +1349,12 @@ enum
*------------------------------------------
*/
static
-struct map_session_data *script_rid2sd (ScriptState *st)
+struct map_session_data *script_rid2sd(ScriptState *st)
{
- struct map_session_data *sd = map_id2sd (st->rid);
+ struct map_session_data *sd = map_id2sd(st->rid);
if (!sd)
{
- printf ("script_rid2sd: fatal error ! player not attached!\n");
+ printf("script_rid2sd: fatal error ! player not attached!\n");
}
return sd;
}
@@ -1364,19 +1364,19 @@ struct map_session_data *script_rid2sd (ScriptState *st)
*------------------------------------------
*/
static
-void get_val (ScriptState *st, struct script_data *data)
+void get_val(ScriptState *st, struct script_data *data)
{
struct map_session_data *sd = NULL;
if (data->type == ScriptCode::NAME)
{
char *name = str_buf + str_data[data->u.num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
+ char postfix = name[strlen(name) - 1];
if (prefix != '$')
{
- if ((sd = script_rid2sd (st)) == NULL)
- printf ("get_val error name?:%s\n", name);
+ if ((sd = script_rid2sd(st)) == NULL)
+ printf("get_val error name?:%s\n", name);
}
if (postfix == '$')
{
@@ -1385,16 +1385,16 @@ void get_val (ScriptState *st, struct script_data *data)
if (prefix == '@' || prefix == 'l')
{
if (sd)
- data->u.str = pc_readregstr (sd, data->u.num);
+ data->u.str = pc_readregstr(sd, data->u.num);
}
else if (prefix == '$')
{
data->u.str =
- (char *) numdb_search (mapregstr_db, data->u.num);
+ (char *) numdb_search(mapregstr_db, data->u.num);
}
else
{
- printf ("script: get_val: illegal scope string variable.\n");
+ printf("script: get_val: illegal scope string variable.\n");
data->u.str = "!!ERROR!!";
}
if (data->u.str == NULL)
@@ -1414,35 +1414,35 @@ void get_val (ScriptState *st, struct script_data *data)
{
if (sd)
data->u.num =
- pc_readparam (sd,
+ pc_readparam(sd,
str_data[data->u.num & 0x00ffffff].val);
}
else if (prefix == '@' || prefix == 'l')
{
if (sd)
- data->u.num = pc_readreg (sd, data->u.num);
+ data->u.num = pc_readreg(sd, data->u.num);
}
else if (prefix == '$')
{
- data->u.num = (int) numdb_search (mapreg_db, data->u.num);
+ data->u.num = (int) numdb_search(mapreg_db, data->u.num);
}
else if (prefix == '#')
{
if (name[1] == '#')
{
if (sd)
- data->u.num = pc_readaccountreg2 (sd, name);
+ data->u.num = pc_readaccountreg2(sd, name);
}
else
{
if (sd)
- data->u.num = pc_readaccountreg (sd, name);
+ data->u.num = pc_readaccountreg(sd, name);
}
}
else
{
if (sd)
- data->u.num = pc_readglobalreg (sd, name);
+ data->u.num = pc_readglobalreg(sd, name);
}
}
}
@@ -1453,12 +1453,12 @@ void get_val (ScriptState *st, struct script_data *data)
*------------------------------------------
*/
static
-struct script_data get_val2 (ScriptState *st, int num)
+struct script_data get_val2(ScriptState *st, int num)
{
struct script_data dat;
dat.type = ScriptCode::NAME;
dat.u.num = num;
- get_val (st, &dat);
+ get_val(st, &dat);
return dat;
}
@@ -1467,25 +1467,25 @@ struct script_data get_val2 (ScriptState *st, int num)
*------------------------------------------
*/
static
-void set_reg (struct map_session_data *sd, int num, const char *name, struct script_data vd)
+void set_reg(struct map_session_data *sd, int num, const char *name, struct script_data vd)
{
char prefix = *name;
- char postfix = name[strlen (name) - 1];
+ char postfix = name[strlen(name) - 1];
if (postfix == '$')
{
const char *str = vd.u.str;
if (prefix == '@' || prefix == 'l')
{
- pc_setregstr (sd, num, str);
+ pc_setregstr(sd, num, str);
}
else if (prefix == '$')
{
- mapreg_setregstr (num, str);
+ mapreg_setregstr(num, str);
}
else
{
- printf ("script: set_reg: illegal scope string variable !");
+ printf("script: set_reg: illegal scope string variable !");
}
}
else
@@ -1494,32 +1494,32 @@ void set_reg (struct map_session_data *sd, int num, const char *name, struct scr
int val = vd.u.num;
if (str_data[num & 0x00ffffff].type == ScriptCode::PARAM)
{
- pc_setparam (sd, str_data[num & 0x00ffffff].val, val);
+ pc_setparam(sd, str_data[num & 0x00ffffff].val, val);
}
else if (prefix == '@' || prefix == 'l')
{
- pc_setreg (sd, num, val);
+ pc_setreg(sd, num, val);
}
else if (prefix == '$')
{
- mapreg_setreg (num, val);
+ mapreg_setreg(num, val);
}
else if (prefix == '#')
{
if (name[1] == '#')
- pc_setaccountreg2 (sd, name, val);
+ pc_setaccountreg2(sd, name, val);
else
- pc_setaccountreg (sd, name, val);
+ pc_setaccountreg(sd, name, val);
}
else
{
- pc_setglobalreg (sd, name, val);
+ pc_setglobalreg(sd, name, val);
}
}
}
static
-void set_reg (struct map_session_data *sd, int num, const char *name, int id)
+void set_reg(struct map_session_data *sd, int num, const char *name, int id)
{
struct script_data vd;
vd.u.num = id;
@@ -1527,7 +1527,7 @@ void set_reg (struct map_session_data *sd, int num, const char *name, int id)
}
static
-void set_reg (struct map_session_data *sd, int num, const char *name, const char *zd)
+void set_reg(struct map_session_data *sd, int num, const char *name, const char *zd)
{
struct script_data vd;
vd.u.str = zd;
@@ -1539,14 +1539,14 @@ void set_reg (struct map_session_data *sd, int num, const char *name, const char
*------------------------------------------
*/
static
-const char *conv_str (ScriptState *st, struct script_data *data)
+const char *conv_str(ScriptState *st, struct script_data *data)
{
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::INT)
{
char *buf;
- buf = (char *) calloc (16, 1);
- sprintf (buf, "%d", data->u.num);
+ buf = (char *) calloc(16, 1);
+ sprintf(buf, "%d", data->u.num);
data->type = ScriptCode::STR;
data->u.str = buf;
}
@@ -1566,13 +1566,13 @@ const char *conv_str (ScriptState *st, struct script_data *data)
*------------------------------------------
*/
static
-int conv_num (ScriptState *st, struct script_data *data)
+int conv_num(ScriptState *st, struct script_data *data)
{
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
const char *p = data->u.str;
- data->u.num = atoi (p);
+ data->u.num = atoi(p);
if (data->type == ScriptCode::STR)
free(const_cast<char *>(p));
data->type = ScriptCode::INT;
@@ -1585,16 +1585,16 @@ int conv_num (ScriptState *st, struct script_data *data)
*------------------------------------------
*/
static
-void push_val (struct script_stack *stack, ScriptCode type, int val)
+void push_val(struct script_stack *stack, ScriptCode type, int val)
{
if (stack->sp >= stack->sp_max)
{
stack->sp_max += 64;
stack->stack_data = (struct script_data *)
- realloc (stack->stack_data, sizeof (stack->stack_data[0]) *
+ realloc(stack->stack_data, sizeof(stack->stack_data[0]) *
stack->sp_max);
- memset (stack->stack_data + (stack->sp_max - 64), 0,
- 64 * sizeof (*(stack->stack_data)));
+ memset(stack->stack_data + (stack->sp_max - 64), 0,
+ 64 * sizeof(*(stack->stack_data)));
}
// if(battle_config.etc_log)
// printf("push (%d,%d)-> %d\n",type,val,stack->sp);
@@ -1608,16 +1608,16 @@ void push_val (struct script_stack *stack, ScriptCode type, int val)
*------------------------------------------
*/
static
-void push_str (struct script_stack *stack, ScriptCode type, const char *str)
+void push_str(struct script_stack *stack, ScriptCode type, const char *str)
{
if (stack->sp >= stack->sp_max)
{
stack->sp_max += 64;
stack->stack_data = (struct script_data *)
- realloc (stack->stack_data, sizeof (stack->stack_data[0]) *
+ realloc(stack->stack_data, sizeof(stack->stack_data[0]) *
stack->sp_max);
- memset (stack->stack_data + (stack->sp_max - 64), '\0',
- 64 * sizeof (*(stack->stack_data)));
+ memset(stack->stack_data + (stack->sp_max - 64), '\0',
+ 64 * sizeof(*(stack->stack_data)));
}
// if(battle_config.etc_log)
// printf("push (%d,%x)-> %d\n",type,str,stack->sp);
@@ -1631,18 +1631,18 @@ void push_str (struct script_stack *stack, ScriptCode type, const char *str)
*------------------------------------------
*/
static
-void push_copy (struct script_stack *stack, int pos_)
+void push_copy(struct script_stack *stack, int pos_)
{
switch (stack->stack_data[pos_].type)
{
case ScriptCode::CONSTSTR:
- push_str (stack, ScriptCode::CONSTSTR, stack->stack_data[pos_].u.str);
+ push_str(stack, ScriptCode::CONSTSTR, stack->stack_data[pos_].u.str);
break;
case ScriptCode::STR:
- push_str (stack, ScriptCode::STR, strdup (stack->stack_data[pos_].u.str));
+ push_str(stack, ScriptCode::STR, strdup(stack->stack_data[pos_].u.str));
break;
default:
- push_val (stack, stack->stack_data[pos_].type,
+ push_val(stack, stack->stack_data[pos_].type,
stack->stack_data[pos_].u.num);
break;
}
@@ -1653,20 +1653,20 @@ void push_copy (struct script_stack *stack, int pos_)
*------------------------------------------
*/
static
-void pop_stack (struct script_stack *stack, int start, int end)
+void pop_stack(struct script_stack *stack, int start, int end)
{
- int i;
+ int i;
for (i = start; i < end; i++)
{
if (stack->stack_data[i].type == ScriptCode::STR)
{
- free (const_cast<char *>(stack->stack_data[i].u.str));
+ free(const_cast<char *>(stack->stack_data[i].u.str));
}
}
if (stack->sp > end)
{
- memmove (&stack->stack_data[start], &stack->stack_data[end],
- sizeof (stack->stack_data[0]) * (stack->sp - end));
+ memmove(&stack->stack_data[start], &stack->stack_data[end],
+ sizeof(stack->stack_data[0]) * (stack->sp - end));
}
stack->sp -= end - start;
}
@@ -1678,10 +1678,10 @@ void pop_stack (struct script_stack *stack, int start, int end)
*
*------------------------------------------
*/
-void builtin_mes (ScriptState *st)
+void builtin_mes(ScriptState *st)
{
- conv_str (st, &(st->stack->stack_data[st->start + 2]));
- clif_scriptmes (script_rid2sd (st), st->oid,
+ conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ clif_scriptmes(script_rid2sd(st), st->oid,
st->stack->stack_data[st->start + 2].u.str);
}
@@ -1689,16 +1689,16 @@ void builtin_mes (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_goto (ScriptState *st)
+void builtin_goto(ScriptState *st)
{
if (st->stack->stack_data[st->start + 2].type != ScriptCode::POS)
{
- printf ("script: goto: not label !\n");
+ printf("script: goto: not label !\n");
st->state = END;
return;
}
- st->pos = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ st->pos = conv_num(st, &(st->stack->stack_data[st->start + 2]));
st->state = GOTO;
}
@@ -1706,21 +1706,21 @@ void builtin_goto (ScriptState *st)
* ユーザー定義関数の呼び出し
*------------------------------------------
*/
-void builtin_callfunc (ScriptState *st)
+void builtin_callfunc(ScriptState *st)
{
const ScriptCode *scr;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
- if ((scr = (const ScriptCode *)strdb_search (script_get_userfunc_db (), str)))
+ if ((scr = (const ScriptCode *)strdb_search(script_get_userfunc_db(), str)))
{
- int i, j;
+ int i, j;
for (i = st->start + 3, j = 0; i < st->end; i++, j++)
- push_copy (st->stack, i);
+ push_copy(st->stack, i);
- push_val (st->stack, ScriptCode::INT, j); // 引数の数をプッシュ
- push_val (st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ
- push_val (st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ
- push_val (st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ
+ push_val(st->stack, ScriptCode::INT, j); // 引数の数をプッシュ
+ push_val(st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ
+ push_val(st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ
+ push_val(st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ
st->pos = 0;
st->script = scr;
@@ -1729,7 +1729,7 @@ void builtin_callfunc (ScriptState *st)
}
else
{
- printf ("script:callfunc: function not found! [%s]\n", str);
+ printf("script:callfunc: function not found! [%s]\n", str);
st->state = END;
}
}
@@ -1738,17 +1738,17 @@ void builtin_callfunc (ScriptState *st)
* サブルーティンの呼び出し
*------------------------------------------
*/
-void builtin_callsub (ScriptState *st)
+void builtin_callsub(ScriptState *st)
{
- int pos_ = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- int i, j;
+ int pos_ = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ int i, j;
for (i = st->start + 3, j = 0; i < st->end; i++, j++)
- push_copy (st->stack, i);
+ push_copy(st->stack, i);
- push_val (st->stack, ScriptCode::INT, j); // 引数の数をプッシュ
- push_val (st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ
- push_val (st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ
- push_val (st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ
+ push_val(st->stack, ScriptCode::INT, j); // 引数の数をプッシュ
+ push_val(st->stack, ScriptCode::INT, st->defsp); // 現在の基準スタックポインタをプッシュ
+ push_val(st->stack, ScriptCode::INT, (int) st->script); // 現在のスクリプトをプッシュ
+ push_val(st->stack, ScriptCode::RETINFO, st->pos); // 現在のスクリプト位置をプッシュ
st->pos = pos_;
st->defsp = st->start + 4 + j;
@@ -1759,37 +1759,37 @@ void builtin_callsub (ScriptState *st)
* 引数の所得
*------------------------------------------
*/
-void builtin_getarg (ScriptState *st)
+void builtin_getarg(ScriptState *st)
{
- int num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- int max, stsp;
+ int num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ int max, stsp;
if (st->defsp < 4
|| st->stack->stack_data[st->defsp - 1].type != ScriptCode::RETINFO)
{
- printf ("script:getarg without callfunc or callsub!\n");
+ printf("script:getarg without callfunc or callsub!\n");
st->state = END;
return;
}
- max = conv_num (st, &(st->stack->stack_data[st->defsp - 4]));
+ max = conv_num(st, &(st->stack->stack_data[st->defsp - 4]));
stsp = st->defsp - max - 4;
if (num >= max)
{
- printf ("script:getarg arg1(%d) out of range(%d) !\n", num, max);
+ printf("script:getarg arg1 (%d) out of range (%d) !\n", num, max);
st->state = END;
return;
}
- push_copy (st->stack, stsp + num);
+ push_copy(st->stack, stsp + num);
}
/*==========================================
* サブルーチン/ユーザー定義関数の終了
*------------------------------------------
*/
-void builtin_return (ScriptState *st)
+void builtin_return(ScriptState *st)
{
if (st->end > st->start + 2)
{ // 戻り値有り
- push_copy (st->stack, st->start + 2);
+ push_copy(st->stack, st->start + 2);
}
st->state = RETFUNC;
}
@@ -1798,49 +1798,49 @@ void builtin_return (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_next (ScriptState *st)
+void builtin_next(ScriptState *st)
{
st->state = STOP;
- clif_scriptnext (script_rid2sd (st), st->oid);
+ clif_scriptnext(script_rid2sd(st), st->oid);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_close (ScriptState *st)
+void builtin_close(ScriptState *st)
{
st->state = END;
- clif_scriptclose (script_rid2sd (st), st->oid);
+ clif_scriptclose(script_rid2sd(st), st->oid);
}
-void builtin_close2 (ScriptState *st)
+void builtin_close2(ScriptState *st)
{
st->state = STOP;
- clif_scriptclose (script_rid2sd (st), st->oid);
+ clif_scriptclose(script_rid2sd(st), st->oid);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_menu (ScriptState *st)
+void builtin_menu(ScriptState *st)
{
char *buf;
- int i, len = 0; // [fate] len is the total # of bytes we need to transmit the string choices
- int menu_choices = 0;
- int finished_menu_items = 0; // [fate] set to 1 after we hit the first empty string
+ int i, len = 0; // [fate] len is the total # of bytes we need to transmit the string choices
+ int menu_choices = 0;
+ int finished_menu_items = 0; // [fate] set to 1 after we hit the first empty string
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
// We don't need to do this iteration if the player cancels, strictly speaking.
for (i = st->start + 2; i < st->end; i += 2)
{
- int choice_len;
- conv_str (st, &(st->stack->stack_data[i]));
- choice_len = strlen (st->stack->stack_data[i].u.str);
+ int choice_len;
+ conv_str(st, &(st->stack->stack_data[i]));
+ choice_len = strlen(st->stack->stack_data[i].u.str);
len += choice_len + 1; // count # of bytes we'll need for packet. Only used if menu_or_input = 0.
if (choice_len && !finished_menu_items)
@@ -1854,15 +1854,15 @@ void builtin_menu (ScriptState *st)
st->state = RERUNLINE;
sd->state.menu_or_input = 1;
- buf = (char *) calloc (len + 1, 1);
+ buf = (char *) calloc(len + 1, 1);
buf[0] = 0;
for (i = st->start + 2; menu_choices > 0; i += 2, --menu_choices)
{
- strcat (buf, st->stack->stack_data[i].u.str);
- strcat (buf, ":");
+ strcat(buf, st->stack->stack_data[i].u.str);
+ strcat(buf, ":");
}
- clif_scriptmenu (script_rid2sd (st), st->oid, buf);
- free (buf);
+ clif_scriptmenu(script_rid2sd(st), st->oid, buf);
+ free(buf);
}
else if (sd->npc_menu == 0xff)
{ // cansel
@@ -1872,8 +1872,8 @@ void builtin_menu (ScriptState *st)
else
{ // goto動作
// ragemu互換のため
- pc_setreg (sd, add_str ("l15"), sd->npc_menu);
- pc_setreg (sd, add_str ("@menu"), sd->npc_menu);
+ pc_setreg(sd, add_str("l15"), sd->npc_menu);
+ pc_setreg(sd, add_str("@menu"), sd->npc_menu);
sd->state.menu_or_input = 0;
if (sd->npc_menu > 0 && sd->npc_menu <= menu_choices)
{
@@ -1884,7 +1884,7 @@ void builtin_menu (ScriptState *st)
return;
}
st->pos =
- conv_num (st,
+ conv_num(st,
&(st->
stack->stack_data[st->start + sd->npc_menu * 2 +
1]));
@@ -1897,28 +1897,28 @@ void builtin_menu (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_rand (ScriptState *st)
+void builtin_rand(ScriptState *st)
{
- int range, min, max;
+ int range, min, max;
if (st->end > st->start + 3)
{
- min = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- max = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ min = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ max = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (max < min)
{
- int tmp;
+ int tmp;
tmp = min;
min = max;
max = tmp;
}
range = max - min + 1;
- push_val (st->stack, ScriptCode::INT, (range <= 0 ? 0 : MRAND (range)) + min);
+ push_val(st->stack, ScriptCode::INT, (range <= 0 ? 0 : MRAND(range)) + min);
}
else
{
- range = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- push_val (st->stack, ScriptCode::INT, range <= 0 ? 0 : MRAND (range));
+ range = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ push_val(st->stack, ScriptCode::INT, range <= 0 ? 0 : MRAND(range));
}
}
@@ -1926,14 +1926,14 @@ void builtin_rand (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_pow (ScriptState *st)
+void builtin_pow(ScriptState *st)
{
- int a, b;
+ int a, b;
- a = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- b = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ a = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ b = conv_num(st, &(st->stack->stack_data[st->start + 3]));
- push_val (st->stack, ScriptCode::INT, (int) pow (a * 0.001, b));
+ push_val(st->stack, ScriptCode::INT, (int) pow(a * 0.001, b));
}
@@ -1941,21 +1941,21 @@ void builtin_pow (ScriptState *st)
* Check whether the PC is at the specified location
*------------------------------------------
*/
-void builtin_isat (ScriptState *st)
+void builtin_isat(ScriptState *st)
{
- int x, y;
- struct map_session_data *sd = script_rid2sd (st);
+ int x, y;
+ struct map_session_data *sd = script_rid2sd(st);
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
if (!sd)
return;
- push_val (st->stack, ScriptCode::INT,
+ push_val(st->stack, ScriptCode::INT,
(x == sd->bl.x)
- && (y == sd->bl.y) && (!strcmp (str, map[sd->bl.m].name)));
+ && (y == sd->bl.y) && (!strcmp(str, map[sd->bl.m].name)));
}
@@ -1963,34 +1963,34 @@ void builtin_isat (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_warp (ScriptState *st)
+void builtin_warp(ScriptState *st)
{
- int x, y;
- struct map_session_data *sd = script_rid2sd (st);
+ int x, y;
+ struct map_session_data *sd = script_rid2sd(st);
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- if (strcmp (str, "Random") == 0)
- pc_randomwarp (sd, 3);
- else if (strcmp (str, "SavePoint") == 0)
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ if (strcmp(str, "Random") == 0)
+ pc_randomwarp(sd, 3);
+ else if (strcmp(str, "SavePoint") == 0)
{
if (map[sd->bl.m].flag.noreturn) // 蝶禁止
return;
- pc_setpos (sd, sd->status.save_point.map,
+ pc_setpos(sd, sd->status.save_point.map,
sd->status.save_point.x, sd->status.save_point.y, 3);
}
- else if (strcmp (str, "Save") == 0)
+ else if (strcmp(str, "Save") == 0)
{
if (map[sd->bl.m].flag.noreturn) // 蝶禁止
return;
- pc_setpos (sd, sd->status.save_point.map,
+ pc_setpos(sd, sd->status.save_point.map,
sd->status.save_point.x, sd->status.save_point.y, 3);
}
else
- pc_setpos (sd, str, x, y, 0);
+ pc_setpos(sd, str, x, y, 0);
}
/*==========================================
@@ -1998,36 +1998,36 @@ void builtin_warp (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_areawarp_sub (struct block_list *bl, va_list ap)
-{
- int x, y;
- const char *mapname = va_arg (ap, const char *);
- x = va_arg (ap, int);
- y = va_arg (ap, int);
- if (strcmp (mapname, "Random") == 0)
- pc_randomwarp ((struct map_session_data *) bl, 3);
+void builtin_areawarp_sub(struct block_list *bl, va_list ap)
+{
+ int x, y;
+ const char *mapname = va_arg(ap, const char *);
+ x = va_arg(ap, int);
+ y = va_arg(ap, int);
+ if (strcmp(mapname, "Random") == 0)
+ pc_randomwarp((struct map_session_data *) bl, 3);
else
- pc_setpos ((struct map_session_data *) bl, mapname, x, y, 0);
+ pc_setpos((struct map_session_data *) bl, mapname, x, y, 0);
}
-void builtin_areawarp (ScriptState *st)
+void builtin_areawarp(ScriptState *st)
{
- int x, y, m;
- int x0, y0, x1, y1;
+ int x, y, m;
+ int x0, y0, x1, y1;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 8]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 9]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 8]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 9]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_areawarp_sub,
+ map_foreachinarea(builtin_areawarp_sub,
m, x0, y0, x1, y1, BL_PC, str, x, y);
}
@@ -2035,55 +2035,55 @@ void builtin_areawarp (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_heal (ScriptState *st)
+void builtin_heal(ScriptState *st)
{
- int hp, sp;
+ int hp, sp;
- hp = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sp = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- pc_heal (script_rid2sd (st), hp, sp);
+ hp = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sp = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ pc_heal(script_rid2sd(st), hp, sp);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_itemheal (ScriptState *st)
+void builtin_itemheal(ScriptState *st)
{
- int hp, sp;
+ int hp, sp;
- hp = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sp = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- pc_itemheal (script_rid2sd (st), hp, sp);
+ hp = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sp = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ pc_itemheal(script_rid2sd(st), hp, sp);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_percentheal (ScriptState *st)
+void builtin_percentheal(ScriptState *st)
{
- int hp, sp;
+ int hp, sp;
- hp = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sp = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- pc_percentheal (script_rid2sd (st), hp, sp);
+ hp = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sp = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ pc_percentheal(script_rid2sd(st), hp, sp);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_jobchange (ScriptState *st)
+void builtin_jobchange(ScriptState *st)
{
- int job, upper = -1;
+ int job, upper = -1;
- job = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ job = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
- upper = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ upper = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if ((job >= 0 && job < MAX_PC_CLASS))
- pc_jobchange (script_rid2sd (st), job, upper);
+ pc_jobchange(script_rid2sd(st), job, upper);
}
@@ -2091,19 +2091,19 @@ void builtin_jobchange (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_input (ScriptState *st)
+void builtin_input(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num =
+ int num =
(st->end >
st->start + 2) ? st->stack->stack_data[st->start + 2].u.num : 0;
const char *name =
(st->end >
st->start + 2) ? str_buf + str_data[num & 0x00ffffff].str : "";
// char prefix=*name;
- char postfix = name[strlen (name) - 1];
+ char postfix = name[strlen(name) - 1];
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd->state.menu_or_input)
{
sd->state.menu_or_input = 0;
@@ -2112,11 +2112,11 @@ void builtin_input (ScriptState *st)
// 文字列
if (st->end > st->start + 2)
{ // 引数1個
- set_reg (sd, num, name, sd->npc_str);
+ set_reg(sd, num, name, sd->npc_str);
}
else
{
- printf ("builtin_input: string discarded !!\n");
+ printf("builtin_input: string discarded !!\n");
}
}
else
@@ -2126,19 +2126,19 @@ void builtin_input (ScriptState *st)
//** Fix by fritz :X keeps people from abusing old input bugs
if (sd->npc_amount < 0) //** If input amount is less then 0
{
- clif_tradecancelled (sd); // added "Deal has been cancelled" message by Valaris
- builtin_close (st); //** close
+ clif_tradecancelled(sd); // added "Deal has been cancelled" message by Valaris
+ builtin_close(st); //** close
}
// 数値
if (st->end > st->start + 2)
{ // 引数1個
- set_reg (sd, num, name, sd->npc_amount);
+ set_reg(sd, num, name, sd->npc_amount);
}
else
{
// ragemu互換のため
- pc_setreg (sd, add_str ("l14"), sd->npc_amount);
+ pc_setreg(sd, add_str("l14"), sd->npc_amount);
}
}
}
@@ -2146,9 +2146,9 @@ void builtin_input (ScriptState *st)
{
st->state = RERUNLINE;
if (postfix == '$')
- clif_scriptinputstr (sd, st->oid);
+ clif_scriptinputstr(sd, st->oid);
else
- clif_scriptinput (sd, st->oid);
+ clif_scriptinput(sd, st->oid);
sd->state.menu_or_input = 1;
}
}
@@ -2159,22 +2159,22 @@ void builtin_input (ScriptState *st)
*/
void builtin_if (ScriptState *st)
{
- int sel, i;
+ int sel, i;
- sel = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ sel = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (!sel)
return;
// 関数名をコピー
- push_copy (st->stack, st->start + 3);
+ push_copy(st->stack, st->start + 3);
// 間に引数マーカを入れて
- push_val (st->stack, ScriptCode::ARG, 0);
+ push_val(st->stack, ScriptCode::ARG, 0);
// 残りの引数をコピー
for (i = st->start + 4; i < st->end; i++)
{
- push_copy (st->stack, i);
+ push_copy(st->stack, i);
}
- run_func (st);
+ run_func(st);
}
@@ -2182,34 +2182,34 @@ void builtin_if (ScriptState *st)
* 変数設定
*------------------------------------------
*/
-void builtin_set (ScriptState *st)
+void builtin_set(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
+ char postfix = name[strlen(name) - 1];
if (st->stack->stack_data[st->start + 2].type != ScriptCode::NAME)
{
- printf ("script: builtin_set: not name\n");
+ printf("script: builtin_set: not name\n");
return;
}
if (prefix != '$')
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (postfix == '$')
{
// 文字列
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- set_reg (sd, num, name, str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ set_reg(sd, num, name, str);
}
else
{
// 数値
- int val = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- set_reg (sd, num, name, val);
+ int val = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ set_reg(sd, num, name, val);
}
}
@@ -2218,22 +2218,22 @@ void builtin_set (ScriptState *st)
* 配列変数設定
*------------------------------------------
*/
-void builtin_setarray (ScriptState *st)
+void builtin_setarray(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
- int i, j;
+ char postfix = name[strlen(name) - 1];
+ int i, j;
if (prefix != '$' && prefix != '@')
{
- printf ("builtin_setarray: illegal scope !\n");
+ printf("builtin_setarray: illegal scope !\n");
return;
}
if (prefix != '$')
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
for (j = 0, i = st->start + 3; i < st->end && j < 128; i++, j++)
{
@@ -2248,24 +2248,24 @@ void builtin_setarray (ScriptState *st)
* 配列変数クリア
*------------------------------------------
*/
-void builtin_cleararray (ScriptState *st)
+void builtin_cleararray(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
- int sz = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- int i;
+ char postfix = name[strlen(name) - 1];
+ int sz = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ int i;
void *v;
if (prefix != '$' && prefix != '@')
{
- printf ("builtin_cleararray: illegal scope !\n");
+ printf("builtin_cleararray: illegal scope !\n");
return;
}
if (prefix != '$')
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (postfix == '$')
for (i = 0; i < sz; i++)
@@ -2280,105 +2280,105 @@ void builtin_cleararray (ScriptState *st)
* 配列変数コピー
*------------------------------------------
*/
-void builtin_copyarray (ScriptState *st)
+void builtin_copyarray(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
- int num2 = st->stack->stack_data[st->start + 3].u.num;
+ char postfix = name[strlen(name) - 1];
+ int num2 = st->stack->stack_data[st->start + 3].u.num;
char *name2 = str_buf + str_data[num2 & 0x00ffffff].str;
char prefix2 = *name2;
- char postfix2 = name2[strlen (name2) - 1];
- int sz = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- int i;
+ char postfix2 = name2[strlen(name2) - 1];
+ int sz = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ int i;
if (prefix != '$' && prefix != '@' && prefix2 != '$' && prefix2 != '@')
{
- printf ("builtin_copyarray: illegal scope !\n");
+ printf("builtin_copyarray: illegal scope !\n");
return;
}
if ((postfix == '$' || postfix2 == '$') && postfix != postfix2)
{
- printf ("builtin_copyarray: type mismatch !\n");
+ printf("builtin_copyarray: type mismatch !\n");
return;
}
if (prefix != '$' || prefix2 != '$')
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
for (i = 0; i < sz; i++)
- set_reg (sd, num + (i << 24), name, get_val2 (st, num2 + (i << 24)));
+ set_reg(sd, num + (i << 24), name, get_val2(st, num2 + (i << 24)));
}
/*==========================================
* 配列変数のサイズ所得
*------------------------------------------
*/
-static int getarraysize (ScriptState *st, int num, int postfix)
+static int getarraysize(ScriptState *st, int num, int postfix)
{
- int i = (num >> 24), c = i;
+ int i = (num >> 24), c = i;
for (; i < 128; i++)
{
- struct script_data vd = get_val2 (st, num + (i << 24));
+ struct script_data vd = get_val2(st, num + (i << 24));
if (postfix == '$' ? bool(*vd.u.str) : bool(vd.u.num))
c = i;
}
return c + 1;
}
-void builtin_getarraysize (ScriptState *st)
+void builtin_getarraysize(ScriptState *st)
{
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
+ char postfix = name[strlen(name) - 1];
if (prefix != '$' && prefix != '@')
{
- printf ("builtin_copyarray: illegal scope !\n");
+ printf("builtin_copyarray: illegal scope !\n");
return;
}
- push_val (st->stack, ScriptCode::INT, getarraysize (st, num, postfix));
+ push_val(st->stack, ScriptCode::INT, getarraysize(st, num, postfix));
}
/*==========================================
* 配列変数から要素削除
*------------------------------------------
*/
-void builtin_deletearray (ScriptState *st)
+void builtin_deletearray(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int num = st->stack->stack_data[st->start + 2].u.num;
+ int num = st->stack->stack_data[st->start + 2].u.num;
char *name = str_buf + str_data[num & 0x00ffffff].str;
char prefix = *name;
- char postfix = name[strlen (name) - 1];
- int count = 1;
- int i, sz = getarraysize (st, num, postfix) - (num >> 24) - count + 1;
+ char postfix = name[strlen(name) - 1];
+ int count = 1;
+ int i, sz = getarraysize(st, num, postfix) - (num >> 24) - count + 1;
if ((st->end > st->start + 3))
- count = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ count = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (prefix != '$' && prefix != '@')
{
- printf ("builtin_deletearray: illegal scope !\n");
+ printf("builtin_deletearray: illegal scope !\n");
return;
}
if (prefix != '$')
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
for (i = 0; i < sz; i++)
{
- set_reg (sd, num + (i << 24), name,
- get_val2 (st, num + ((i + count) << 24)));
+ set_reg(sd, num + (i << 24), name,
+ get_val2(st, num + ((i + count) << 24)));
}
for (; i < (128 - (num >> 24)); i++)
{
if (postfix != '$')
- set_reg (sd, num + (i << 24), name, 0);
+ set_reg(sd, num + (i << 24), name, 0);
if (postfix == '$')
- set_reg (sd, num + (i << 24), name, "");
+ set_reg(sd, num + (i << 24), name, "");
}
}
@@ -2386,29 +2386,27 @@ void builtin_deletearray (ScriptState *st)
* 指定要素を表す値(キー)を所得する
*------------------------------------------
*/
-void builtin_getelementofarray (ScriptState *st)
+void builtin_getelementofarray(ScriptState *st)
{
if (st->stack->stack_data[st->start + 2].type == ScriptCode::NAME)
{
- int i = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ int i = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (i > 127 || i < 0)
{
- printf
- ("script: getelementofarray (operator[]): param2 illegal number %d\n",
+ printf("script: getelementofarray (operator[]): param2 illegal number %d\n",
i);
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
else
{
- push_val (st->stack, ScriptCode::NAME,
+ push_val(st->stack, ScriptCode::NAME,
(i << 24) | st->stack->stack_data[st->start + 2].u.num);
}
}
else
{
- printf
- ("script: getelementofarray (operator[]): param1 not name !\n");
- push_val (st->stack, ScriptCode::INT, 0);
+ printf("script: getelementofarray (operator[]): param1 not name !\n");
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -2416,14 +2414,14 @@ void builtin_getelementofarray (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_setlook (ScriptState *st)
+void builtin_setlook(ScriptState *st)
{
- int type, val;
+ int type, val;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- val = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ val = conv_num(st, &(st->stack->stack_data[st->start + 3]));
- pc_changelook (script_rid2sd (st), type, val);
+ pc_changelook(script_rid2sd(st), type, val);
}
@@ -2431,14 +2429,14 @@ void builtin_setlook (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_cutin (ScriptState *st)
+void builtin_cutin(ScriptState *st)
{
- int type;
+ int type;
- conv_str (st, &(st->stack->stack_data[st->start + 2]));
- type = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 3]));
- clif_cutin (script_rid2sd (st),
+ clif_cutin(script_rid2sd(st),
st->stack->stack_data[st->start + 2].u.str, type);
}
@@ -2447,13 +2445,13 @@ void builtin_cutin (ScriptState *st)
* カードのイラストを表示する
*------------------------------------------
*/
-void builtin_cutincard (ScriptState *st)
+void builtin_cutincard(ScriptState *st)
{
- int itemid;
+ int itemid;
- itemid = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ itemid = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- clif_cutin (script_rid2sd (st), itemdb_search (itemid)->cardillustname,
+ clif_cutin(script_rid2sd(st), itemdb_search(itemid)->cardillustname,
4);
}
@@ -2462,17 +2460,17 @@ void builtin_cutincard (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_viewpoint (ScriptState *st)
+void builtin_viewpoint(ScriptState *st)
{
- int type, x, y, id, color;
+ int type, x, y, id, color;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- id = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- color = conv_num (st, &(st->stack->stack_data[st->start + 6]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ id = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ color = conv_num(st, &(st->stack->stack_data[st->start + 6]));
- clif_viewpoint (script_rid2sd (st), st->oid, type, x, y, id, color);
+ clif_viewpoint(script_rid2sd(st), st->oid, type, x, y, id, color);
}
@@ -2480,26 +2478,26 @@ void builtin_viewpoint (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_countitem (ScriptState *st)
+void builtin_countitem(ScriptState *st)
{
- int nameid = 0, count = 0, i;
+ int nameid = 0, count = 0, i;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
+ const char *name = conv_str(st, data);
struct item_data *item_data;
- if ((item_data = itemdb_searchname (name)) != NULL)
+ if ((item_data = itemdb_searchname(name)) != NULL)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
+ nameid = conv_num(st, data);
if (nameid >= 500) //if no such ID then skip this iteration
for (i = 0; i < MAX_INVENTORY; i++)
@@ -2510,9 +2508,9 @@ void builtin_countitem (ScriptState *st)
else
{
if (battle_config.error_log)
- printf ("wrong item ID : countitem(%i)\n", nameid);
+ printf("wrong item ID : countitem (%i)\n", nameid);
}
- push_val (st->stack, ScriptCode::INT, count);
+ push_val(st->stack, ScriptCode::INT, count);
}
@@ -2520,40 +2518,40 @@ void builtin_countitem (ScriptState *st)
* 重量チェック
*------------------------------------------
*/
-void builtin_checkweight (ScriptState *st)
+void builtin_checkweight(ScriptState *st)
{
- int nameid = 0, amount;
+ int nameid = 0, amount;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
if (item_data)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
+ nameid = conv_num(st, data);
- amount = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (amount <= 0 || nameid < 500)
{ //if get wrong item ID or amount<=0, don't count weight of non existing items
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
- sd = script_rid2sd (st);
- if (itemdb_weight (nameid) * amount + sd->weight > sd->max_weight)
+ sd = script_rid2sd(st);
+ if (itemdb_weight(nameid) * amount + sd->weight > sd->max_weight)
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
else
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
}
@@ -2562,57 +2560,56 @@ void builtin_checkweight (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_getitem (ScriptState *st)
+void builtin_getitem(ScriptState *st)
{
- int nameid, amount, flag = 0;
+ int nameid, amount, flag = 0;
struct item item_tmp;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
nameid = 727; //Default to iten
if (item_data != NULL)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
+ nameid = conv_num(st, data);
if ((amount =
- conv_num (st, &(st->stack->stack_data[st->start + 3]))) <= 0)
+ conv_num(st, &(st->stack->stack_data[st->start + 3]))) <= 0)
{
return; //return if amount <=0, skip the useles iteration
}
//Violet Box, Blue Box, etc - random item pick
if (nameid < 0)
{ // ランダム
- nameid = itemdb_searchrandomid (-nameid);
+ nameid = itemdb_searchrandomid(-nameid);
flag = 1;
}
if (nameid > 0)
{
- memset (&item_tmp, 0, sizeof (item_tmp));
+ memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = nameid;
if (!flag)
item_tmp.identify = 1;
else
- item_tmp.identify = !itemdb_isequip3 (nameid);
+ item_tmp.identify = !itemdb_isequip3(nameid);
if (st->end > st->start + 5) //アイテムを指定したIDに渡す
- sd = map_id2sd (conv_num
- (st, &(st->stack->stack_data[st->start + 5])));
+ sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 5])));
if (sd == NULL) //アイテムを渡す相手がいなかったらお帰り
return;
- if ((flag = pc_additem (sd, &item_tmp, amount)))
+ if ((flag = pc_additem(sd, &item_tmp, amount)))
{
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y,
NULL, NULL, NULL, 0);
}
}
@@ -2623,53 +2620,52 @@ void builtin_getitem (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_getitem2 (ScriptState *st)
+void builtin_getitem2(ScriptState *st)
{
- int nameid, amount, flag = 0;
- int iden, ref, attr, c1, c2, c3, c4;
+ int nameid, amount, flag = 0;
+ int iden, ref, attr, c1, c2, c3, c4;
struct item item_tmp;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
nameid = 512; //Apple item ID
if (item_data)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
-
- amount = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- iden = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- ref = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- attr = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- c1 = conv_num (st, &(st->stack->stack_data[st->start + 7]));
- c2 = conv_num (st, &(st->stack->stack_data[st->start + 8]));
- c3 = conv_num (st, &(st->stack->stack_data[st->start + 9]));
- c4 = conv_num (st, &(st->stack->stack_data[st->start + 10]));
+ nameid = conv_num(st, data);
+
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ iden = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ ref = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ attr = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ c1 = conv_num(st, &(st->stack->stack_data[st->start + 7]));
+ c2 = conv_num(st, &(st->stack->stack_data[st->start + 8]));
+ c3 = conv_num(st, &(st->stack->stack_data[st->start + 9]));
+ c4 = conv_num(st, &(st->stack->stack_data[st->start + 10]));
if (st->end > st->start + 11) //アイテムを指定したIDに渡す
- sd = map_id2sd (conv_num
- (st, &(st->stack->stack_data[st->start + 11])));
+ sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 11])));
if (sd == NULL) //アイテムを渡す相手がいなかったらお帰り
return;
if (nameid < 0)
{ // ランダム
- nameid = itemdb_searchrandomid (-nameid);
+ nameid = itemdb_searchrandomid(-nameid);
flag = 1;
}
if (nameid > 0)
{
- memset (&item_tmp, 0, sizeof (item_tmp));
- struct item_data *item_data = itemdb_search (nameid);
+ memset(&item_tmp, 0, sizeof(item_tmp));
+ struct item_data *item_data = itemdb_search(nameid);
if (item_data->type == 4 || item_data->type == 5)
{
if (ref > 10)
@@ -2697,10 +2693,10 @@ void builtin_getitem2 (ScriptState *st)
item_tmp.card[1] = c2;
item_tmp.card[2] = c3;
item_tmp.card[3] = c4;
- if ((flag = pc_additem (sd, &item_tmp, amount)))
+ if ((flag = pc_additem(sd, &item_tmp, amount)))
{
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, amount, sd->bl.m, sd->bl.x, sd->bl.y,
NULL, NULL, NULL, 0);
}
}
@@ -2711,56 +2707,56 @@ void builtin_getitem2 (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_makeitem (ScriptState *st)
+void builtin_makeitem(ScriptState *st)
{
- int nameid, amount, flag = 0;
- int x, y, m;
+ int nameid, amount, flag = 0;
+ int x, y, m;
struct item item_tmp;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
nameid = 512; //Apple Item ID
if (item_data)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
+ nameid = conv_num(st, data);
- amount = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 4]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 6]));
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 4]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 6]));
- if (sd && strcmp (mapname, "this") == 0)
+ if (sd && strcmp(mapname, "this") == 0)
m = sd->bl.m;
else
- m = map_mapname2mapid (mapname);
+ m = map_mapname2mapid(mapname);
if (nameid < 0)
{ // ランダム
- nameid = itemdb_searchrandomid (-nameid);
+ nameid = itemdb_searchrandomid(-nameid);
flag = 1;
}
if (nameid > 0)
{
- memset (&item_tmp, 0, sizeof (item_tmp));
+ memset(&item_tmp, 0, sizeof(item_tmp));
item_tmp.nameid = nameid;
if (!flag)
item_tmp.identify = 1;
else
- item_tmp.identify = !itemdb_isequip3 (nameid);
+ item_tmp.identify = !itemdb_isequip3(nameid);
// clif_additem(sd,0,0,flag);
- map_addflooritem (&item_tmp, amount, m, x, y, NULL, NULL, NULL, 0);
+ map_addflooritem(&item_tmp, amount, m, x, y, NULL, NULL, NULL, 0);
}
}
@@ -2769,35 +2765,35 @@ void builtin_makeitem (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_delitem (ScriptState *st)
+void builtin_delitem(ScriptState *st)
{
- int nameid = 0, amount, i;
+ int nameid = 0, amount, i;
struct map_session_data *sd;
struct script_data *data;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
//nameid=512;
if (item_data)
nameid = item_data->nameid;
}
else
- nameid = conv_num (st, data);
+ nameid = conv_num(st, data);
- amount = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (nameid < 500 || amount <= 0)
{ //by Lupus. Don't run FOR if u got wrong item ID or amount<=0
//printf("wrong item ID or amount<=0 : delitem %i,\n",nameid,amount);
return;
}
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
for (i = 0; i < MAX_INVENTORY; i++)
{
@@ -2813,7 +2809,7 @@ void builtin_delitem (ScriptState *st)
{
if (sd->status.inventory[i].amount >= amount)
{
- pc_delitem (sd, i, amount, 0);
+ pc_delitem(sd, i, amount, 0);
break;
}
else
@@ -2821,7 +2817,7 @@ void builtin_delitem (ScriptState *st)
amount -= sd->status.inventory[i].amount;
if (amount == 0)
amount = sd->status.inventory[i].amount;
- pc_delitem (sd, i, amount, 0);
+ pc_delitem(sd, i, amount, 0);
break;
}
}
@@ -2833,25 +2829,24 @@ void builtin_delitem (ScriptState *st)
*キャラ関係のパラメータ取得
*------------------------------------------
*/
-void builtin_readparam (ScriptState *st)
+void builtin_readparam(ScriptState *st)
{
- int type;
+ int type;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
- sd = map_nick2sd (conv_str
- (st, &(st->stack->stack_data[st->start + 3])));
+ sd = map_nick2sd(conv_str(st, &(st->stack->stack_data[st->start + 3])));
else
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd == NULL)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
- push_val (st->stack, ScriptCode::INT, pc_readparam (sd, type));
+ push_val(st->stack, ScriptCode::INT, pc_readparam(sd, type));
}
@@ -2859,30 +2854,29 @@ void builtin_readparam (ScriptState *st)
*キャラ関係のID取得
*------------------------------------------
*/
-void builtin_getcharid (ScriptState *st)
+void builtin_getcharid(ScriptState *st)
{
- int num;
+ int num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
- sd = map_nick2sd (conv_str
- (st, &(st->stack->stack_data[st->start + 3])));
+ sd = map_nick2sd(conv_str(st, &(st->stack->stack_data[st->start + 3])));
else
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd == NULL)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
if (num == 0)
- push_val (st->stack, ScriptCode::INT, sd->status.char_id);
+ push_val(st->stack, ScriptCode::INT, sd->status.char_id);
if (num == 1)
- push_val (st->stack, ScriptCode::INT, sd->status.party_id);
+ push_val(st->stack, ScriptCode::INT, sd->status.party_id);
if (num == 2)
- push_val (st->stack, ScriptCode::INT, 0/*guild_id*/);
+ push_val(st->stack, ScriptCode::INT, 0/*guild_id*/);
if (num == 3)
- push_val (st->stack, ScriptCode::INT, sd->status.account_id);
+ push_val(st->stack, ScriptCode::INT, sd->status.account_id);
}
/*==========================================
@@ -2890,35 +2884,35 @@ void builtin_getcharid (ScriptState *st)
*------------------------------------------
*/
static
-char *builtin_getpartyname_sub (int party_id)
+char *builtin_getpartyname_sub(int party_id)
{
struct party *p;
p = NULL;
- p = party_search (party_id);
+ p = party_search(party_id);
if (p != NULL)
{
char *buf;
- buf = (char *) calloc (24, 1);
- strcpy (buf, p->name);
+ buf = (char *) calloc(24, 1);
+ strcpy(buf, p->name);
return buf;
}
return 0;
}
-void builtin_getpartyname (ScriptState *st)
+void builtin_getpartyname(ScriptState *st)
{
char *name;
- int party_id;
+ int party_id;
- party_id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- name = builtin_getpartyname_sub (party_id);
+ party_id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ name = builtin_getpartyname_sub(party_id);
if (name != 0)
- push_str (st->stack, ScriptCode::STR, name);
+ push_str(st->stack, ScriptCode::STR, name);
else
- push_str (st->stack, ScriptCode::CONSTSTR, "null");
+ push_str(st->stack, ScriptCode::CONSTSTR, "null");
}
@@ -2926,13 +2920,13 @@ void builtin_getpartyname (ScriptState *st)
*指定IDのPT人数とメンバーID取得
*------------------------------------------
*/
-void builtin_getpartymember (ScriptState *st)
+void builtin_getpartymember(ScriptState *st)
{
struct party *p;
- int i, j = 0;
+ int i, j = 0;
p = NULL;
- p = party_search (conv_num (st, &(st->stack->stack_data[st->start + 2])));
+ p = party_search(conv_num(st, &(st->stack->stack_data[st->start + 2])));
if (p != NULL)
{
@@ -2941,13 +2935,13 @@ void builtin_getpartymember (ScriptState *st)
if (p->member[i].account_id)
{
// printf("name:%s %d\n",p->member[i].name,i);
- mapreg_setregstr (add_str ("$@partymembername$") + (i << 24),
+ mapreg_setregstr(add_str("$@partymembername$") + (i << 24),
p->member[i].name);
j++;
}
}
}
- mapreg_setreg (add_str ("$@partymembercount"), j);
+ mapreg_setreg(add_str("$@partymembercount"), j);
}
@@ -2956,33 +2950,33 @@ void builtin_getpartymember (ScriptState *st)
* キャラクタの名前
*------------------------------------------
*/
-void builtin_strcharinfo (ScriptState *st)
+void builtin_strcharinfo(ScriptState *st)
{
struct map_session_data *sd;
- int num;
+ int num;
- sd = script_rid2sd (st);
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (num == 0)
{
char *buf;
- buf = (char *) calloc (24, 1);
- strncpy (buf, sd->status.name, 23);
- push_str (st->stack, ScriptCode::STR, buf);
+ buf = (char *) calloc(24, 1);
+ strncpy(buf, sd->status.name, 23);
+ push_str(st->stack, ScriptCode::STR, buf);
}
if (num == 1)
{
char *buf;
- buf = builtin_getpartyname_sub (sd->status.party_id);
+ buf = builtin_getpartyname_sub(sd->status.party_id);
if (buf != 0)
- push_str (st->stack, ScriptCode::STR, buf);
+ push_str(st->stack, ScriptCode::STR, buf);
else
- push_str (st->stack, ScriptCode::CONSTSTR, "");
+ push_str(st->stack, ScriptCode::CONSTSTR, "");
}
if (num == 2)
{
// was: guild name
- push_str (st->stack, ScriptCode::CONSTSTR, "");
+ push_str(st->stack, ScriptCode::CONSTSTR, "");
}
}
@@ -2996,31 +2990,31 @@ unsigned int equip[10] =
* GetEquipID(Pos); Pos: 1-10
*------------------------------------------
*/
-void builtin_getequipid (ScriptState *st)
+void builtin_getequipid(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
struct item_data *item;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd == NULL)
{
- printf ("getequipid: sd == NULL\n");
+ printf("getequipid: sd == NULL\n");
return;
}
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
{
item = sd->inventory_data[i];
if (item)
- push_val (st->stack, ScriptCode::INT, item->nameid);
+ push_val(st->stack, ScriptCode::INT, item->nameid);
else
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
else
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
}
}
@@ -3028,30 +3022,30 @@ void builtin_getequipid (ScriptState *st)
* 装備名文字列（精錬メニュー用）
*------------------------------------------
*/
-void builtin_getequipname (ScriptState *st)
+void builtin_getequipname(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
struct item_data *item;
char *buf;
- buf = (char *) calloc (64, 1);
- sd = script_rid2sd (st);
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- i = pc_checkequip (sd, equip[num - 1]);
+ buf = (char *) calloc(64, 1);
+ sd = script_rid2sd(st);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
{
item = sd->inventory_data[i];
if (item)
- sprintf (buf, "%s-[%s]", pos[num - 1], item->jname);
+ sprintf(buf, "%s-[%s]", pos[num - 1], item->jname);
else
- sprintf (buf, "%s-[%s]", pos[num - 1], pos[10]);
+ sprintf(buf, "%s-[%s]", pos[num - 1], pos[10]);
}
else
{
- sprintf (buf, "%s-[%s]", pos[num - 1], pos[10]);
+ sprintf(buf, "%s-[%s]", pos[num - 1], pos[10]);
}
- push_str (st->stack, ScriptCode::STR, buf);
+ push_str(st->stack, ScriptCode::STR, buf);
}
@@ -3059,14 +3053,14 @@ void builtin_getequipname (ScriptState *st)
* getbrokenid [Valaris]
*------------------------------------------
*/
-void builtin_getbrokenid (ScriptState *st)
+void builtin_getbrokenid(ScriptState *st)
{
- int i, num, id = 0, brokencounter = 0;
+ int i, num, id = 0, brokencounter = 0;
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
for (i = 0; i < MAX_INVENTORY; i++)
{
if (sd->status.inventory[i].broken == 1)
@@ -3080,7 +3074,7 @@ void builtin_getbrokenid (ScriptState *st)
}
}
- push_val (st->stack, ScriptCode::INT, id);
+ push_val(st->stack, ScriptCode::INT, id);
}
@@ -3088,15 +3082,15 @@ void builtin_getbrokenid (ScriptState *st)
* repair [Valaris]
*------------------------------------------
*/
-void builtin_repair (ScriptState *st)
+void builtin_repair(ScriptState *st)
{
- int i, num;
- int repaircounter = 0;
+ int i, num;
+ int repaircounter = 0;
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
for (i = 0; i < MAX_INVENTORY; i++)
{
if (sd->status.inventory[i].broken == 1)
@@ -3105,10 +3099,10 @@ void builtin_repair (ScriptState *st)
if (num == repaircounter)
{
sd->status.inventory[i].broken = 0;
- clif_equiplist (sd);
- clif_produceeffect (sd, 0, sd->status.inventory[i].nameid);
- clif_misceffect (&sd->bl, 3);
- clif_displaymessage (sd->fd, "Item has been repaired.");
+ clif_equiplist(sd);
+ clif_produceeffect(sd, 0, sd->status.inventory[i].nameid);
+ clif_misceffect(&sd->bl, 3);
+ clif_displaymessage(sd->fd, "Item has been repaired.");
break;
}
}
@@ -3120,21 +3114,21 @@ void builtin_repair (ScriptState *st)
* 装備チェック
*------------------------------------------
*/
-void builtin_getequipisequiped (ScriptState *st)
+void builtin_getequipisequiped(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3143,14 +3137,14 @@ void builtin_getequipisequiped (ScriptState *st)
* 装備品精錬可能チェック
*------------------------------------------
*/
-void builtin_getequipisenableref (ScriptState *st)
+void builtin_getequipisenableref(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0 && num < 7 && sd->inventory_data[i]
&& (num != 1 || sd->inventory_data[i]->def > 1
|| (sd->inventory_data[i]->def == 1
@@ -3158,11 +3152,11 @@ void builtin_getequipisenableref (ScriptState *st)
|| (sd->inventory_data[i]->def <= 0
&& sd->inventory_data[i]->equip_script != NULL)))
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3171,18 +3165,18 @@ void builtin_getequipisenableref (ScriptState *st)
* 装備品鑑定チェック
*------------------------------------------
*/
-void builtin_getequipisidentify (ScriptState *st)
+void builtin_getequipisidentify(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
- push_val (st->stack, ScriptCode::INT, sd->status.inventory[i].identify);
+ push_val(st->stack, ScriptCode::INT, sd->status.inventory[i].identify);
else
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
@@ -3190,18 +3184,18 @@ void builtin_getequipisidentify (ScriptState *st)
* 装備品精錬度
*------------------------------------------
*/
-void builtin_getequiprefinerycnt (ScriptState *st)
+void builtin_getequiprefinerycnt(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
- push_val (st->stack, ScriptCode::INT, sd->status.inventory[i].refine);
+ push_val(st->stack, ScriptCode::INT, sd->status.inventory[i].refine);
else
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
@@ -3209,18 +3203,18 @@ void builtin_getequiprefinerycnt (ScriptState *st)
* 装備品武器LV
*------------------------------------------
*/
-void builtin_getequipweaponlv (ScriptState *st)
+void builtin_getequipweaponlv(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0 && sd->inventory_data[i])
- push_val (st->stack, ScriptCode::INT, sd->inventory_data[i]->wlv);
+ push_val(st->stack, ScriptCode::INT, sd->inventory_data[i]->wlv);
else
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
@@ -3228,19 +3222,19 @@ void builtin_getequipweaponlv (ScriptState *st)
* 装備品精錬成功率
*------------------------------------------
*/
-void builtin_getequippercentrefinery (ScriptState *st)
+void builtin_getequippercentrefinery(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
- push_val (st->stack, ScriptCode::INT,
- pc_percentrefinery (sd, &sd->status.inventory[i]));
+ push_val(st->stack, ScriptCode::INT,
+ pc_percentrefinery(sd, &sd->status.inventory[i]));
else
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
@@ -3248,25 +3242,25 @@ void builtin_getequippercentrefinery (ScriptState *st)
* 精錬成功
*------------------------------------------
*/
-void builtin_successrefitem (ScriptState *st)
+void builtin_successrefitem(ScriptState *st)
{
- int i, num, ep;
+ int i, num, ep;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
{
ep = sd->status.inventory[i].equip;
sd->status.inventory[i].refine++;
- pc_unequipitem (sd, i, 0);
- clif_refine (sd->fd, sd, 0, i, sd->status.inventory[i].refine);
- clif_delitem (sd, i, 1);
- clif_additem (sd, i, 1, 0);
- pc_equipitem (sd, i, ep);
- clif_misceffect (&sd->bl, 3);
+ pc_unequipitem(sd, i, 0);
+ clif_refine(sd->fd, sd, 0, i, sd->status.inventory[i].refine);
+ clif_delitem(sd, i, 1);
+ clif_additem(sd, i, 1, 0);
+ pc_equipitem(sd, i, ep);
+ clif_misceffect(&sd->bl, 3);
}
}
@@ -3275,23 +3269,23 @@ void builtin_successrefitem (ScriptState *st)
* 精錬失敗
*------------------------------------------
*/
-void builtin_failedrefitem (ScriptState *st)
+void builtin_failedrefitem(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0)
{
sd->status.inventory[i].refine = 0;
- pc_unequipitem (sd, i, 0);
+ pc_unequipitem(sd, i, 0);
// 精錬失敗エフェクトのパケット
- clif_refine (sd->fd, sd, 1, i, sd->status.inventory[i].refine);
- pc_delitem (sd, i, 1, 0);
+ clif_refine(sd->fd, sd, 1, i, sd->status.inventory[i].refine);
+ pc_delitem(sd, i, 1, 0);
// 他の人にも失敗を通知
- clif_misceffect (&sd->bl, 2);
+ clif_misceffect(&sd->bl, 2);
}
}
@@ -3300,14 +3294,14 @@ void builtin_failedrefitem (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_statusup (ScriptState *st)
+void builtin_statusup(ScriptState *st)
{
- int type;
+ int type;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- pc_statusup (sd, type);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ pc_statusup(sd, type);
}
@@ -3315,15 +3309,15 @@ void builtin_statusup (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_statusup2 (ScriptState *st)
+void builtin_statusup2(ScriptState *st)
{
- int type, val;
+ int type, val;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- val = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- sd = script_rid2sd (st);
- pc_statusup2 (sd, type, val);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ val = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ sd = script_rid2sd(st);
+ pc_statusup2(sd, type, val);
}
@@ -3331,15 +3325,15 @@ void builtin_statusup2 (ScriptState *st)
* 装備品による能力値ボーナス
*------------------------------------------
*/
-void builtin_bonus (ScriptState *st)
+void builtin_bonus(ScriptState *st)
{
- int type, val;
+ int type, val;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- val = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- sd = script_rid2sd (st);
- pc_bonus (sd, type, val);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ val = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ sd = script_rid2sd(st);
+ pc_bonus(sd, type, val);
}
@@ -3347,16 +3341,16 @@ void builtin_bonus (ScriptState *st)
* 装備品による能力値ボーナス
*------------------------------------------
*/
-void builtin_bonus2 (ScriptState *st)
+void builtin_bonus2(ScriptState *st)
{
- int type, type2, val;
+ int type, type2, val;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- type2 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- val = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- sd = script_rid2sd (st);
- pc_bonus2 (sd, type, type2, val);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ type2 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ val = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ sd = script_rid2sd(st);
+ pc_bonus2(sd, type, type2, val);
}
@@ -3364,17 +3358,17 @@ void builtin_bonus2 (ScriptState *st)
* 装備品による能力値ボーナス
*------------------------------------------
*/
-void builtin_bonus3 (ScriptState *st)
+void builtin_bonus3(ScriptState *st)
{
- int type, type2, type3, val;
+ int type, type2, type3, val;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- type2 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- type3 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- val = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- sd = script_rid2sd (st);
- pc_bonus3 (sd, type, type2, type3, val);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ type2 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ type3 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ val = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ sd = script_rid2sd(st);
+ pc_bonus3(sd, type, type2, type3, val);
}
@@ -3382,18 +3376,18 @@ void builtin_bonus3 (ScriptState *st)
* スキル所得
*------------------------------------------
*/
-void builtin_skill (ScriptState *st)
+void builtin_skill(ScriptState *st)
{
- int id, level, flag = 1;
+ int id, level, flag = 1;
struct map_session_data *sd;
- id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- level = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ level = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (st->end > st->start + 4)
- flag = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- sd = script_rid2sd (st);
- pc_skill (sd, id, level, flag);
- clif_skillinfoblock (sd);
+ flag = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ sd = script_rid2sd(st);
+ pc_skill(sd, id, level, flag);
+ clif_skillinfoblock(sd);
}
@@ -3401,53 +3395,53 @@ void builtin_skill (ScriptState *st)
* [Fate] Sets the skill level permanently
*------------------------------------------
*/
-void builtin_setskill (ScriptState *st)
+void builtin_setskill(ScriptState *st)
{
- int id, level;
+ int id, level;
struct map_session_data *sd;
- id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- level = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- sd = script_rid2sd (st);
+ id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ level = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ sd = script_rid2sd(st);
sd->status.skill[id].id = level ? id : 0;
sd->status.skill[id].lv = level;
- clif_skillinfoblock (sd);
+ clif_skillinfoblock(sd);
}
/*==========================================
* スキルレベル所得
*------------------------------------------
*/
-void builtin_getskilllv (ScriptState *st)
+void builtin_getskilllv(ScriptState *st)
{
- int id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- push_val (st->stack, ScriptCode::INT, pc_checkskill (script_rid2sd (st), id));
+ int id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ push_val(st->stack, ScriptCode::INT, pc_checkskill(script_rid2sd(st), id));
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_basicskillcheck (ScriptState *st)
+void builtin_basicskillcheck(ScriptState *st)
{
- push_val (st->stack, ScriptCode::INT, battle_config.basic_skill_check);
+ push_val(st->stack, ScriptCode::INT, battle_config.basic_skill_check);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_getgmlevel (ScriptState *st)
+void builtin_getgmlevel(ScriptState *st)
{
- push_val (st->stack, ScriptCode::INT, pc_isGM (script_rid2sd (st)));
+ push_val(st->stack, ScriptCode::INT, pc_isGM(script_rid2sd(st)));
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_end (ScriptState *st)
+void builtin_end(ScriptState *st)
{
st->state = END;
}
@@ -3457,13 +3451,13 @@ void builtin_end (ScriptState *st)
*------------------------------------------
*/
-void builtin_getopt2 (ScriptState *st)
+void builtin_getopt2(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- push_val (st->stack, ScriptCode::INT, sd->opt2);
+ push_val(st->stack, ScriptCode::INT, sd->opt2);
}
@@ -3472,18 +3466,18 @@ void builtin_getopt2 (ScriptState *st)
*------------------------------------------
*/
-void builtin_setopt2 (ScriptState *st)
+void builtin_setopt2(ScriptState *st)
{
- int new_opt2;
+ int new_opt2;
struct map_session_data *sd;
- new_opt2 = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
+ new_opt2 = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
if (new_opt2 == sd->opt2)
return;
sd->opt2 = new_opt2;
- clif_changeoption (&sd->bl);
- pc_calcstatus (sd, 0);
+ clif_changeoption(&sd->bl);
+ pc_calcstatus(sd, 0);
}
@@ -3491,21 +3485,21 @@ void builtin_setopt2 (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_checkoption (ScriptState *st)
+void builtin_checkoption(ScriptState *st)
{
- int type;
+ int type;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
if (sd->status.option & type)
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3514,14 +3508,14 @@ void builtin_checkoption (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_setoption (ScriptState *st)
+void builtin_setoption(ScriptState *st)
{
- int type;
+ int type;
struct map_session_data *sd;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- pc_setoption (sd, type);
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ pc_setoption(sd, type);
}
@@ -3530,19 +3524,19 @@ void builtin_setoption (ScriptState *st)
*------------------------------------------
*/
-void builtin_checkcart (ScriptState *st)
+void builtin_checkcart(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- if (pc_iscarton (sd))
+ if (pc_iscarton(sd))
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3550,12 +3544,12 @@ void builtin_checkcart (ScriptState *st)
* カートを付ける
*------------------------------------------
*/
-void builtin_setcart (ScriptState *st)
+void builtin_setcart(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- pc_setcart (sd, 1);
+ sd = script_rid2sd(st);
+ pc_setcart(sd, 1);
}
@@ -3564,19 +3558,19 @@ void builtin_setcart (ScriptState *st)
*------------------------------------------
*/
-void builtin_checkfalcon (ScriptState *st)
+void builtin_checkfalcon(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- if (pc_isfalcon (sd))
+ if (pc_isfalcon(sd))
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3585,12 +3579,12 @@ void builtin_checkfalcon (ScriptState *st)
* 鷹を付ける
*------------------------------------------
*/
-void builtin_setfalcon (ScriptState *st)
+void builtin_setfalcon(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- pc_setfalcon (sd);
+ sd = script_rid2sd(st);
+ pc_setfalcon(sd);
}
@@ -3599,19 +3593,19 @@ void builtin_setfalcon (ScriptState *st)
*------------------------------------------
*/
-void builtin_checkriding (ScriptState *st)
+void builtin_checkriding(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- if (pc_isriding (sd))
+ if (pc_isriding(sd))
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
else
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -3620,27 +3614,27 @@ void builtin_checkriding (ScriptState *st)
* ペコペコ乗り
*------------------------------------------
*/
-void builtin_setriding (ScriptState *st)
+void builtin_setriding(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- pc_setriding (sd);
+ sd = script_rid2sd(st);
+ pc_setriding(sd);
}
/*==========================================
- * セーブポイントの保存
+ * セーブポイントの保存
*------------------------------------------
*/
-void builtin_savepoint (ScriptState *st)
+void builtin_savepoint(ScriptState *st)
{
- int x, y;
+ int x, y;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- pc_setsavepoint (script_rid2sd (st), str, x, y);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ pc_setsavepoint(script_rid2sd(st), str, x, y);
}
/*==========================================
@@ -3653,33 +3647,33 @@ void builtin_savepoint (ScriptState *st)
* other value.
*------------------------------------------
*/
-void builtin_gettimetick (ScriptState *st) /* Asgard Version */
+void builtin_gettimetick(ScriptState *st) /* Asgard Version */
{
- int type;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ int type;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
switch (type)
{
- /* Number of seconds elapsed today (0-86399, 00:00:00-23:59:59). */
+ /* Number of seconds elapsed today(0-86399, 00:00:00-23:59:59). */
case 1:
{
time_t timer;
struct tm *t;
- time (&timer);
- t = gmtime (&timer);
- push_val (st->stack, ScriptCode::INT,
+ time(&timer);
+ t = gmtime(&timer);
+ push_val(st->stack, ScriptCode::INT,
((t->tm_hour) * 3600 + (t->tm_min) * 60 + t->tm_sec));
break;
}
/* Seconds since Unix epoch. */
case 2:
- push_val (st->stack, ScriptCode::INT, (int) time (NULL));
+ push_val(st->stack, ScriptCode::INT, (int) time(NULL));
break;
- /* System tick (unsigned int, and yes, it will wrap). */
+ /* System tick(unsigned int, and yes, it will wrap). */
case 0:
default:
- push_val (st->stack, ScriptCode::INT, gettick ());
+ push_val(st->stack, ScriptCode::INT, gettick());
break;
}
}
@@ -3691,42 +3685,42 @@ void builtin_gettimetick (ScriptState *st) /* Asgard Version */
* 7: Year
*------------------------------------------
*/
-void builtin_gettime (ScriptState *st) /* Asgard Version */
+void builtin_gettime(ScriptState *st) /* Asgard Version */
{
- int type;
+ int type;
time_t timer;
struct tm *t;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- time (&timer);
- t = gmtime (&timer);
+ time(&timer);
+ t = gmtime(&timer);
switch (type)
{
case 1: //Sec(0~59)
- push_val (st->stack, ScriptCode::INT, t->tm_sec);
+ push_val(st->stack, ScriptCode::INT, t->tm_sec);
break;
case 2: //Min(0~59)
- push_val (st->stack, ScriptCode::INT, t->tm_min);
+ push_val(st->stack, ScriptCode::INT, t->tm_min);
break;
case 3: //Hour(0~23)
- push_val (st->stack, ScriptCode::INT, t->tm_hour);
+ push_val(st->stack, ScriptCode::INT, t->tm_hour);
break;
case 4: //WeekDay(0~6)
- push_val (st->stack, ScriptCode::INT, t->tm_wday);
+ push_val(st->stack, ScriptCode::INT, t->tm_wday);
break;
case 5: //MonthDay(01~31)
- push_val (st->stack, ScriptCode::INT, t->tm_mday);
+ push_val(st->stack, ScriptCode::INT, t->tm_mday);
break;
case 6: //Month(01~12)
- push_val (st->stack, ScriptCode::INT, t->tm_mon + 1);
+ push_val(st->stack, ScriptCode::INT, t->tm_mon + 1);
break;
case 7: //Year(20xx)
- push_val (st->stack, ScriptCode::INT, t->tm_year + 1900);
+ push_val(st->stack, ScriptCode::INT, t->tm_year + 1900);
break;
default: //(format error)
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
break;
}
}
@@ -3735,52 +3729,52 @@ void builtin_gettime (ScriptState *st) /* Asgard Version */
* GetTimeStr("TimeFMT", Length);
*------------------------------------------
*/
-void builtin_gettimestr (ScriptState *st)
+void builtin_gettimestr(ScriptState *st)
{
char *tmpstr;
- int maxlen;
- time_t now = time (NULL);
+ int maxlen;
+ time_t now = time(NULL);
- const char *fmtstr = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- maxlen = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ const char *fmtstr = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ maxlen = conv_num(st, &(st->stack->stack_data[st->start + 3]));
- tmpstr = (char *) calloc (maxlen + 1, 1);
- strftime (tmpstr, maxlen, fmtstr, gmtime (&now));
+ tmpstr = (char *) calloc(maxlen + 1, 1);
+ strftime(tmpstr, maxlen, fmtstr, gmtime(&now));
tmpstr[maxlen] = '\0';
- push_str (st->stack, ScriptCode::STR, tmpstr);
+ push_str(st->stack, ScriptCode::STR, tmpstr);
}
/*==========================================
* カプラ倉庫を開く
*------------------------------------------
*/
-void builtin_openstorage (ScriptState *st)
+void builtin_openstorage(ScriptState *st)
{
// int sync = 0;
// if (st->end >= 3) sync = conv_num(st,& (st->stack->stack_data[st->start+2]));
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
// if (sync) {
st->state = STOP;
sd->npc_flags.storage = 1;
// } else st->state = END;
- storage_storageopen (sd);
+ storage_storageopen(sd);
}
/*==========================================
* アイテムによるスキル発動
*------------------------------------------
*/
-void builtin_itemskill (ScriptState *st)
+void builtin_itemskill(ScriptState *st)
{
- int id, lv;
- struct map_session_data *sd = script_rid2sd (st);
+ int id, lv;
+ struct map_session_data *sd = script_rid2sd(st);
- id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- lv = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 4]));
+ id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ lv = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 4]));
// 詠唱中にスキルアイテムは使用できない
if (sd->skilltimer != -1)
@@ -3788,24 +3782,24 @@ void builtin_itemskill (ScriptState *st)
sd->skillitem = id;
sd->skillitemlv = lv;
- clif_item_skill (sd, id, lv, str);
+ clif_item_skill(sd, id, lv, str);
}
/*==========================================
* NPCで経験値上げる
*------------------------------------------
*/
-void builtin_getexp (ScriptState *st)
+void builtin_getexp(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int base = 0, job = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int base = 0, job = 0;
- base = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- job = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ base = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ job = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (base < 0 || job < 0)
return;
if (sd)
- pc_gainexp_reason (sd, base, job, PC_GAINEXP_REASON_SCRIPT);
+ pc_gainexp_reason(sd, base, job, PC_GAINEXP_REASON_SCRIPT);
}
@@ -3813,21 +3807,21 @@ void builtin_getexp (ScriptState *st)
* モンスター発生
*------------------------------------------
*/
-void builtin_monster (ScriptState *st)
+void builtin_monster(ScriptState *st)
{
- int mob_class, amount, x, y;
+ int mob_class, amount, x, y;
const char *event = "";
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 5]));
- mob_class = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- amount = conv_num (st, &(st->stack->stack_data[st->start + 7]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 5]));
+ mob_class = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 7]));
if (st->end > st->start + 8)
- event = conv_str (st, &(st->stack->stack_data[st->start + 8]));
+ event = conv_str(st, &(st->stack->stack_data[st->start + 8]));
- mob_once_spawn (map_id2sd (st->rid), mapname, x, y, str, mob_class, amount,
+ mob_once_spawn(map_id2sd(st->rid), mapname, x, y, str, mob_class, amount,
event);
}
@@ -3835,23 +3829,23 @@ void builtin_monster (ScriptState *st)
* モンスター発生
*------------------------------------------
*/
-void builtin_areamonster (ScriptState *st)
+void builtin_areamonster(ScriptState *st)
{
- int mob_class, amount, x0, y0, x1, y1;
+ int mob_class, amount, x0, y0, x1, y1;
const char *event = "";
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7]));
- mob_class = conv_num (st, &(st->stack->stack_data[st->start + 8]));
- amount = conv_num (st, &(st->stack->stack_data[st->start + 9]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7]));
+ mob_class = conv_num(st, &(st->stack->stack_data[st->start + 8]));
+ amount = conv_num(st, &(st->stack->stack_data[st->start + 9]));
if (st->end > st->start + 10)
- event = conv_str (st, &(st->stack->stack_data[st->start + 10]));
+ event = conv_str(st, &(st->stack->stack_data[st->start + 10]));
- mob_once_spawn_area (map_id2sd (st->rid), mapname, x0, y0, x1, y1, str, mob_class,
+ mob_once_spawn_area(map_id2sd(st->rid), mapname, x0, y0, x1, y1, str, mob_class,
amount, event);
}
@@ -3860,54 +3854,54 @@ void builtin_areamonster (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_killmonster_sub (struct block_list *bl, va_list ap)
+void builtin_killmonster_sub(struct block_list *bl, va_list ap)
{
- char *event = va_arg (ap, char *);
- int allflag = va_arg (ap, int);
+ char *event = va_arg(ap, char *);
+ int allflag = va_arg(ap, int);
if (!allflag)
{
- if (strcmp (event, ((struct mob_data *) bl)->npc_event) == 0)
- mob_delete ((struct mob_data *) bl);
+ if (strcmp(event, ((struct mob_data *) bl)->npc_event) == 0)
+ mob_delete((struct mob_data *) bl);
return;
}
else if (allflag)
{
if (((struct mob_data *) bl)->spawndelay1 == -1
&& ((struct mob_data *) bl)->spawndelay2 == -1)
- mob_delete ((struct mob_data *) bl);
+ mob_delete((struct mob_data *) bl);
return;
}
}
-void builtin_killmonster (ScriptState *st)
+void builtin_killmonster(ScriptState *st)
{
- int m, allflag = 0;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- if (strcmp (event, "All") == 0)
+ int m, allflag = 0;
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ if (strcmp(event, "All") == 0)
allflag = 1;
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_killmonster_sub,
+ map_foreachinarea(builtin_killmonster_sub,
m, 0, 0, map[m].xs, map[m].ys, BL_MOB, event, allflag);
}
static
-void builtin_killmonsterall_sub (struct block_list *bl, va_list ap)
+void builtin_killmonsterall_sub(struct block_list *bl, va_list ap)
{
- mob_delete ((struct mob_data *) bl);
+ mob_delete((struct mob_data *) bl);
}
-void builtin_killmonsterall (ScriptState *st)
+void builtin_killmonsterall(ScriptState *st)
{
- int m;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ int m;
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_killmonsterall_sub,
+ map_foreachinarea(builtin_killmonsterall_sub,
m, 0, 0, map[m].xs, map[m].ys, BL_MOB);
}
@@ -3915,124 +3909,120 @@ void builtin_killmonsterall (ScriptState *st)
* イベント実行
*------------------------------------------
*/
-void builtin_doevent (ScriptState *st)
+void builtin_doevent(ScriptState *st)
{
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_event (map_id2sd (st->rid), event, 0);
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_event(map_id2sd(st->rid), event, 0);
}
/*==========================================
* NPC主体イベント実行
*------------------------------------------
*/
-void builtin_donpcevent (ScriptState *st)
+void builtin_donpcevent(ScriptState *st)
{
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_event_do (event);
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_event_do(event);
}
/*==========================================
* イベントタイマー追加
*------------------------------------------
*/
-void builtin_addtimer (ScriptState *st)
+void builtin_addtimer(ScriptState *st)
{
- int tick;
- tick = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- pc_addeventtimer (script_rid2sd (st), tick, event);
+ int tick;
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ pc_addeventtimer(script_rid2sd(st), tick, event);
}
/*==========================================
* イベントタイマー削除
*------------------------------------------
*/
-void builtin_deltimer (ScriptState *st)
+void builtin_deltimer(ScriptState *st)
{
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- pc_deleventtimer (script_rid2sd (st), event);
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ pc_deleventtimer(script_rid2sd(st), event);
}
/*==========================================
* イベントタイマーのカウント値追加
*------------------------------------------
*/
-void builtin_addtimercount (ScriptState *st)
+void builtin_addtimercount(ScriptState *st)
{
- int tick;
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- tick = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- pc_addeventtimercount (script_rid2sd (st), event, tick);
+ int tick;
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ pc_addeventtimercount(script_rid2sd(st), event, tick);
}
/*==========================================
* NPCタイマー初期化
*------------------------------------------
*/
-void builtin_initnpctimer (ScriptState *st)
+void builtin_initnpctimer(ScriptState *st)
{
struct npc_data *nd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
- npc_settimerevent_tick (nd, 0);
- npc_timerevent_start (nd);
+ npc_settimerevent_tick(nd, 0);
+ npc_timerevent_start(nd);
}
/*==========================================
* NPCタイマー開始
*------------------------------------------
*/
-void builtin_startnpctimer (ScriptState *st)
+void builtin_startnpctimer(ScriptState *st)
{
struct npc_data *nd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
- npc_timerevent_start (nd);
+ npc_timerevent_start(nd);
}
/*==========================================
* NPCタイマー停止
*------------------------------------------
*/
-void builtin_stopnpctimer (ScriptState *st)
+void builtin_stopnpctimer(ScriptState *st)
{
struct npc_data *nd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
- npc_timerevent_stop (nd);
+ npc_timerevent_stop(nd);
}
/*==========================================
* NPCタイマー情報所得
*------------------------------------------
*/
-void builtin_getnpctimer (ScriptState *st)
+void builtin_getnpctimer(ScriptState *st)
{
struct npc_data *nd;
- int type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- int val = 0;
+ int type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ int val = 0;
if (st->end > st->start + 3)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 3])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
switch (type)
{
case 0:
- val = npc_gettimerevent_tick (nd);
+ val = npc_gettimerevent_tick(nd);
break;
case 1:
val = (nd->u.scr.nexttimer >= 0);
@@ -4041,45 +4031,44 @@ void builtin_getnpctimer (ScriptState *st)
val = nd->u.scr.timeramount;
break;
}
- push_val (st->stack, ScriptCode::INT, val);
+ push_val(st->stack, ScriptCode::INT, val);
}
/*==========================================
* NPCタイマー値設定
*------------------------------------------
*/
-void builtin_setnpctimer (ScriptState *st)
+void builtin_setnpctimer(ScriptState *st)
{
- int tick;
+ int tick;
struct npc_data *nd;
- tick = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 3])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
- npc_settimerevent_tick (nd, tick);
+ npc_settimerevent_tick(nd, tick);
}
/*==========================================
* 天の声アナウンス
*------------------------------------------
*/
-void builtin_announce (ScriptState *st)
+void builtin_announce(ScriptState *st)
{
- int flag;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- flag = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ int flag;
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ flag = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (flag & 0x0f)
{
- struct block_list *bl = (flag & 0x08) ? map_id2bl (st->oid) :
- (struct block_list *) script_rid2sd (st);
- clif_GMmessage (bl, str, strlen (str) + 1, flag);
+ struct block_list *bl = (flag & 0x08) ? map_id2bl(st->oid) :
+ (struct block_list *) script_rid2sd(st);
+ clif_GMmessage(bl, str, strlen(str) + 1, flag);
}
else
- intif_GMmessage (str, strlen (str) + 1, flag);
+ intif_GMmessage(str, strlen(str) + 1, flag);
}
/*==========================================
@@ -4087,53 +4076,53 @@ void builtin_announce (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_mapannounce_sub (struct block_list *bl, va_list ap)
+void builtin_mapannounce_sub(struct block_list *bl, va_list ap)
{
char *str;
- int len, flag;
- str = va_arg (ap, char *);
- len = va_arg (ap, int);
- flag = va_arg (ap, int);
- clif_GMmessage (bl, str, len, flag | 3);
+ int len, flag;
+ str = va_arg(ap, char *);
+ len = va_arg(ap, int);
+ flag = va_arg(ap, int);
+ clif_GMmessage(bl, str, len, flag | 3);
}
-void builtin_mapannounce (ScriptState *st)
+void builtin_mapannounce(ScriptState *st)
{
- int flag, m;
+ int flag, m;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- flag = conv_num (st, &(st->stack->stack_data[st->start + 4]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ flag = conv_num(st, &(st->stack->stack_data[st->start + 4]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_mapannounce_sub,
+ map_foreachinarea(builtin_mapannounce_sub,
m, 0, 0, map[m].xs, map[m].ys, BL_PC, str,
- strlen (str) + 1, flag & 0x10);
+ strlen(str) + 1, flag & 0x10);
}
/*==========================================
* 天の声アナウンス（特定エリア）
*------------------------------------------
*/
-void builtin_areaannounce (ScriptState *st)
+void builtin_areaannounce(ScriptState *st)
{
- int flag, m;
- int x0, y0, x1, y1;
+ int flag, m;
+ int x0, y0, x1, y1;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 7]));
- flag = conv_num (st, &(st->stack->stack_data[st->start + 8]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 7]));
+ flag = conv_num(st, &(st->stack->stack_data[st->start + 8]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_mapannounce_sub,
- m, x0, y0, x1, y1, BL_PC, str, strlen (str) + 1,
+ map_foreachinarea(builtin_mapannounce_sub,
+ m, x0, y0, x1, y1, BL_PC, str, strlen(str) + 1,
flag & 0x10);
}
@@ -4141,37 +4130,37 @@ void builtin_areaannounce (ScriptState *st)
* ユーザー数所得
*------------------------------------------
*/
-void builtin_getusers (ScriptState *st)
+void builtin_getusers(ScriptState *st)
{
- int flag = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- struct block_list *bl = map_id2bl ((flag & 0x08) ? st->oid : st->rid);
- int val = 0;
+ int flag = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ struct block_list *bl = map_id2bl((flag & 0x08) ? st->oid : st->rid);
+ int val = 0;
switch (flag & 0x07)
{
case 0:
val = map[bl->m].users;
break;
case 1:
- val = map_getusers ();
+ val = map_getusers();
break;
}
- push_val (st->stack, ScriptCode::INT, val);
+ push_val(st->stack, ScriptCode::INT, val);
}
/*==========================================
* マップ指定ユーザー数所得
*------------------------------------------
*/
-void builtin_getmapusers (ScriptState *st)
+void builtin_getmapusers(ScriptState *st)
{
- int m;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- if ((m = map_mapname2mapid (str)) < 0)
+ int m;
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ if ((m = map_mapname2mapid(str)) < 0)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
- push_val (st->stack, ScriptCode::INT, map[m].users);
+ push_val(st->stack, ScriptCode::INT, map[m].users);
}
/*==========================================
@@ -4179,42 +4168,42 @@ void builtin_getmapusers (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_getareausers_sub (struct block_list *bl, va_list ap)
+void builtin_getareausers_sub(struct block_list *bl, va_list ap)
{
- int *users = va_arg (ap, int *);
+ int *users = va_arg(ap, int *);
(*users)++;
}
static
-void builtin_getareausers_living_sub (struct block_list *bl, va_list ap)
+void builtin_getareausers_living_sub(struct block_list *bl, va_list ap)
{
- int *users = va_arg (ap, int *);
+ int *users = va_arg(ap, int *);
if (!pc_isdead((struct map_session_data *)bl))
(*users)++;
}
-void builtin_getareausers (ScriptState *st)
+void builtin_getareausers(ScriptState *st)
{
- int m, x0, y0, x1, y1, users = 0;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
+ int m, x0, y0, x1, y1, users = 0;
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
int living = 0;
if (st->end > st->start + 7)
{
- living = conv_num (st, &(st->stack->stack_data[st->start + 7]));
+ living = conv_num(st, &(st->stack->stack_data[st->start + 7]));
}
- if ((m = map_mapname2mapid (str)) < 0)
+ if ((m = map_mapname2mapid(str)) < 0)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
- map_foreachinarea (living ? builtin_getareausers_living_sub: builtin_getareausers_sub,
+ map_foreachinarea(living ? builtin_getareausers_living_sub: builtin_getareausers_sub,
m, x0, y0, x1, y1, BL_PC, &users);
- push_val (st->stack, ScriptCode::INT, users);
+ push_val(st->stack, ScriptCode::INT, users);
}
/*==========================================
@@ -4222,10 +4211,10 @@ void builtin_getareausers (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_getareadropitem_sub (struct block_list *bl, va_list ap)
+void builtin_getareadropitem_sub(struct block_list *bl, va_list ap)
{
- int item = va_arg (ap, int);
- int *amount = va_arg (ap, int *);
+ int item = va_arg(ap, int);
+ int *amount = va_arg(ap, int *);
struct flooritem_data *drop = (struct flooritem_data *) bl;
if (drop->item_data.nameid == item)
@@ -4234,10 +4223,10 @@ void builtin_getareadropitem_sub (struct block_list *bl, va_list ap)
}
static
-void builtin_getareadropitem_sub_anddelete (struct block_list *bl, va_list ap)
+void builtin_getareadropitem_sub_anddelete(struct block_list *bl, va_list ap)
{
- int item = va_arg (ap, int);
- int *amount = va_arg (ap, int *);
+ int item = va_arg(ap, int);
+ int *amount = va_arg(ap, int *);
struct flooritem_data *drop = (struct flooritem_data *) bl;
if (drop->item_data.nameid == item) {
@@ -4247,88 +4236,88 @@ void builtin_getareadropitem_sub_anddelete (struct block_list *bl, va_list ap)
}
}
-void builtin_getareadropitem (ScriptState *st)
+void builtin_getareadropitem(ScriptState *st)
{
- int m, x0, y0, x1, y1, item, amount = 0, delitems = 0;
+ int m, x0, y0, x1, y1, item, amount = 0, delitems = 0;
struct script_data *data;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
data = &(st->stack->stack_data[st->start + 7]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- struct item_data *item_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ struct item_data *item_data = itemdb_searchname(name);
item = 512;
if (item_data)
item = item_data->nameid;
}
else
- item = conv_num (st, data);
+ item = conv_num(st, data);
if (st->end > st->start + 8)
- delitems = conv_num (st, &(st->stack->stack_data[st->start + 8]));
+ delitems = conv_num(st, &(st->stack->stack_data[st->start + 8]));
- if ((m = map_mapname2mapid (str)) < 0)
+ if ((m = map_mapname2mapid(str)) < 0)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
if (delitems)
- map_foreachinarea (builtin_getareadropitem_sub_anddelete,
+ map_foreachinarea(builtin_getareadropitem_sub_anddelete,
m, x0, y0, x1, y1, BL_ITEM, item, &amount);
else
- map_foreachinarea (builtin_getareadropitem_sub,
+ map_foreachinarea(builtin_getareadropitem_sub,
m, x0, y0, x1, y1, BL_ITEM, item, &amount);
- push_val (st->stack, ScriptCode::INT, amount);
+ push_val(st->stack, ScriptCode::INT, amount);
}
/*==========================================
* NPCの有効化
*------------------------------------------
*/
-void builtin_enablenpc (ScriptState *st)
+void builtin_enablenpc(ScriptState *st)
{
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_enable (str, 1);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_enable(str, 1);
}
/*==========================================
* NPCの無効化
*------------------------------------------
*/
-void builtin_disablenpc (ScriptState *st)
+void builtin_disablenpc(ScriptState *st)
{
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_enable (str, 0);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_enable(str, 0);
}
-void builtin_enablearena (ScriptState *st) // Added by RoVeRT
+void builtin_enablearena(ScriptState *st) // Added by RoVeRT
{
- struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid);
+ struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid);
struct chat_data *cd;
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
return;
- npc_enable (nd->name, 1);
+ npc_enable(nd->name, 1);
nd->arenaflag = 1;
if (cd->users >= cd->trigger && cd->npc_event[0])
- npc_timer_event (cd->npc_event);
+ npc_timer_event(cd->npc_event);
}
-void builtin_disablearena (ScriptState *st) // Added by RoVeRT
+void builtin_disablearena(ScriptState *st) // Added by RoVeRT
{
- struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid);
+ struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid);
nd->arenaflag = 0;
}
@@ -4337,97 +4326,95 @@ void builtin_disablearena (ScriptState *st) // Added by RoVeRT
* 隠れているNPCの表示
*------------------------------------------
*/
-void builtin_hideoffnpc (ScriptState *st)
+void builtin_hideoffnpc(ScriptState *st)
{
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_enable (str, 2);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_enable(str, 2);
}
/*==========================================
* NPCをハイディング
*------------------------------------------
*/
-void builtin_hideonnpc (ScriptState *st)
+void builtin_hideonnpc(ScriptState *st)
{
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- npc_enable (str, 4);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ npc_enable(str, 4);
}
/*==========================================
* 状態異常にかかる
*------------------------------------------
*/
-void builtin_sc_start (ScriptState *st)
+void builtin_sc_start(ScriptState *st)
{
struct block_list *bl;
- int type, tick, val1;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- tick = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- val1 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
+ int type, tick, val1;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ val1 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
if (st->end > st->start + 5) //指定したキャラを状態異常にする
- bl = map_id2bl (conv_num
- (st, &(st->stack->stack_data[st->start + 5])));
+ bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 5])));
else
- bl = map_id2bl (st->rid);
+ bl = map_id2bl(st->rid);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->state.potionpitcher_flag)
- bl = map_id2bl (((struct map_session_data *) bl)->skilltarget);
- skill_status_change_start (bl, type, val1, 0, 0, 0, tick, 0);
+ bl = map_id2bl(((struct map_session_data *) bl)->skilltarget);
+ skill_status_change_start(bl, type, val1, 0, 0, 0, tick, 0);
}
/*==========================================
* 状態異常にかかる(確率指定)
*------------------------------------------
*/
-void builtin_sc_start2 (ScriptState *st)
+void builtin_sc_start2(ScriptState *st)
{
struct block_list *bl;
- int type, tick, val1, per;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- tick = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- val1 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- per = conv_num (st, &(st->stack->stack_data[st->start + 5]));
+ int type, tick, val1, per;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ val1 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ per = conv_num(st, &(st->stack->stack_data[st->start + 5]));
if (st->end > st->start + 6) //指定したキャラを状態異常にする
- bl = map_id2bl (conv_num
- (st, &(st->stack->stack_data[st->start + 6])));
+ bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 6])));
else
- bl = map_id2bl (st->rid);
+ bl = map_id2bl(st->rid);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->state.potionpitcher_flag)
- bl = map_id2bl (((struct map_session_data *) bl)->skilltarget);
- if (MRAND (10000) < per)
- skill_status_change_start (bl, type, val1, 0, 0, 0, tick, 0);
+ bl = map_id2bl(((struct map_session_data *) bl)->skilltarget);
+ if (MRAND(10000) < per)
+ skill_status_change_start(bl, type, val1, 0, 0, 0, tick, 0);
}
/*==========================================
* 状態異常が直る
*------------------------------------------
*/
-void builtin_sc_end (ScriptState *st)
+void builtin_sc_end(ScriptState *st)
{
struct block_list *bl;
- int type;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- bl = map_id2bl (st->rid);
+ int type;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ bl = map_id2bl(st->rid);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->state.potionpitcher_flag)
- bl = map_id2bl (((struct map_session_data *) bl)->skilltarget);
- skill_status_change_end (bl, type, -1);
+ bl = map_id2bl(((struct map_session_data *) bl)->skilltarget);
+ skill_status_change_end(bl, type, -1);
// if(battle_config.etc_log)
// printf("sc_end : %d %d\n",st->rid,type);
}
-void builtin_sc_check (ScriptState *st)
+void builtin_sc_check(ScriptState *st)
{
struct block_list *bl;
- int type;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- bl = map_id2bl (st->rid);
+ int type;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ bl = map_id2bl(st->rid);
if (bl->type == BL_PC
&& ((struct map_session_data *) bl)->state.potionpitcher_flag)
- bl = map_id2bl (((struct map_session_data *) bl)->skilltarget);
+ bl = map_id2bl(((struct map_session_data *) bl)->skilltarget);
- push_val (st->stack, ScriptCode::INT, skill_status_change_active (bl, type));
+ push_val(st->stack, ScriptCode::INT, skill_status_change_active(bl, type));
}
@@ -4435,24 +4422,23 @@ void builtin_sc_check (ScriptState *st)
* 状態異常耐性を計算した確率を返す
*------------------------------------------
*/
-void builtin_getscrate (ScriptState *st)
+void builtin_getscrate(ScriptState *st)
{
struct block_list *bl;
- int sc_def = 100, sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2;
- int type, rate, luk;
+ int sc_def = 100, sc_def_mdef2, sc_def_vit2, sc_def_int2, sc_def_luk2;
+ int type, rate, luk;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- rate = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ rate = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (st->end > st->start + 4) //指定したキャラの耐性を計算する
- bl = map_id2bl (conv_num
- (st, &(st->stack->stack_data[st->start + 6])));
+ bl = map_id2bl(conv_num(st, &(st->stack->stack_data[st->start + 6])));
else
- bl = map_id2bl (st->rid);
+ bl = map_id2bl(st->rid);
- luk = battle_get_luk (bl);
- sc_def_mdef2 = 100 - (3 + battle_get_mdef (bl) + luk / 3);
- sc_def_vit2 = 100 - (3 + battle_get_vit (bl) + luk / 3);
- sc_def_int2 = 100 - (3 + battle_get_int (bl) + luk / 3);
+ luk = battle_get_luk(bl);
+ sc_def_mdef2 = 100 - (3 + battle_get_mdef(bl) + luk / 3);
+ sc_def_vit2 = 100 - (3 + battle_get_vit(bl) + luk / 3);
+ sc_def_int2 = 100 - (3 + battle_get_int(bl) + luk / 3);
sc_def_luk2 = 100 - (3 + luk);
if (type == SC_STONE || type == SC_FREEZE)
@@ -4465,7 +4451,7 @@ void builtin_getscrate (ScriptState *st)
sc_def = sc_def_luk2;
rate = rate * sc_def / 100;
- push_val (st->stack, ScriptCode::INT, rate);
+ push_val(st->stack, ScriptCode::INT, rate);
return;
@@ -4475,10 +4461,10 @@ void builtin_getscrate (ScriptState *st)
*
*------------------------------------------
*/
-void builtin_debugmes (ScriptState *st)
+void builtin_debugmes(ScriptState *st)
{
- conv_str (st, &(st->stack->stack_data[st->start + 2]));
- printf ("script debug : %d %d : %s\n", st->rid, st->oid,
+ conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ printf("script debug : %d %d : %s\n", st->rid, st->oid,
st->stack->stack_data[st->start + 2].u.str);
}
@@ -4486,57 +4472,56 @@ void builtin_debugmes (ScriptState *st)
* Added - AppleGirl For Advanced Classes, (Updated for Cleaner Script Purposes)
*------------------------------------------
*/
-void builtin_resetlvl (ScriptState *st)
+void builtin_resetlvl(ScriptState *st)
{
struct map_session_data *sd;
- int type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ int type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- pc_resetlvl (sd, type);
+ sd = script_rid2sd(st);
+ pc_resetlvl(sd, type);
}
/*==========================================
* ステータスリセット
*------------------------------------------
*/
-void builtin_resetstatus (ScriptState *st)
+void builtin_resetstatus(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- pc_resetstate (sd);
+ sd = script_rid2sd(st);
+ pc_resetstate(sd);
}
/*==========================================
* スキルリセット
*------------------------------------------
*/
-void builtin_resetskill (ScriptState *st)
+void builtin_resetskill(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- pc_resetskill (sd);
+ sd = script_rid2sd(st);
+ pc_resetskill(sd);
}
/*==========================================
*
*------------------------------------------
*/
-void builtin_changebase (ScriptState *st)
+void builtin_changebase(ScriptState *st)
{
struct map_session_data *sd = NULL;
- int vclass;
+ int vclass;
if (st->end > st->start + 3)
- sd = map_id2sd (conv_num
- (st, &(st->stack->stack_data[st->start + 3])));
+ sd = map_id2sd(conv_num(st, &(st->stack->stack_data[st->start + 3])));
else
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd == NULL)
return;
- vclass = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ vclass = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (vclass == 22 && !battle_config.wedding_modifydisplay)
return;
@@ -4552,10 +4537,10 @@ void builtin_changebase (ScriptState *st)
* 性別変換
*------------------------------------------
*/
-void builtin_changesex (ScriptState *st)
+void builtin_changesex(ScriptState *st)
{
struct map_session_data *sd = NULL;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
if (sd->status.sex == 0)
{
@@ -4571,63 +4556,62 @@ void builtin_changesex (ScriptState *st)
if (sd->status.pc_class == 19 || sd->status.pc_class == 4020)
sd->status.pc_class += 1;
}
- chrif_char_ask_name (-1, sd->status.name, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex
- chrif_save (sd);
+ chrif_char_ask_name(-1, sd->status.name, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex
+ chrif_save(sd);
}
/*==========================================
* npcチャット作成
*------------------------------------------
*/
-void builtin_waitingroom (ScriptState *st)
+void builtin_waitingroom(ScriptState *st)
{
const char *name, *ev = "";
- int limit, trigger = 0, pub = 1;
- name = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- limit = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ int limit, trigger = 0, pub = 1;
+ name = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ limit = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (limit == 0)
pub = 3;
if ((st->end > st->start + 5))
{
struct script_data *data = &(st->stack->stack_data[st->start + 5]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::INT)
{
// 新Athena仕様(旧Athena仕様と互換性あり)
- ev = conv_str (st, &(st->stack->stack_data[st->start + 4]));
- trigger = conv_num (st, &(st->stack->stack_data[st->start + 5]));
+ ev = conv_str(st, &(st->stack->stack_data[st->start + 4]));
+ trigger = conv_num(st, &(st->stack->stack_data[st->start + 5]));
}
else
{
// eathena仕様
- trigger = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- ev = conv_str (st, &(st->stack->stack_data[st->start + 5]));
+ trigger = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ ev = conv_str(st, &(st->stack->stack_data[st->start + 5]));
}
}
else
{
// 旧Athena仕様
if (st->end > st->start + 4)
- ev = conv_str (st, &(st->stack->stack_data[st->start + 4]));
+ ev = conv_str(st, &(st->stack->stack_data[st->start + 4]));
}
- chat_createnpcchat ((struct npc_data *) map_id2bl (st->oid),
- limit, pub, trigger, name, strlen (name) + 1, ev);
+ chat_createnpcchat((struct npc_data *) map_id2bl(st->oid),
+ limit, pub, trigger, name, strlen(name) + 1, ev);
}
/*==========================================
* npcチャット削除
*------------------------------------------
*/
-void builtin_delwaitingroom (ScriptState *st)
+void builtin_delwaitingroom(ScriptState *st)
{
struct npc_data *nd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
- chat_deletenpcchat (nd);
+ nd = (struct npc_data *) map_id2bl(st->oid);
+ chat_deletenpcchat(nd);
}
/*==========================================
@@ -4635,85 +4619,81 @@ void builtin_delwaitingroom (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_waitingroomkickall (ScriptState *st)
+void builtin_waitingroomkickall(ScriptState *st)
{
struct npc_data *nd;
struct chat_data *cd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
return;
- chat_npckickall (cd);
+ chat_npckickall(cd);
}
/*==========================================
* npcチャットイベント有効化
*------------------------------------------
*/
-void builtin_enablewaitingroomevent (ScriptState *st)
+void builtin_enablewaitingroomevent(ScriptState *st)
{
struct npc_data *nd;
struct chat_data *cd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
return;
- chat_enableevent (cd);
+ chat_enableevent(cd);
}
/*==========================================
* npcチャットイベント無効化
*------------------------------------------
*/
-void builtin_disablewaitingroomevent (ScriptState *st)
+void builtin_disablewaitingroomevent(ScriptState *st)
{
struct npc_data *nd;
struct chat_data *cd;
if (st->end > st->start + 2)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
return;
- chat_disableevent (cd);
+ chat_disableevent(cd);
}
/*==========================================
* npcチャット状態所得
*------------------------------------------
*/
-void builtin_getwaitingroomstate (ScriptState *st)
+void builtin_getwaitingroomstate(ScriptState *st)
{
struct npc_data *nd;
struct chat_data *cd;
- int val = 0, type;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ int val = 0, type;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
- nd = npc_name2id (conv_str
- (st, &(st->stack->stack_data[st->start + 3])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 3])));
else
- nd = (struct npc_data *) map_id2bl (st->oid);
+ nd = (struct npc_data *) map_id2bl(st->oid);
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
@@ -4739,77 +4719,77 @@ void builtin_getwaitingroomstate (ScriptState *st)
break;
case 4:
- push_str (st->stack, ScriptCode::CONSTSTR, cd->title);
+ push_str(st->stack, ScriptCode::CONSTSTR, cd->title);
return;
case 5:
- push_str (st->stack, ScriptCode::CONSTSTR, cd->pass);
+ push_str(st->stack, ScriptCode::CONSTSTR, cd->pass);
return;
case 16:
- push_str (st->stack, ScriptCode::CONSTSTR, cd->npc_event);
+ push_str(st->stack, ScriptCode::CONSTSTR, cd->npc_event);
return;
}
- push_val (st->stack, ScriptCode::INT, val);
+ push_val(st->stack, ScriptCode::INT, val);
}
/*==========================================
* チャットメンバー(規定人数)ワープ
*------------------------------------------
*/
-void builtin_warpwaitingpc (ScriptState *st)
+void builtin_warpwaitingpc(ScriptState *st)
{
- int x, y, i, n;
- struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid);
+ int x, y, i, n;
+ struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid);
struct chat_data *cd;
if (nd == NULL
- || (cd = (struct chat_data *) map_id2bl (nd->chat_id)) == NULL)
+ || (cd = (struct chat_data *) map_id2bl(nd->chat_id)) == NULL)
return;
n = cd->trigger & 0x7f;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
if (st->end > st->start + 5)
- n = conv_num (st, &(st->stack->stack_data[st->start + 5]));
+ n = conv_num(st, &(st->stack->stack_data[st->start + 5]));
for (i = 0; i < n; i++)
{
struct map_session_data *sd = cd->usersd[0]; // リスト先頭のPCを次々に。
- mapreg_setreg (add_str ("$@warpwaitingpc") + (i << 24), sd->bl.id);
+ mapreg_setreg(add_str("$@warpwaitingpc") + (i << 24), sd->bl.id);
- if (strcmp (str, "Random") == 0)
- pc_randomwarp (sd, 3);
- else if (strcmp (str, "SavePoint") == 0)
+ if (strcmp(str, "Random") == 0)
+ pc_randomwarp(sd, 3);
+ else if (strcmp(str, "SavePoint") == 0)
{
if (map[sd->bl.m].flag.noteleport) // テレポ禁止
return;
- pc_setpos (sd, sd->status.save_point.map,
+ pc_setpos(sd, sd->status.save_point.map,
sd->status.save_point.x, sd->status.save_point.y, 3);
}
else
- pc_setpos (sd, str, x, y, 0);
+ pc_setpos(sd, str, x, y, 0);
}
- mapreg_setreg (add_str ("$@warpwaitingpcnum"), n);
+ mapreg_setreg(add_str("$@warpwaitingpcnum"), n);
}
/*==========================================
* RIDのアタッチ
*------------------------------------------
*/
-void builtin_attachrid (ScriptState *st)
+void builtin_attachrid(ScriptState *st)
{
- st->rid = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- push_val (st->stack, ScriptCode::INT, (map_id2sd (st->rid) != NULL));
+ st->rid = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ push_val(st->stack, ScriptCode::INT, (map_id2sd(st->rid) != NULL));
}
/*==========================================
* RIDのデタッチ
*------------------------------------------
*/
-void builtin_detachrid (ScriptState *st)
+void builtin_detachrid(ScriptState *st)
{
st->rid = 0;
}
@@ -4818,11 +4798,10 @@ void builtin_detachrid (ScriptState *st)
* 存在チェック
*------------------------------------------
*/
-void builtin_isloggedin (ScriptState *st)
+void builtin_isloggedin(ScriptState *st)
{
- push_val (st->stack, ScriptCode::INT,
- map_id2sd (conv_num
- (st,
+ push_val(st->stack, ScriptCode::INT,
+ map_id2sd(conv_num(st,
&(st->stack->stack_data[st->start + 2]))) != NULL);
}
@@ -4855,32 +4834,32 @@ enum
MF_RAIN = 20,
};
-void builtin_setmapflagnosave (ScriptState *st)
+void builtin_setmapflagnosave(ScriptState *st)
{
- int m, x, y;
+ int m, x, y;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *str2 = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *str2 = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ m = map_mapname2mapid(str);
if (m >= 0)
{
map[m].flag.nosave = 1;
- memcpy (map[m].save.map, str2, 16);
+ memcpy(map[m].save.map, str2, 16);
map[m].save.x = x;
map[m].save.y = y;
}
}
-void builtin_setmapflag (ScriptState *st)
+void builtin_setmapflag(ScriptState *st)
{
- int m, i;
+ int m, i;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- i = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ i = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ m = map_mapname2mapid(str);
if (m >= 0)
{
switch (i)
@@ -4938,13 +4917,13 @@ void builtin_setmapflag (ScriptState *st)
}
-void builtin_removemapflag (ScriptState *st)
+void builtin_removemapflag(ScriptState *st)
{
- int m, i;
+ int m, i;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- i = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ i = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ m = map_mapname2mapid(str);
if (m >= 0)
{
switch (i)
@@ -5003,13 +4982,13 @@ void builtin_removemapflag (ScriptState *st)
}
-void builtin_getmapflag (ScriptState *st)
+void builtin_getmapflag(ScriptState *st)
{
- int m, i, r;
+ int m, i, r;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- i = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ i = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ m = map_mapname2mapid(str);
if (m >= 0)
{
switch (i)
@@ -5066,20 +5045,20 @@ void builtin_getmapflag (ScriptState *st)
}
}
- push_val (st->stack, ScriptCode::INT, r);
+ push_val(st->stack, ScriptCode::INT, r);
}
-void builtin_pvpon (ScriptState *st)
+void builtin_pvpon(ScriptState *st)
{
- int m, i;
+ int m, i;
struct map_session_data *pl_sd = NULL;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ m = map_mapname2mapid(str);
if (m >= 0 && !map[m].flag.pvp && !map[m].flag.nopvp)
{
map[m].flag.pvp = 1;
- clif_send0199 (m, 1);
+ clif_send0199(m, 1);
if (battle_config.pk_mode) // disable ranking functions if pk_mode is on [Valaris]
return;
@@ -5092,7 +5071,7 @@ void builtin_pvpon (ScriptState *st)
if (m == pl_sd->bl.m && pl_sd->pvp_timer == -1)
{
pl_sd->pvp_timer =
- add_timer (gettick () + 200, pc_calc_pvprank_timer,
+ add_timer(gettick() + 200, pc_calc_pvprank_timer,
pl_sd->bl.id, 0);
pl_sd->pvp_rank = 0;
pl_sd->pvp_lastusers = 0;
@@ -5104,17 +5083,17 @@ void builtin_pvpon (ScriptState *st)
}
-void builtin_pvpoff (ScriptState *st)
+void builtin_pvpoff(ScriptState *st)
{
- int m, i;
+ int m, i;
struct map_session_data *pl_sd = NULL;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- m = map_mapname2mapid (str);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ m = map_mapname2mapid(str);
if (m >= 0 && map[m].flag.pvp && map[m].flag.nopvp)
{
map[m].flag.pvp = 0;
- clif_send0199 (m, 0);
+ clif_send0199(m, 0);
if (battle_config.pk_mode) // disable ranking options if pk_mode is on [Valaris]
return;
@@ -5126,10 +5105,10 @@ void builtin_pvpoff (ScriptState *st)
{
if (m == pl_sd->bl.m)
{
- clif_pvpset (pl_sd, 0, 0, 2);
+ clif_pvpset(pl_sd, 0, 0, 2);
if (pl_sd->pvp_timer != -1)
{
- delete_timer (pl_sd->pvp_timer,
+ delete_timer(pl_sd->pvp_timer,
pc_calc_pvprank_timer);
pl_sd->pvp_timer = -1;
}
@@ -5141,35 +5120,35 @@ void builtin_pvpoff (ScriptState *st)
}
/*==========================================
- * NPCエモーション
+ * NPCエモーション
*------------------------------------------
*/
-void builtin_emotion (ScriptState *st)
+void builtin_emotion(ScriptState *st)
{
- int type;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ int type;
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (type < 0 || type > 100)
return;
- clif_emotion (map_id2bl (st->oid), type);
+ clif_emotion(map_id2bl(st->oid), type);
}
/* =====================================================================
* カードの数を得る
* ---------------------------------------------------------------------
*/
-void builtin_getequipcardcnt (ScriptState *st)
+void builtin_getequipcardcnt(ScriptState *st)
{
- int i, num;
+ int i, num;
struct map_session_data *sd;
- int c = 4;
+ int c = 4;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (sd->status.inventory[i].card[0] == 0x00ff)
{ // 製造武器はカードなし
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
return;
}
do
@@ -5178,28 +5157,28 @@ void builtin_getequipcardcnt (ScriptState *st)
(sd->status.inventory[i].card[c - 1] < 5000))
{
- push_val (st->stack, ScriptCode::INT, (c));
+ push_val(st->stack, ScriptCode::INT, (c));
return;
}
}
while (c--);
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
/* ================================================================
* カード取り外し成功
* ----------------------------------------------------------------
*/
-void builtin_successremovecards (ScriptState *st)
+void builtin_successremovecards(ScriptState *st)
{
- int i, num, cardflag = 0, flag;
+ int i, num, cardflag = 0, flag;
struct map_session_data *sd;
struct item item_tmp;
- int c = 4;
+ int c = 4;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (sd->status.inventory[i].card[0] == 0x00ff)
{ // 製造武器は処理しない
return;
@@ -5218,10 +5197,10 @@ void builtin_successremovecards (ScriptState *st)
item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] =
0, item_tmp.card[3] = 0;
- if ((flag = pc_additem (sd, &item_tmp, 1)))
+ if ((flag = pc_additem(sd, &item_tmp, 1)))
{ // 持てないならドロップ
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
NULL, NULL, NULL, 0);
}
}
@@ -5237,14 +5216,14 @@ void builtin_successremovecards (ScriptState *st)
item_tmp.attribute = sd->status.inventory[i].attribute;
item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] =
0, item_tmp.card[3] = 0;
- pc_delitem (sd, i, 1, 0);
- if ((flag = pc_additem (sd, &item_tmp, 1)))
+ pc_delitem(sd, i, 1, 0);
+ if ((flag = pc_additem(sd, &item_tmp, 1)))
{ // もてないならドロップ
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
NULL, NULL, NULL, 0);
}
- clif_misceffect (&sd->bl, 3);
+ clif_misceffect(&sd->bl, 3);
return;
}
}
@@ -5254,17 +5233,17 @@ void builtin_successremovecards (ScriptState *st)
* type=0: 両方損失、1:カード損失、2:武具損失、3:損失無し
* ----------------------------------------------------------------
*/
-void builtin_failedremovecards (ScriptState *st)
+void builtin_failedremovecards(ScriptState *st)
{
- int i, num, cardflag = 0, flag, typefail;
+ int i, num, cardflag = 0, flag, typefail;
struct map_session_data *sd;
struct item item_tmp;
- int c = 4;
+ int c = 4;
- num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- typefail = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- sd = script_rid2sd (st);
- i = pc_checkequip (sd, equip[num - 1]);
+ num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ typefail = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ sd = script_rid2sd(st);
+ i = pc_checkequip(sd, equip[num - 1]);
if (sd->status.inventory[i].card[0] == 0x00ff)
{ // 製造武器は処理しない
return;
@@ -5286,10 +5265,10 @@ void builtin_failedremovecards (ScriptState *st)
item_tmp.attribute = 0;
item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] =
0, item_tmp.card[3] = 0;
- if ((flag = pc_additem (sd, &item_tmp, 1)))
+ if ((flag = pc_additem(sd, &item_tmp, 1)))
{
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x,
sd->bl.y, NULL, NULL, NULL, 0);
}
}
@@ -5302,8 +5281,8 @@ void builtin_failedremovecards (ScriptState *st)
if (typefail == 0 || typefail == 2)
{ // 武具損失
- pc_delitem (sd, i, 1, 0);
- clif_misceffect (&sd->bl, 2);
+ pc_delitem(sd, i, 1, 0);
+ clif_misceffect(&sd->bl, 2);
return;
}
if (typefail == 1)
@@ -5315,143 +5294,143 @@ void builtin_failedremovecards (ScriptState *st)
item_tmp.attribute = sd->status.inventory[i].attribute;
item_tmp.card[0] = 0, item_tmp.card[1] = 0, item_tmp.card[2] =
0, item_tmp.card[3] = 0;
- pc_delitem (sd, i, 1, 0);
- if ((flag = pc_additem (sd, &item_tmp, 1)))
+ pc_delitem(sd, i, 1, 0);
+ if ((flag = pc_additem(sd, &item_tmp, 1)))
{
- clif_additem (sd, 0, 0, flag);
- map_addflooritem (&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
+ clif_additem(sd, 0, 0, flag);
+ map_addflooritem(&item_tmp, 1, sd->bl.m, sd->bl.x, sd->bl.y,
NULL, NULL, NULL, 0);
}
}
- clif_misceffect (&sd->bl, 2);
+ clif_misceffect(&sd->bl, 2);
return;
}
}
-void builtin_mapwarp (ScriptState *st) // Added by RoVeRT
+void builtin_mapwarp(ScriptState *st) // Added by RoVeRT
{
- int x, y, m;
- int x0, y0, x1, y1;
+ int x, y, m;
+ int x0, y0, x1, y1;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
x0 = 0;
y0 = 0;
- x1 = map[map_mapname2mapid (mapname)].xs;
- y1 = map[map_mapname2mapid (mapname)].ys;
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 5]));
+ x1 = map[map_mapname2mapid(mapname)].xs;
+ y1 = map[map_mapname2mapid(mapname)].ys;
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 5]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_areawarp_sub,
+ map_foreachinarea(builtin_areawarp_sub,
m, x0, y0, x1, y1, BL_PC, str, x, y);
}
-void builtin_cmdothernpc (ScriptState *st) // Added by RoVeRT
+void builtin_cmdothernpc(ScriptState *st) // Added by RoVeRT
{
- const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *command = conv_str (st, &(st->stack->stack_data[st->start + 3]));
+ const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *command = conv_str(st, &(st->stack->stack_data[st->start + 3]));
- npc_command (map_id2sd (st->rid), npc, command);
+ npc_command(map_id2sd(st->rid), npc, command);
}
-void builtin_inittimer (ScriptState *st) // Added by RoVeRT
+void builtin_inittimer(ScriptState *st) // Added by RoVeRT
{
// struct npc_data *nd=(struct npc_data*)map_id2bl(st->oid);
// nd->lastaction=nd->timer=gettick();
- npc_do_ontimer (st->oid, map_id2sd (st->rid), 1);
+ npc_do_ontimer(st->oid, map_id2sd(st->rid), 1);
}
-void builtin_stoptimer (ScriptState *st) // Added by RoVeRT
+void builtin_stoptimer(ScriptState *st) // Added by RoVeRT
{
// struct npc_data *nd=(struct npc_data*)map_id2bl(st->oid);
// nd->lastaction=nd->timer=-1;
- npc_do_ontimer (st->oid, map_id2sd (st->rid), 0);
+ npc_do_ontimer(st->oid, map_id2sd(st->rid), 0);
}
static
-void builtin_mobcount_sub (struct block_list *bl, va_list ap) // Added by RoVeRT
+void builtin_mobcount_sub(struct block_list *bl, va_list ap) // Added by RoVeRT
{
- char *event = va_arg (ap, char *);
- int *c = va_arg (ap, int *);
+ char *event = va_arg(ap, char *);
+ int *c = va_arg(ap, int *);
- if (strcmp (event, ((struct mob_data *) bl)->npc_event) == 0)
+ if (strcmp(event, ((struct mob_data *) bl)->npc_event) == 0)
(*c)++;
}
-void builtin_mobcount (ScriptState *st) // Added by RoVeRT
+void builtin_mobcount(ScriptState *st) // Added by RoVeRT
{
- int m, c = 0;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 3]));
+ int m, c = 0;
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 3]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
{
- push_val (st->stack, ScriptCode::INT, -1);
+ push_val(st->stack, ScriptCode::INT, -1);
return;
}
- map_foreachinarea (builtin_mobcount_sub,
+ map_foreachinarea(builtin_mobcount_sub,
m, 0, 0, map[m].xs, map[m].ys, BL_MOB, event, &c);
- push_val (st->stack, ScriptCode::INT, (c - 1));
+ push_val(st->stack, ScriptCode::INT, (c - 1));
}
-void builtin_marriage (ScriptState *st)
+void builtin_marriage(ScriptState *st)
{
- const char *partner = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- struct map_session_data *sd = script_rid2sd (st);
- struct map_session_data *p_sd = map_nick2sd (partner);
+ const char *partner = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ struct map_session_data *sd = script_rid2sd(st);
+ struct map_session_data *p_sd = map_nick2sd(partner);
- if (sd == NULL || p_sd == NULL || pc_marriage (sd, p_sd) < 0)
+ if (sd == NULL || p_sd == NULL || pc_marriage(sd, p_sd) < 0)
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
return;
}
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
-void builtin_wedding_effect (ScriptState *st)
+void builtin_wedding_effect(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
if (sd == NULL)
return;
- clif_wedding_effect (&sd->bl);
+ clif_wedding_effect(&sd->bl);
}
-void builtin_divorce (ScriptState *st)
+void builtin_divorce(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
st->state = STOP; // rely on pc_divorce to restart
sd->npc_flags.divorce = 1;
- if (sd == NULL || pc_divorce (sd) < 0)
+ if (sd == NULL || pc_divorce(sd) < 0)
{
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
return;
}
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
}
/*================================================
* Script for Displaying MOB Information [Valaris]
*------------------------------------------------
*/
-void builtin_strmobinfo (ScriptState *st)
+void builtin_strmobinfo(ScriptState *st)
{
- int num = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- int mob_class = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ int num = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ int mob_class = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (num <= 0 || num >= 8 || (mob_class >= 0 && mob_class <= 1000) || mob_class > 2000)
return;
@@ -5460,98 +5439,98 @@ void builtin_strmobinfo (ScriptState *st)
{
char *buf;
buf = mob_db[mob_class].name;
- push_str (st->stack, ScriptCode::STR, buf);
+ push_str(st->stack, ScriptCode::STR, buf);
return;
}
else if (num == 2)
{
char *buf;
buf = mob_db[mob_class].jname;
- push_str (st->stack, ScriptCode::STR, buf);
+ push_str(st->stack, ScriptCode::STR, buf);
return;
}
else if (num == 3)
- push_val (st->stack, ScriptCode::INT, mob_db[mob_class].lv);
+ push_val(st->stack, ScriptCode::INT, mob_db[mob_class].lv);
else if (num == 4)
- push_val (st->stack, ScriptCode::INT, mob_db[mob_class].max_hp);
+ push_val(st->stack, ScriptCode::INT, mob_db[mob_class].max_hp);
else if (num == 5)
- push_val (st->stack, ScriptCode::INT, mob_db[mob_class].max_sp);
+ push_val(st->stack, ScriptCode::INT, mob_db[mob_class].max_sp);
else if (num == 6)
- push_val (st->stack, ScriptCode::INT, mob_db[mob_class].base_exp);
+ push_val(st->stack, ScriptCode::INT, mob_db[mob_class].base_exp);
else if (num == 7)
- push_val (st->stack, ScriptCode::INT, mob_db[mob_class].job_exp);
+ push_val(st->stack, ScriptCode::INT, mob_db[mob_class].job_exp);
}
/*==========================================
* IDからItem名
*------------------------------------------
*/
-void builtin_getitemname (ScriptState *st)
+void builtin_getitemname(ScriptState *st)
{
struct item_data *i_data;
char *item_name;
struct script_data *data;
data = &(st->stack->stack_data[st->start + 2]);
- get_val (st, data);
+ get_val(st, data);
if (data->type == ScriptCode::STR || data->type == ScriptCode::CONSTSTR)
{
- const char *name = conv_str (st, data);
- i_data = itemdb_searchname (name);
+ const char *name = conv_str(st, data);
+ i_data = itemdb_searchname(name);
}
else
{
- int item_id = conv_num (st, data);
- i_data = itemdb_search (item_id);
+ int item_id = conv_num(st, data);
+ i_data = itemdb_search(item_id);
}
- item_name = (char *) calloc (24, 1);
+ item_name = (char *) calloc(24, 1);
if (i_data)
- strncpy (item_name, i_data->jname, 23);
+ strncpy(item_name, i_data->jname, 23);
else
- strncpy (item_name, "Unknown Item", 23);
+ strncpy(item_name, "Unknown Item", 23);
- push_str (st->stack, ScriptCode::STR, item_name);
+ push_str(st->stack, ScriptCode::STR, item_name);
}
-void builtin_getspellinvocation (ScriptState *st)
+void builtin_getspellinvocation(ScriptState *st)
{
- const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2]));
- const char *invocation = magic_find_invocation (name);
+ const char *invocation = magic_find_invocation(name);
if (!invocation)
invocation = "...";
- push_str (st->stack, ScriptCode::STR, strdup (invocation));
+ push_str(st->stack, ScriptCode::STR, strdup(invocation));
}
-void builtin_getanchorinvocation (ScriptState *st)
+void builtin_getanchorinvocation(ScriptState *st)
{
- const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2]));
- const char *invocation = magic_find_anchor_invocation (name);
+ const char *invocation = magic_find_anchor_invocation(name);
if (!invocation)
invocation = "...";
- push_str (st->stack, ScriptCode::STR, strdup (invocation));
+ push_str(st->stack, ScriptCode::STR, strdup(invocation));
}
-void builtin_getpartnerid (ScriptState *st)
+void builtin_getpartnerid(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
- push_val (st->stack, ScriptCode::INT, sd->status.partner_id);
+ push_val(st->stack, ScriptCode::INT, sd->status.partner_id);
}
/*==========================================
* PCの所持品情報読み取り
*------------------------------------------
*/
-void builtin_getinventorylist (ScriptState *st)
+void builtin_getinventorylist(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i, j = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i, j = 0;
if (!sd)
return;
for (i = 0; i < MAX_INVENTORY; i++)
@@ -5559,185 +5538,185 @@ void builtin_getinventorylist (ScriptState *st)
if (sd->status.inventory[i].nameid > 0
&& sd->status.inventory[i].amount > 0)
{
- pc_setreg (sd, add_str ("@inventorylist_id") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_id") + (j << 24),
sd->status.inventory[i].nameid);
- pc_setreg (sd, add_str ("@inventorylist_amount") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_amount") + (j << 24),
sd->status.inventory[i].amount);
- pc_setreg (sd, add_str ("@inventorylist_equip") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_equip") + (j << 24),
sd->status.inventory[i].equip);
- pc_setreg (sd, add_str ("@inventorylist_refine") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_refine") + (j << 24),
sd->status.inventory[i].refine);
- pc_setreg (sd, add_str ("@inventorylist_identify") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_identify") + (j << 24),
sd->status.inventory[i].identify);
- pc_setreg (sd, add_str ("@inventorylist_attribute") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_attribute") + (j << 24),
sd->status.inventory[i].attribute);
- pc_setreg (sd, add_str ("@inventorylist_card1") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_card1") + (j << 24),
sd->status.inventory[i].card[0]);
- pc_setreg (sd, add_str ("@inventorylist_card2") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_card2") + (j << 24),
sd->status.inventory[i].card[1]);
- pc_setreg (sd, add_str ("@inventorylist_card3") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_card3") + (j << 24),
sd->status.inventory[i].card[2]);
- pc_setreg (sd, add_str ("@inventorylist_card4") + (j << 24),
+ pc_setreg(sd, add_str("@inventorylist_card4") + (j << 24),
sd->status.inventory[i].card[3]);
j++;
}
}
- pc_setreg (sd, add_str ("@inventorylist_count"), j);
+ pc_setreg(sd, add_str("@inventorylist_count"), j);
}
-void builtin_getskilllist (ScriptState *st)
+void builtin_getskilllist(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i, j = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i, j = 0;
if (!sd)
return;
for (i = 0; i < MAX_SKILL; i++)
{
if (sd->status.skill[i].id > 0 && sd->status.skill[i].lv > 0)
{
- pc_setreg (sd, add_str ("@skilllist_id") + (j << 24),
+ pc_setreg(sd, add_str("@skilllist_id") + (j << 24),
sd->status.skill[i].id);
- pc_setreg (sd, add_str ("@skilllist_lv") + (j << 24),
+ pc_setreg(sd, add_str("@skilllist_lv") + (j << 24),
sd->status.skill[i].lv);
- pc_setreg (sd, add_str ("@skilllist_flag") + (j << 24),
+ pc_setreg(sd, add_str("@skilllist_flag") + (j << 24),
sd->status.skill[i].flags);
j++;
}
}
- pc_setreg (sd, add_str ("@skilllist_count"), j);
+ pc_setreg(sd, add_str("@skilllist_count"), j);
}
-void builtin_get_activated_pool_skills (ScriptState *st)
+void builtin_get_activated_pool_skills(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int pool_skills[MAX_SKILL_POOL];
- int skill_pool_size = skill_pool (sd, pool_skills);
- int i, count = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int pool_skills[MAX_SKILL_POOL];
+ int skill_pool_size = skill_pool(sd, pool_skills);
+ int i, count = 0;
if (!sd)
return;
for (i = 0; i < skill_pool_size; i++)
{
- int skill_id = pool_skills[i];
+ int skill_id = pool_skills[i];
if (sd->status.skill[skill_id].id == skill_id)
{
- pc_setreg (sd, add_str ("@skilllist_id") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_id") + (count << 24),
sd->status.skill[skill_id].id);
- pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_lv") + (count << 24),
sd->status.skill[skill_id].lv);
- pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_flag") + (count << 24),
sd->status.skill[skill_id].flags);
- pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24),
- skill_name (skill_id));
+ pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24),
+ skill_name(skill_id));
++count;
}
}
- pc_setreg (sd, add_str ("@skilllist_count"), count);
+ pc_setreg(sd, add_str("@skilllist_count"), count);
}
extern int skill_pool_skills[];
extern int skill_pool_skills_size;
-void builtin_get_unactivated_pool_skills (ScriptState *st)
+void builtin_get_unactivated_pool_skills(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i, count = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i, count = 0;
if (!sd)
return;
for (i = 0; i < skill_pool_skills_size; i++)
{
- int skill_id = skill_pool_skills[i];
+ int skill_id = skill_pool_skills[i];
if (sd->status.skill[skill_id].id == skill_id && !(sd->status.skill[skill_id].flags & SKILL_POOL_ACTIVATED))
{
- pc_setreg (sd, add_str ("@skilllist_id") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_id") + (count << 24),
sd->status.skill[skill_id].id);
- pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_lv") + (count << 24),
sd->status.skill[skill_id].lv);
- pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_flag") + (count << 24),
sd->status.skill[skill_id].flags);
- pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24),
- skill_name (skill_id));
+ pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24),
+ skill_name(skill_id));
++count;
}
}
- pc_setreg (sd, add_str ("@skilllist_count"), count);
+ pc_setreg(sd, add_str("@skilllist_count"), count);
}
-void builtin_get_pool_skills (ScriptState *st)
+void builtin_get_pool_skills(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i, count = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i, count = 0;
if (!sd)
return;
for (i = 0; i < skill_pool_skills_size; i++)
{
- int skill_id = skill_pool_skills[i];
+ int skill_id = skill_pool_skills[i];
if (sd->status.skill[skill_id].id == skill_id)
{
- pc_setreg (sd, add_str ("@skilllist_id") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_id") + (count << 24),
sd->status.skill[skill_id].id);
- pc_setreg (sd, add_str ("@skilllist_lv") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_lv") + (count << 24),
sd->status.skill[skill_id].lv);
- pc_setreg (sd, add_str ("@skilllist_flag") + (count << 24),
+ pc_setreg(sd, add_str("@skilllist_flag") + (count << 24),
sd->status.skill[skill_id].flags);
- pc_setregstr (sd, add_str ("@skilllist_name$") + (count << 24),
- skill_name (skill_id));
+ pc_setregstr(sd, add_str("@skilllist_name$") + (count << 24),
+ skill_name(skill_id));
++count;
}
}
- pc_setreg (sd, add_str ("@skilllist_count"), count);
+ pc_setreg(sd, add_str("@skilllist_count"), count);
}
-void builtin_activate_pool_skill (ScriptState *st)
+void builtin_activate_pool_skill(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ struct map_session_data *sd = script_rid2sd(st);
+ int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- skill_pool_activate (sd, skill_id);
- clif_skillinfoblock (sd);
+ skill_pool_activate(sd, skill_id);
+ clif_skillinfoblock(sd);
}
-void builtin_deactivate_pool_skill (ScriptState *st)
+void builtin_deactivate_pool_skill(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ struct map_session_data *sd = script_rid2sd(st);
+ int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- skill_pool_deactivate (sd, skill_id);
- clif_skillinfoblock (sd);
+ skill_pool_deactivate(sd, skill_id);
+ clif_skillinfoblock(sd);
}
-void builtin_check_pool_skill (ScriptState *st)
+void builtin_check_pool_skill(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int skill_id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ struct map_session_data *sd = script_rid2sd(st);
+ int skill_id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
- push_val (st->stack, ScriptCode::INT, skill_pool_is_activated (sd, skill_id));
+ push_val(st->stack, ScriptCode::INT, skill_pool_is_activated(sd, skill_id));
}
-void builtin_clearitem (ScriptState *st)
+void builtin_clearitem(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i;
if (sd == NULL)
return;
for (i = 0; i < MAX_INVENTORY; i++)
{
if (sd->status.inventory[i].amount)
- pc_delitem (sd, i, sd->status.inventory[i].amount, 0);
+ pc_delitem(sd, i, sd->status.inventory[i].amount, 0);
}
}
@@ -5747,17 +5726,17 @@ void builtin_clearitem (ScriptState *st)
* typeは通常0なのかな？
*------------------------------------------
*/
-void builtin_classchange (ScriptState *st)
+void builtin_classchange(ScriptState *st)
{
- int npc_class, type;
- struct block_list *bl = map_id2bl (st->oid);
+ int npc_class, type;
+ struct block_list *bl = map_id2bl(st->oid);
if (bl == NULL)
return;
- npc_class = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- type = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- clif_npc_class_change (bl, npc_class, type);
+ npc_class = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ clif_npc_class_change(bl, npc_class, type);
}
/*==========================================
@@ -5771,46 +5750,46 @@ void builtin_classchange (ScriptState *st)
* the current NPC or invoking PC.
*------------------------------------------
*/
-void builtin_misceffect (ScriptState *st)
+void builtin_misceffect(ScriptState *st)
{
- int type;
- int id = 0;
+ int type;
+ int id = 0;
const char *name = NULL;
struct block_list *bl = NULL;
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (st->end > st->start + 3)
{
struct script_data *sdata = &(st->stack->stack_data[st->start + 3]);
- get_val (st, sdata);
+ get_val(st, sdata);
if (sdata->type == ScriptCode::STR || sdata->type == ScriptCode::CONSTSTR)
- name = conv_str (st, sdata);
+ name = conv_str(st, sdata);
else
- id = conv_num (st, sdata);
+ id = conv_num(st, sdata);
}
if (name)
{
- struct map_session_data *sd = map_nick2sd (name);
+ struct map_session_data *sd = map_nick2sd(name);
if (sd)
bl = &sd->bl;
}
else if (id)
- bl = map_id2bl (id);
+ bl = map_id2bl(id);
else if (st->oid)
- bl = map_id2bl (st->oid);
+ bl = map_id2bl(st->oid);
else
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
if (sd)
bl = &sd->bl;
}
if (bl)
- clif_misceffect (bl, type);
+ clif_misceffect(bl, type);
}
@@ -5818,20 +5797,20 @@ void builtin_misceffect (ScriptState *st)
* サウンドエフェクト
*------------------------------------------
*/
-void builtin_soundeffect (ScriptState *st)
+void builtin_soundeffect(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int type = 0;
+ struct map_session_data *sd = script_rid2sd(st);
+ int type = 0;
- const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- type = conv_num (st, &(st->stack->stack_data[st->start + 3]));
+ const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 3]));
if (sd)
{
if (st->oid)
- clif_soundeffect (sd, map_id2bl (st->oid), name, type);
+ clif_soundeffect(sd, map_id2bl(st->oid), name, type);
else
{
- clif_soundeffect (sd, &sd->bl, name, type);
+ clif_soundeffect(sd, &sd->bl, name, type);
}
}
}
@@ -5840,16 +5819,16 @@ void builtin_soundeffect (ScriptState *st)
* NPC skill effects [Valaris]
*------------------------------------------
*/
-void builtin_npcskilleffect (ScriptState *st)
+void builtin_npcskilleffect(ScriptState *st)
{
- struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid);
+ struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid);
- int skillid = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- int skilllv = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- int x = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- int y = conv_num (st, &(st->stack->stack_data[st->start + 5]));
+ int skillid = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ int skilllv = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ int x = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ int y = conv_num(st, &(st->stack->stack_data[st->start + 5]));
- clif_skill_poseffect (&nd->bl, skillid, skilllv, x, y, gettick ());
+ clif_skill_poseffect(&nd->bl, skillid, skilllv, x, y, gettick());
}
@@ -5857,29 +5836,29 @@ void builtin_npcskilleffect (ScriptState *st)
* Special effects [Valaris]
*------------------------------------------
*/
-void builtin_specialeffect (ScriptState *st)
+void builtin_specialeffect(ScriptState *st)
{
- struct block_list *bl = map_id2bl (st->oid);
+ struct block_list *bl = map_id2bl(st->oid);
if (bl == NULL)
return;
- clif_specialeffect (bl,
- conv_num (st,
+ clif_specialeffect(bl,
+ conv_num(st,
&(st->stack->stack_data[st->start + 2])),
0);
}
-void builtin_specialeffect2 (ScriptState *st)
+void builtin_specialeffect2(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
if (sd == NULL)
return;
- clif_specialeffect (&sd->bl,
- conv_num (st,
+ clif_specialeffect(&sd->bl,
+ conv_num(st,
&(st->stack->stack_data[st->start + 2])),
0);
@@ -5890,18 +5869,18 @@ void builtin_specialeffect2 (ScriptState *st)
*------------------------------------------
*/
-void builtin_nude (ScriptState *st)
+void builtin_nude(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
- int i;
+ struct map_session_data *sd = script_rid2sd(st);
+ int i;
if (sd == NULL)
return;
for (i = 0; i < 11; i++)
if (sd->equip_index[i] >= 0)
- pc_unequipitem (sd, sd->equip_index[i], i);
- pc_calcstatus (sd, 0);
+ pc_unequipitem(sd, sd->equip_index[i], i);
+ pc_calcstatus(sd, 0);
}
@@ -5910,18 +5889,18 @@ void builtin_nude (ScriptState *st)
*------------------------------------------
*/
-void builtin_unequip_by_id (ScriptState *st)
+void builtin_unequip_by_id(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
if (sd == NULL)
return;
- int slot_id = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ int slot_id = conv_num(st, &(st->stack->stack_data[st->start + 2]));
if (slot_id >= 0 && slot_id < 11 && sd->equip_index[slot_id] >= 0)
- pc_unequipitem (sd, sd->equip_index[slot_id], slot_id);
+ pc_unequipitem(sd, sd->equip_index[slot_id], slot_id);
- pc_calcstatus (sd, 0);
+ pc_calcstatus(sd, 0);
}
@@ -5932,14 +5911,14 @@ void builtin_unequip_by_id (ScriptState *st)
*------------------------------------------
*/
-void builtin_gmcommand (ScriptState *st)
+void builtin_gmcommand(ScriptState *st)
{
struct map_session_data *sd;
- sd = script_rid2sd (st);
- const char *cmd = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ sd = script_rid2sd(st);
+ const char *cmd = conv_str(st, &(st->stack->stack_data[st->start + 2]));
- is_atcommand (sd->fd, sd, cmd, 99);
+ is_atcommand(sd->fd, sd, cmd, 99);
}
@@ -5948,17 +5927,17 @@ void builtin_gmcommand (ScriptState *st)
*------------------------------------------
*/
-void builtin_movenpc (ScriptState *st)
+void builtin_movenpc(ScriptState *st)
{
struct map_session_data *sd;
- int x, y;
+ int x, y;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 5]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 5]));
}
@@ -5967,15 +5946,15 @@ void builtin_movenpc (ScriptState *st)
* Move NPC to a new position on the same map.
*------------------------------------------
*/
-void builtin_npcwarp (ScriptState *st)
+void builtin_npcwarp(ScriptState *st)
{
- int x, y;
+ int x, y;
struct npc_data *nd = NULL;
- x = conv_num (st, &(st->stack->stack_data[st->start + 2]));
- y = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- const char *npc = conv_str (st, &(st->stack->stack_data[st->start + 4]));
- nd = npc_name2id (npc);
+ x = conv_num(st, &(st->stack->stack_data[st->start + 2]));
+ y = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ const char *npc = conv_str(st, &(st->stack->stack_data[st->start + 4]));
+ nd = npc_name2id(npc);
if (!nd)
return;
@@ -5988,12 +5967,12 @@ void builtin_npcwarp (ScriptState *st)
|| y < 0 || y > map[m].ys - 1)
return;
- npc_enable (npc, 0);
+ npc_enable(npc, 0);
map_delblock(&nd->bl); /* [Freeyorp] */
nd->bl.x = x;
nd->bl.y = y;
map_addblock(&nd->bl);
- npc_enable (npc, 1);
+ npc_enable(npc, 1);
}
@@ -6002,16 +5981,16 @@ void builtin_npcwarp (ScriptState *st)
*------------------------------------------
*/
-void builtin_message (ScriptState *st)
+void builtin_message(ScriptState *st)
{
struct map_session_data *pl_sd = NULL;
- const char *player = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *msg = conv_str (st, &(st->stack->stack_data[st->start + 3]));
+ const char *player = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *msg = conv_str(st, &(st->stack->stack_data[st->start + 3]));
- if ((pl_sd = map_nick2sd ((char *) player)) == NULL)
+ if ((pl_sd = map_nick2sd((char *) player)) == NULL)
return;
- clif_displaymessage (pl_sd->fd, msg);
+ clif_displaymessage(pl_sd->fd, msg);
}
@@ -6021,19 +6000,19 @@ void builtin_message (ScriptState *st)
*------------------------------------------
*/
-void builtin_npctalk (ScriptState *st)
+void builtin_npctalk(ScriptState *st)
{
char message[255];
- struct npc_data *nd = (struct npc_data *) map_id2bl (st->oid);
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
+ struct npc_data *nd = (struct npc_data *) map_id2bl(st->oid);
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
if (nd)
{
- memcpy (message, nd->name, 24);
- strcat (message, " : ");
- strcat (message, str);
- clif_message (&(nd->bl), message);
+ memcpy(message, nd->name, 24);
+ strcat(message, " : ");
+ strcat(message, str);
+ clif_message(&(nd->bl), message);
}
}
@@ -6045,23 +6024,23 @@ void builtin_npctalk (ScriptState *st)
*------------------------------------------
*/
-void builtin_hasitems (ScriptState *st)
+void builtin_hasitems(ScriptState *st)
{
- int i;
+ int i;
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
for (i = 0; i < MAX_INVENTORY; i++)
{
if (sd->status.inventory[i].amount)
{
- push_val (st->stack, ScriptCode::INT, 1);
+ push_val(st->stack, ScriptCode::INT, 1);
return;
}
}
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
@@ -6069,13 +6048,13 @@ void builtin_hasitems (ScriptState *st)
* getlook char info. getlook(arg)
*------------------------------------------
*/
-void builtin_getlook (ScriptState *st)
+void builtin_getlook(ScriptState *st)
{
- int type, val;
+ int type, val;
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
val = -1;
switch (type)
{
@@ -6107,37 +6086,37 @@ void builtin_getlook (ScriptState *st)
break;
}
- push_val (st->stack, ScriptCode::INT, val);
+ push_val(st->stack, ScriptCode::INT, val);
}
/*==========================================
* get char save point. argument: 0- map name, 1- x, 2- y
*------------------------------------------
*/
-void builtin_getsavepoint (ScriptState *st)
+void builtin_getsavepoint(ScriptState *st)
{
- int x, y, type;
+ int x, y, type;
char *mapname;
struct map_session_data *sd;
- sd = script_rid2sd (st);
+ sd = script_rid2sd(st);
- type = conv_num (st, &(st->stack->stack_data[st->start + 2]));
+ type = conv_num(st, &(st->stack->stack_data[st->start + 2]));
x = sd->status.save_point.x;
y = sd->status.save_point.y;
switch (type)
{
case 0:
- mapname = (char*)calloc (24, 1);
- strncpy (mapname, sd->status.save_point.map, 23);
- push_str (st->stack, ScriptCode::STR, mapname);
+ mapname = (char*)calloc(24, 1);
+ strncpy(mapname, sd->status.save_point.map, 23);
+ push_str(st->stack, ScriptCode::STR, mapname);
break;
case 1:
- push_val (st->stack, ScriptCode::INT, x);
+ push_val(st->stack, ScriptCode::INT, x);
break;
case 2:
- push_val (st->stack, ScriptCode::INT, y);
+ push_val(st->stack, ScriptCode::INT, y);
break;
}
}
@@ -6147,32 +6126,32 @@ void builtin_getsavepoint (ScriptState *st)
*------------------------------------------
*/
static
-void builtin_areatimer_sub (struct block_list *bl, va_list ap)
+void builtin_areatimer_sub(struct block_list *bl, va_list ap)
{
- int tick;
+ int tick;
char *event;
- tick = va_arg (ap, int);
- event = va_arg (ap, char *);
- pc_addeventtimer ((struct map_session_data *) bl, tick, event);
+ tick = va_arg(ap, int);
+ event = va_arg(ap, char *);
+ pc_addeventtimer((struct map_session_data *) bl, tick, event);
}
-void builtin_areatimer (ScriptState *st)
+void builtin_areatimer(ScriptState *st)
{
- int tick, m;
- int x0, y0, x1, y1;
+ int tick, m;
+ int x0, y0, x1, y1;
- const char *mapname = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x0 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y0 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
- tick = conv_num (st, &(st->stack->stack_data[st->start + 7]));
- const char *event = conv_str (st, &(st->stack->stack_data[st->start + 8]));
+ const char *mapname = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x0 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y0 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
+ tick = conv_num(st, &(st->stack->stack_data[st->start + 7]));
+ const char *event = conv_str(st, &(st->stack->stack_data[st->start + 8]));
- if ((m = map_mapname2mapid (mapname)) < 0)
+ if ((m = map_mapname2mapid(mapname)) < 0)
return;
- map_foreachinarea (builtin_areatimer_sub,
+ map_foreachinarea(builtin_areatimer_sub,
m, x0, y0, x1, y1, BL_PC, tick, event);
}
@@ -6180,77 +6159,77 @@ void builtin_areatimer (ScriptState *st)
* Check whether the PC is in the specified rectangle
*------------------------------------------
*/
-void builtin_isin (ScriptState *st)
+void builtin_isin(ScriptState *st)
{
- int x1, y1, x2, y2;
- struct map_session_data *sd = script_rid2sd (st);
+ int x1, y1, x2, y2;
+ struct map_session_data *sd = script_rid2sd(st);
- const char *str = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- x1 = conv_num (st, &(st->stack->stack_data[st->start + 3]));
- y1 = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- x2 = conv_num (st, &(st->stack->stack_data[st->start + 5]));
- y2 = conv_num (st, &(st->stack->stack_data[st->start + 6]));
+ const char *str = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ x1 = conv_num(st, &(st->stack->stack_data[st->start + 3]));
+ y1 = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ x2 = conv_num(st, &(st->stack->stack_data[st->start + 5]));
+ y2 = conv_num(st, &(st->stack->stack_data[st->start + 6]));
if (!sd)
return;
- push_val (st->stack, ScriptCode::INT,
+ push_val(st->stack, ScriptCode::INT,
(sd->bl.x >= x1 && sd->bl.x <= x2)
&& (sd->bl.y >= y1 && sd->bl.y <= y2)
- && (!strcmp (str, map[sd->bl.m].name)));
+ && (!strcmp(str, map[sd->bl.m].name)));
}
// Trigger the shop on a (hopefully) nearby shop NPC
-void builtin_shop (ScriptState *st)
+void builtin_shop(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
struct npc_data *nd;
if (!sd)
return;
- nd = npc_name2id (conv_str (st, &(st->stack->stack_data[st->start + 2])));
+ nd = npc_name2id(conv_str(st, &(st->stack->stack_data[st->start + 2])));
if (!nd)
return;
- builtin_close (st);
- clif_npcbuysell (sd, nd->bl.id);
+ builtin_close(st);
+ clif_npcbuysell(sd, nd->bl.id);
}
/*==========================================
* Check whether the PC is dead
*------------------------------------------
*/
-void builtin_isdead (ScriptState *st)
+void builtin_isdead(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
- push_val (st->stack, ScriptCode::INT, pc_isdead (sd));
+ push_val(st->stack, ScriptCode::INT, pc_isdead(sd));
}
/*========================================
* Changes a NPC name, and sprite
*----------------------------------------
*/
-void builtin_fakenpcname (ScriptState *st)
+void builtin_fakenpcname(ScriptState *st)
{
- int newsprite;
+ int newsprite;
struct npc_data *nd;
- const char *name = conv_str (st, &(st->stack->stack_data[st->start + 2]));
- const char *newname = conv_str (st, &(st->stack->stack_data[st->start + 3]));
- newsprite = conv_num (st, &(st->stack->stack_data[st->start + 4]));
- nd = npc_name2id (name);
+ const char *name = conv_str(st, &(st->stack->stack_data[st->start + 2]));
+ const char *newname = conv_str(st, &(st->stack->stack_data[st->start + 3]));
+ newsprite = conv_num(st, &(st->stack->stack_data[st->start + 4]));
+ nd = npc_name2id(name);
if (!nd)
return;
- strncpy (nd->name, newname, sizeof(nd->name)-1);
+ strncpy(nd->name, newname, sizeof(nd->name)-1);
nd->name[sizeof(nd->name)-1] = '\0';
nd->npc_class = newsprite;
// Refresh this npc
- npc_enable (name, 0);
- npc_enable (name, 1);
+ npc_enable(name, 0);
+ npc_enable(name, 1);
}
@@ -6259,33 +6238,33 @@ void builtin_fakenpcname (ScriptState *st)
*----------------------------
*/
-void builtin_getx (ScriptState *st)
+void builtin_getx(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
- push_val (st->stack, ScriptCode::INT, sd->bl.x);
+ push_val(st->stack, ScriptCode::INT, sd->bl.x);
}
/*============================
* Gets the PC's y pos
*----------------------------
*/
-void builtin_gety (ScriptState *st)
+void builtin_gety(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
- push_val (st->stack, ScriptCode::INT, sd->bl.y);
+ push_val(st->stack, ScriptCode::INT, sd->bl.y);
}
/*
* Get the PC's current map's name
*/
-void builtin_getmap (ScriptState *st)
+void builtin_getmap(ScriptState *st)
{
- struct map_session_data *sd = script_rid2sd (st);
+ struct map_session_data *sd = script_rid2sd(st);
// A map_data lives essentially forever.
- push_str (st->stack, ScriptCode::CONSTSTR, map[sd->bl.m].name);
+ push_str(st->stack, ScriptCode::CONSTSTR, map[sd->bl.m].name);
}
//
@@ -6296,7 +6275,7 @@ void builtin_getmap (ScriptState *st)
*------------------------------------------
*/
static
-ScriptCode get_com (const ScriptCode *script, int *pos_)
+ScriptCode get_com(const ScriptCode *script, int *pos_)
{
if (static_cast<uint8_t>(script[*pos_]) >= 0x80)
{
@@ -6310,10 +6289,10 @@ ScriptCode get_com (const ScriptCode *script, int *pos_)
*------------------------------------------
*/
static
-int get_num (const ScriptCode *scr, int *pos_)
+int get_num(const ScriptCode *scr, int *pos_)
{
const uint8_t *script = reinterpret_cast<const uint8_t *>(scr);
- int i, j;
+ int i, j;
i = 0;
j = 0;
while (script[*pos_] >= 0xc0)
@@ -6329,12 +6308,12 @@ int get_num (const ScriptCode *scr, int *pos_)
*------------------------------------------
*/
static
-int pop_val (ScriptState *st)
+int pop_val(ScriptState *st)
{
if (st->stack->sp <= 0)
return 0;
st->stack->sp--;
- get_val (st, &(st->stack->stack_data[st->stack->sp]));
+ get_val(st, &(st->stack->stack_data[st->stack->sp]));
if (st->stack->stack_data[st->stack->sp].type == ScriptCode::INT)
return st->stack->stack_data[st->stack->sp].u.num;
return 0;
@@ -6347,17 +6326,17 @@ int pop_val (ScriptState *st)
*------------------------------------------
*/
static
-void op_add (ScriptState *st)
+void op_add(ScriptState *st)
{
st->stack->sp--;
- get_val (st, &(st->stack->stack_data[st->stack->sp]));
- get_val (st, &(st->stack->stack_data[st->stack->sp - 1]));
+ get_val(st, &(st->stack->stack_data[st->stack->sp]));
+ get_val(st, &(st->stack->stack_data[st->stack->sp - 1]));
- if (isstr (st->stack->stack_data[st->stack->sp])
- || isstr (st->stack->stack_data[st->stack->sp - 1]))
+ if (isstr(st->stack->stack_data[st->stack->sp])
+ || isstr(st->stack->stack_data[st->stack->sp - 1]))
{
- conv_str (st, &(st->stack->stack_data[st->stack->sp]));
- conv_str (st, &(st->stack->stack_data[st->stack->sp - 1]));
+ conv_str(st, &(st->stack->stack_data[st->stack->sp]));
+ conv_str(st, &(st->stack->stack_data[st->stack->sp - 1]));
}
if (st->stack->stack_data[st->stack->sp].type == ScriptCode::INT)
{ // ii
@@ -6368,11 +6347,11 @@ void op_add (ScriptState *st)
{ // ssの予定
char *buf;
buf = (char *)
- calloc (strlen (st->stack->stack_data[st->stack->sp - 1].u.str) +
- strlen (st->stack->stack_data[st->stack->sp].u.str) + 1,
+ calloc(strlen(st->stack->stack_data[st->stack->sp - 1].u.str) +
+ strlen(st->stack->stack_data[st->stack->sp].u.str) + 1,
1);
- strcpy (buf, st->stack->stack_data[st->stack->sp - 1].u.str);
- strcat (buf, st->stack->stack_data[st->stack->sp].u.str);
+ strcpy(buf, st->stack->stack_data[st->stack->sp - 1].u.str);
+ strcat(buf, st->stack->stack_data[st->stack->sp].u.str);
if (st->stack->stack_data[st->stack->sp - 1].type == ScriptCode::STR)
free(const_cast<char *>(st->stack->stack_data[st->stack->sp - 1].u.str));
if (st->stack->stack_data[st->stack->sp].type == ScriptCode::STR)
@@ -6387,38 +6366,38 @@ void op_add (ScriptState *st)
*------------------------------------------
*/
static
-void op_2str (ScriptState *st, ScriptCode op, int sp1, int sp2)
+void op_2str(ScriptState *st, ScriptCode op, int sp1, int sp2)
{
const char *s1 = st->stack->stack_data[sp1].u.str;
const char *s2 = st->stack->stack_data[sp2].u.str;
- int a = 0;
+ int a = 0;
switch (op)
{
case ScriptCode::EQ:
- a = (strcmp (s1, s2) == 0);
+ a = (strcmp(s1, s2) == 0);
break;
case ScriptCode::NE:
- a = (strcmp (s1, s2) != 0);
+ a = (strcmp(s1, s2) != 0);
break;
case ScriptCode::GT:
- a = (strcmp (s1, s2) > 0);
+ a = (strcmp(s1, s2) > 0);
break;
case ScriptCode::GE:
- a = (strcmp (s1, s2) >= 0);
+ a = (strcmp(s1, s2) >= 0);
break;
case ScriptCode::LT:
- a = (strcmp (s1, s2) < 0);
+ a = (strcmp(s1, s2) < 0);
break;
case ScriptCode::LE:
- a = (strcmp (s1, s2) <= 0);
+ a = (strcmp(s1, s2) <= 0);
break;
default:
- printf ("illegal string operater\n");
+ printf("illegal string operater\n");
break;
}
- push_val (st->stack, ScriptCode::INT, a);
+ push_val(st->stack, ScriptCode::INT, a);
if (st->stack->stack_data[sp1].type == ScriptCode::STR)
free(const_cast<char *>(s1));
@@ -6431,7 +6410,7 @@ void op_2str (ScriptState *st, ScriptCode op, int sp1, int sp2)
*------------------------------------------
*/
static
-void op_2num (ScriptState *st, ScriptCode op, int i1, int i2)
+void op_2num(ScriptState *st, ScriptCode op, int i1, int i2)
{
switch (op)
{
@@ -6487,7 +6466,7 @@ void op_2num (ScriptState *st, ScriptCode op, int i1, int i2)
i1 = i1 << i2;
break;
}
- push_val (st->stack, ScriptCode::INT, i1);
+ push_val(st->stack, ScriptCode::INT, i1);
}
/*==========================================
@@ -6495,34 +6474,34 @@ void op_2num (ScriptState *st, ScriptCode op, int i1, int i2)
*------------------------------------------
*/
static
-void op_2 (ScriptState *st, ScriptCode op)
+void op_2(ScriptState *st, ScriptCode op)
{
- int i1, i2;
+ int i1, i2;
const char *s1 = NULL, *s2 = NULL;
- i2 = pop_val (st);
- if (isstr (st->stack->stack_data[st->stack->sp]))
+ i2 = pop_val(st);
+ if (isstr(st->stack->stack_data[st->stack->sp]))
s2 = st->stack->stack_data[st->stack->sp].u.str;
- i1 = pop_val (st);
- if (isstr (st->stack->stack_data[st->stack->sp]))
+ i1 = pop_val(st);
+ if (isstr(st->stack->stack_data[st->stack->sp]))
s1 = st->stack->stack_data[st->stack->sp].u.str;
if (s1 != NULL && s2 != NULL)
{
// ss => op_2str
- op_2str (st, op, st->stack->sp, st->stack->sp + 1);
+ op_2str(st, op, st->stack->sp, st->stack->sp + 1);
}
else if (s1 == NULL && s2 == NULL)
{
// ii => op_2num
- op_2num (st, op, i1, i2);
+ op_2num(st, op, i1, i2);
}
else
{
// si,is => error
- printf ("script: op_2: int&str, str&int not allow.");
- push_val (st->stack, ScriptCode::INT, 0);
+ printf("script: op_2: int&str, str&int not allow.");
+ push_val(st->stack, ScriptCode::INT, 0);
}
}
@@ -6531,10 +6510,10 @@ void op_2 (ScriptState *st, ScriptCode op)
*------------------------------------------
*/
static
-void op_1num (ScriptState *st, ScriptCode op)
+void op_1num(ScriptState *st, ScriptCode op)
{
- int i1;
- i1 = pop_val (st);
+ int i1;
+ i1 = pop_val(st);
switch (op)
{
case ScriptCode::NEG:
@@ -6547,16 +6526,16 @@ void op_1num (ScriptState *st, ScriptCode op)
i1 = !i1;
break;
}
- push_val (st->stack, ScriptCode::INT, i1);
+ push_val(st->stack, ScriptCode::INT, i1);
}
/*==========================================
* 関数の実行
*------------------------------------------
*/
-void run_func (ScriptState *st)
+void run_func(ScriptState *st)
{
- int i, start_sp, end_sp, func;
+ int i, start_sp, end_sp, func;
end_sp = st->stack->sp;
for (i = end_sp - 1; i >= 0 && st->stack->stack_data[i].type != ScriptCode::ARG;
@@ -6564,7 +6543,7 @@ void run_func (ScriptState *st)
if (i == 0)
{
if (battle_config.error_log)
- printf ("function not found\n");
+ printf("function not found\n");
// st->stack->sp=0;
st->state = END;
return;
@@ -6577,7 +6556,7 @@ void run_func (ScriptState *st)
if (st->stack->stack_data[st->start].type != ScriptCode::NAME
|| str_data[func].type != ScriptCode::FUNC)
{
- printf ("run_func: not function and command! \n");
+ printf("run_func: not function and command! \n");
// st->stack->sp=0;
st->state = END;
return;
@@ -6585,69 +6564,68 @@ void run_func (ScriptState *st)
#ifdef DEBUG_RUN
if (battle_config.etc_log)
{
- printf ("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str,
+ printf("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str,
func, str_data[func].type);
- printf ("stack dump :");
+ printf("stack dump :");
for (i = 0; i < end_sp; i++)
{
switch (st->stack->stack_data[i].type)
{
case ScriptCode::INT:
- printf (" int(%d)", st->stack->stack_data[i].u.num);
+ printf(" int(%d)", st->stack->stack_data[i].u.num);
break;
case ScriptCode::NAME:
- printf (" name(%s)",
+ printf(" name(%s)",
str_buf +
str_data[st->stack->stack_data[i].u.num].str);
break;
case ScriptCode::ARG:
- printf (" arg");
+ printf(" arg");
break;
case ScriptCode::POS:
- printf (" pos(%d)", st->stack->stack_data[i].u.num);
+ printf(" pos(%d)", st->stack->stack_data[i].u.num);
break;
default:
- printf (" %d,%d", st->stack->stack_data[i].type,
+ printf(" %d,%d", st->stack->stack_data[i].type,
st->stack->stack_data[i].u.num);
}
}
- printf ("\n");
+ printf("\n");
}
#endif
if (str_data[func].func)
{
- str_data[func].func (st);
+ str_data[func].func(st);
}
else
{
if (battle_config.error_log)
- printf ("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str,
+ printf("run_func : %s? (%d(%d))\n", str_buf + str_data[func].str,
func, str_data[func].type);
- push_val (st->stack, ScriptCode::INT, 0);
+ push_val(st->stack, ScriptCode::INT, 0);
}
- pop_stack (st->stack, start_sp, end_sp);
+ pop_stack(st->stack, start_sp, end_sp);
if (st->state == RETFUNC)
{
// ユーザー定義関数からの復帰
- int olddefsp = st->defsp;
+ int olddefsp = st->defsp;
- pop_stack (st->stack, st->defsp, start_sp); // 復帰に邪魔なスタック削除
+ pop_stack(st->stack, st->defsp, start_sp); // 復帰に邪魔なスタック削除
if (st->defsp < 4
|| st->stack->stack_data[st->defsp - 1].type != ScriptCode::RETINFO)
{
- printf
- ("script:run_func(return) return without callfunc or callsub!\n");
+ printf("script:run_func (return) return without callfunc or callsub!\n");
st->state = END;
return;
}
- i = conv_num (st, &(st->stack->stack_data[st->defsp - 4])); // 引数の数所得
- st->pos = conv_num (st, &(st->stack->stack_data[st->defsp - 1])); // スクリプト位置の復元
- st->script = (ScriptCode *) conv_num (st, &(st->stack->stack_data[st->defsp - 2])); // スクリプトを復元
- st->defsp = conv_num (st, &(st->stack->stack_data[st->defsp - 3])); // 基準スタックポインタを復元
+ i = conv_num(st, &(st->stack->stack_data[st->defsp - 4])); // 引数の数所得
+ st->pos = conv_num(st, &(st->stack->stack_data[st->defsp - 1])); // スクリプト位置の復元
+ st->script = (ScriptCode *) conv_num(st, &(st->stack->stack_data[st->defsp - 2])); // スクリプトを復元
+ st->defsp = conv_num(st, &(st->stack->stack_data[st->defsp - 3])); // 基準スタックポインタを復元
- pop_stack (st->stack, olddefsp - 4 - i, olddefsp); // 要らなくなったスタック(引数と復帰用データ)削除
+ pop_stack(st->stack, olddefsp - 4 - i, olddefsp); // 要らなくなったスタック(引数と復帰用データ)削除
st->state = GOTO;
}
@@ -6658,12 +6636,12 @@ void run_func (ScriptState *st)
*------------------------------------------
*/
static
-void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
+void run_script_main(const ScriptCode *script, int pos_, int rid, int oid,
ScriptState *st, const ScriptCode *rootscript)
{
int rerun_pos;
- int cmdcount = script_config.check_cmdcount;
- int gotocount = script_config.check_gotocount;
+ int cmdcount = script_config.check_cmdcount;
+ int gotocount = script_config.check_gotocount;
struct script_stack *stack = st->stack;
st->defsp = stack->sp;
@@ -6672,35 +6650,35 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
rerun_pos = st->pos;
for (st->state = 0; st->state == 0;)
{
- switch (ScriptCode c = get_com (script, &st->pos))
+ switch (ScriptCode c = get_com(script, &st->pos))
{
case ScriptCode::EOL:
if (stack->sp != st->defsp)
{
if (battle_config.error_log)
- printf ("stack.sp(%d) != default(%d)\n", stack->sp,
+ printf("stack.sp (%d) != default (%d)\n", stack->sp,
st->defsp);
stack->sp = st->defsp;
}
rerun_pos = st->pos;
break;
case ScriptCode::INT:
- push_val (stack, ScriptCode::INT, get_num (script, &st->pos));
+ push_val(stack, ScriptCode::INT, get_num(script, &st->pos));
break;
case ScriptCode::POS:
case ScriptCode::NAME:
- push_val (stack, c, (*(int *) (script + st->pos)) & 0xffffff);
+ push_val(stack, c, (*(int *)(script + st->pos)) & 0xffffff);
st->pos += 3;
break;
case ScriptCode::ARG:
- push_val (stack, c, 0);
+ push_val(stack, c, 0);
break;
case ScriptCode::STR:
- push_str (stack, ScriptCode::CONSTSTR, reinterpret_cast<const char *>(script + st->pos));
+ push_str(stack, ScriptCode::CONSTSTR, reinterpret_cast<const char *>(script + st->pos));
while (script[st->pos++] != ScriptCode::NOP);
break;
case ScriptCode::FUNC:
- run_func (st);
+ run_func(st);
if (st->state == GOTO)
{
rerun_pos = st->pos;
@@ -6708,14 +6686,14 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
st->state = 0;
if (gotocount > 0 && (--gotocount) <= 0)
{
- printf ("run_script: infinity loop !\n");
+ printf("run_script: infinity loop !\n");
st->state = END;
}
}
break;
case ScriptCode::ADD:
- op_add (st);
+ op_add(st);
break;
case ScriptCode::SUB:
@@ -6735,13 +6713,13 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
case ScriptCode::LOR:
case ScriptCode::R_SHIFT:
case ScriptCode::L_SHIFT:
- op_2 (st, c);
+ op_2(st, c);
break;
case ScriptCode::NEG:
case ScriptCode::NOT:
case ScriptCode::LNOT:
- op_1num (st, c);
+ op_1num(st, c);
break;
case ScriptCode::NOP:
@@ -6750,13 +6728,13 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
default:
if (battle_config.error_log)
- printf ("unknown command : %d @ %d\n", c, pos_);
+ printf("unknown command : %d @ %d\n", c, pos_);
st->state = END;
break;
}
if (cmdcount > 0 && (--cmdcount) <= 0)
{
- printf ("run_script: infinity loop !\n");
+ printf("run_script: infinity loop !\n");
st->state = END;
}
}
@@ -6766,10 +6744,10 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
break;
case END:
{
- struct map_session_data *sd = map_id2sd (st->rid);
+ struct map_session_data *sd = map_id2sd(st->rid);
st->pos = -1;
if (sd && sd->npc_id == st->oid)
- npc_event_dequeue (sd);
+ npc_event_dequeue(sd);
}
break;
case RERUNLINE:
@@ -6782,15 +6760,15 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
if (st->state != END)
{
// 再開するためにスタック情報を保存
- struct map_session_data *sd = map_id2sd (st->rid);
+ struct map_session_data *sd = map_id2sd(st->rid);
if (sd /* && sd->npc_stackbuf==NULL */ )
{
if (sd->npc_stackbuf)
- free (sd->npc_stackbuf);
+ free(sd->npc_stackbuf);
sd->npc_stackbuf = (char *)
- calloc (sizeof (stack->stack_data[0]) * stack->sp_max, 1);
- memcpy (sd->npc_stackbuf, stack->stack_data,
- sizeof (stack->stack_data[0]) * stack->sp_max);
+ calloc(sizeof(stack->stack_data[0]) * stack->sp_max, 1);
+ memcpy(sd->npc_stackbuf, stack->stack_data,
+ sizeof(stack->stack_data[0]) * stack->sp_max);
sd->npc_stack = stack->sp;
sd->npc_stackmax = stack->sp_max;
sd->npc_script = script;
@@ -6804,19 +6782,19 @@ void run_script_main (const ScriptCode *script, int pos_, int rid, int oid,
* スクリプトの実行
*------------------------------------------
*/
-int run_script (const ScriptCode *script, int pos_, int rid, int oid)
+int run_script(const ScriptCode *script, int pos_, int rid, int oid)
{
- return run_script_l (script, pos_, rid, oid, 0, NULL);
+ return run_script_l(script, pos_, rid, oid, 0, NULL);
}
-int run_script_l (const ScriptCode *script, int pos_, int rid, int oid,
+int run_script_l(const ScriptCode *script, int pos_, int rid, int oid,
int args_nr, argrec_t * args)
{
struct script_stack stack;
ScriptState st;
- struct map_session_data *sd = map_id2sd (rid);
+ struct map_session_data *sd = map_id2sd(rid);
const ScriptCode *rootscript = script;
- int i;
+ int i;
if (script == NULL || pos_ < 0)
return -1;
@@ -6827,10 +6805,10 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid,
stack.sp = sd->npc_stack;
stack.sp_max = sd->npc_stackmax;
stack.stack_data = (struct script_data *)
- calloc (stack.sp_max, sizeof (stack.stack_data[0]));
- memcpy (stack.stack_data, sd->npc_stackbuf,
- sizeof (stack.stack_data[0]) * stack.sp_max);
- free (sd->npc_stackbuf);
+ calloc(stack.sp_max, sizeof(stack.stack_data[0]));
+ memcpy(stack.stack_data, sd->npc_stackbuf,
+ sizeof(stack.stack_data[0]) * stack.sp_max);
+ free(sd->npc_stackbuf);
sd->npc_stackbuf = NULL;
}
else
@@ -6839,7 +6817,7 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid,
stack.sp = 0;
stack.sp_max = 64;
stack.stack_data = (struct script_data *)
- calloc (stack.sp_max, sizeof (stack.stack_data[0]));
+ calloc(stack.sp_max, sizeof(stack.stack_data[0]));
}
st.stack = &stack;
st.pos = pos_;
@@ -6847,14 +6825,14 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid,
st.oid = oid;
for (i = 0; i < args_nr; i++)
{
- if (args[i].name[strlen (args[i].name) - 1] == '$')
- pc_setregstr (sd, add_str (args[i].name), args[i].v.s);
+ if (args[i].name[strlen(args[i].name) - 1] == '$')
+ pc_setregstr(sd, add_str(args[i].name), args[i].v.s);
else
- pc_setreg (sd, add_str (args[i].name), args[i].v.i);
+ pc_setreg(sd, add_str(args[i].name), args[i].v.i);
}
- run_script_main (script, pos_, rid, oid, &st, rootscript);
+ run_script_main(script, pos_, rid, oid, &st, rootscript);
- free (stack.stack_data);
+ free(stack.stack_data);
stack.stack_data = NULL;
return st.pos;
}
@@ -6863,12 +6841,12 @@ int run_script_l (const ScriptCode *script, int pos_, int rid, int oid,
* マップ変数の変更
*------------------------------------------
*/
-void mapreg_setreg (int num, int val)
+void mapreg_setreg(int num, int val)
{
if (val != 0)
- numdb_insert (mapreg_db, num, val);
+ numdb_insert(mapreg_db, num, val);
else
- numdb_erase (mapreg_db, num);
+ numdb_erase(mapreg_db, num);
mapreg_dirty = 1;
}
@@ -6877,22 +6855,22 @@ void mapreg_setreg (int num, int val)
* 文字列型マップ変数の変更
*------------------------------------------
*/
-void mapreg_setregstr (int num, const char *str)
+void mapreg_setregstr(int num, const char *str)
{
char *p;
- if ((p = (char *)numdb_search (mapregstr_db, num)) != NULL)
- free (p);
+ if ((p = (char *)numdb_search(mapregstr_db, num)) != NULL)
+ free(p);
if (str == NULL || *str == 0)
{
- numdb_erase (mapregstr_db, num);
+ numdb_erase(mapregstr_db, num);
mapreg_dirty = 1;
return;
}
- p = (char *) calloc (strlen (str) + 1, 1);
- strcpy (p, str);
- numdb_insert (mapregstr_db, num, p);
+ p = (char *) calloc(strlen(str) + 1, 1);
+ strcpy(p, str);
+ numdb_insert(mapregstr_db, num, p);
mapreg_dirty = 1;
}
@@ -6901,45 +6879,45 @@ void mapreg_setregstr (int num, const char *str)
*------------------------------------------
*/
static
-void script_load_mapreg (void)
+void script_load_mapreg(void)
{
FILE *fp;
char line[1024];
- if ((fp = fopen_ (mapreg_txt, "rt")) == NULL)
+ if ((fp = fopen_(mapreg_txt, "rt")) == NULL)
return;
- while (fgets (line, sizeof (line), fp))
+ while (fgets(line, sizeof(line), fp))
{
char buf1[256], buf2[1024], *p;
- int n, v, s, i;
- if (sscanf (line, "%255[^,],%d\t%n", buf1, &i, &n) != 2 &&
- (i = 0, sscanf (line, "%[^\t]\t%n", buf1, &n) != 1))
+ int n, v, s, i;
+ if (sscanf(line, "%255[^,],%d\t%n", buf1, &i, &n) != 2 &&
+ (i = 0, sscanf(line, "%[^\t]\t%n", buf1, &n) != 1))
continue;
- if (buf1[strlen (buf1) - 1] == '$')
+ if (buf1[strlen(buf1) - 1] == '$')
{
- if (sscanf (line + n, "%[^\n\r]", buf2) != 1)
+ if (sscanf(line + n, "%[^\n\r]", buf2) != 1)
{
- printf ("%s: %s broken data !\n", mapreg_txt, buf1);
+ printf("%s: %s broken data !\n", mapreg_txt, buf1);
continue;
}
- p = (char *) calloc (strlen (buf2) + 1, 1);
- strcpy (p, buf2);
- s = add_str (buf1);
- numdb_insert (mapregstr_db, (i << 24) | s, p);
+ p = (char *) calloc(strlen(buf2) + 1, 1);
+ strcpy(p, buf2);
+ s = add_str(buf1);
+ numdb_insert(mapregstr_db, (i << 24) | s, p);
}
else
{
- if (sscanf (line + n, "%d", &v) != 1)
+ if (sscanf(line + n, "%d", &v) != 1)
{
- printf ("%s: %s broken data !\n", mapreg_txt, buf1);
+ printf("%s: %s broken data !\n", mapreg_txt, buf1);
continue;
}
- s = add_str (buf1);
- numdb_insert (mapreg_db, (i << 24) | s, v);
+ s = add_str(buf1);
+ numdb_insert(mapreg_db, (i << 24) | s, v);
}
}
- fclose_ (fp);
+ fclose_(fp);
mapreg_dirty = 0;
}
@@ -6947,53 +6925,53 @@ void script_load_mapreg (void)
* 永続的マップ変数の書き込み
*------------------------------------------
*/
-static void script_save_mapreg_intsub (db_key_t key, db_val_t data, va_list ap)
+static void script_save_mapreg_intsub(db_key_t key, db_val_t data, va_list ap)
{
- FILE *fp = va_arg (ap, FILE *);
- int num = key.i & 0x00ffffff, i = key.i >> 24;
+ FILE *fp = va_arg(ap, FILE *);
+ int num = key.i & 0x00ffffff, i = key.i >> 24;
char *name = str_buf + str_data[num].str;
if (name[1] != '@')
{
if (i == 0)
- fprintf (fp, "%s\t%d\n", name, (int) data);
+ fprintf(fp, "%s\t%d\n", name, (int) data);
else
- fprintf (fp, "%s,%d\t%d\n", name, i, (int) data);
+ fprintf(fp, "%s,%d\t%d\n", name, i, (int) data);
}
}
-static void script_save_mapreg_strsub (db_key_t key, db_val_t data, va_list ap)
+static void script_save_mapreg_strsub(db_key_t key, db_val_t data, va_list ap)
{
- FILE *fp = va_arg (ap, FILE *);
- int num = key.i & 0x00ffffff, i = key.i >> 24;
+ FILE *fp = va_arg(ap, FILE *);
+ int num = key.i & 0x00ffffff, i = key.i >> 24;
char *name = str_buf + str_data[num].str;
if (name[1] != '@')
{
if (i == 0)
- fprintf (fp, "%s\t%s\n", name, (char *) data);
+ fprintf(fp, "%s\t%s\n", name, (char *) data);
else
- fprintf (fp, "%s,%d\t%s\n", name, i, (char *) data);
+ fprintf(fp, "%s,%d\t%s\n", name, i, (char *) data);
}
}
static
-void script_save_mapreg (void)
+void script_save_mapreg(void)
{
FILE *fp;
- int lock;
+ int lock;
- if ((fp = lock_fopen (mapreg_txt, &lock)) == NULL)
+ if ((fp = lock_fopen(mapreg_txt, &lock)) == NULL)
return;
- numdb_foreach (mapreg_db, script_save_mapreg_intsub, fp);
- numdb_foreach (mapregstr_db, script_save_mapreg_strsub, fp);
- lock_fclose (fp, mapreg_txt, &lock);
+ numdb_foreach(mapreg_db, script_save_mapreg_intsub, fp);
+ numdb_foreach(mapregstr_db, script_save_mapreg_strsub, fp);
+ lock_fclose(fp, mapreg_txt, &lock);
mapreg_dirty = 0;
}
-static void script_autosave_mapreg (timer_id tid, tick_t tick, custom_id_t id,
+static void script_autosave_mapreg(timer_id tid, tick_t tick, custom_id_t id,
custom_data_t data)
{
if (mapreg_dirty)
- script_save_mapreg ();
+ script_save_mapreg();
}
/*==========================================
@@ -7001,13 +6979,13 @@ static void script_autosave_mapreg (timer_id tid, tick_t tick, custom_id_t id,
*------------------------------------------
*/
static
-void set_posword (char *p)
+void set_posword(char *p)
{
char *np, *str[15];
- int i = 0;
+ int i = 0;
for (i = 0; i < 11; i++)
{
- if ((np = strchr (p, ',')) != NULL)
+ if ((np = strchr(p, ',')) != NULL)
{
str[i] = p;
*np = 0;
@@ -7016,16 +6994,16 @@ void set_posword (char *p)
else
{
str[i] = p;
- p += strlen (p);
+ p += strlen(p);
}
if (str[i])
- strcpy (pos[i], str[i]);
+ strcpy(pos[i], str[i]);
}
}
-void script_config_read (const char *cfgName)
+void script_config_read(const char *cfgName)
{
- int i;
+ int i;
char line[1024], w1[1024], w2[1024];
FILE *fp;
@@ -7036,29 +7014,29 @@ void script_config_read (const char *cfgName)
script_config.check_cmdcount = 8192;
script_config.check_gotocount = 512;
- fp = fopen_ (cfgName, "r");
+ fp = fopen_(cfgName, "r");
if (fp == NULL)
{
- printf ("file not found: %s\n", cfgName);
+ printf("file not found: %s\n", cfgName);
return;
}
- while (fgets (line, 1020, fp))
+ while (fgets(line, 1020, fp))
{
if (line[0] == '/' && line[1] == '/')
continue;
- i = sscanf (line, "%[^:]: %[^\r\n]", w1, w2);
+ i = sscanf(line, "%[^:]: %[^\r\n]", w1, w2);
if (i != 2)
continue;
- if (strcasecmp (w1, "refine_posword") == 0)
+ if (strcasecmp(w1, "refine_posword") == 0)
{
- set_posword (w2);
+ set_posword(w2);
}
- if (strcasecmp (w1, "import") == 0)
+ if (strcasecmp(w1, "import") == 0)
{
- script_config_read (w2);
+ script_config_read(w2);
}
}
- fclose_ (fp);
+ fclose_(fp);
}
/*==========================================
@@ -7066,52 +7044,52 @@ void script_config_read (const char *cfgName)
*------------------------------------------
*/
-static void mapregstr_db_final (db_key_t key, db_val_t data, va_list ap)
+static void mapregstr_db_final(db_key_t key, db_val_t data, va_list ap)
{
- free (data);
+ free(data);
}
-static void userfunc_db_final (db_key_t key, db_val_t data, va_list ap)
+static void userfunc_db_final(db_key_t key, db_val_t data, va_list ap)
{
- free ((char*)key.s);
- free (data);
+ free((char*)key.s);
+ free(data);
}
-void do_final_script (void)
+void do_final_script(void)
{
if (mapreg_dirty >= 0)
- script_save_mapreg ();
+ script_save_mapreg();
if (script_buf)
- free (script_buf);
+ free(script_buf);
if (mapreg_db)
- numdb_final (mapreg_db, NULL);
+ numdb_final(mapreg_db, NULL);
if (mapregstr_db)
- strdb_final (mapregstr_db, mapregstr_db_final);
+ strdb_final(mapregstr_db, mapregstr_db_final);
if (scriptlabel_db)
- strdb_final (scriptlabel_db, NULL);
+ strdb_final(scriptlabel_db, NULL);
if (userfunc_db)
- strdb_final (userfunc_db, userfunc_db_final);
+ strdb_final(userfunc_db, userfunc_db_final);
if (str_data)
- free (str_data);
+ free(str_data);
if (str_buf)
- free (str_buf);
+ free(str_buf);
}
/*==========================================
* 初期化
*------------------------------------------
*/
-void do_init_script (void)
+void do_init_script(void)
{
- mapreg_db = numdb_init ();
- mapregstr_db = numdb_init ();
- script_load_mapreg ();
+ mapreg_db = numdb_init();
+ mapregstr_db = numdb_init();
+ script_load_mapreg();
- add_timer_interval (gettick () + MAPREG_AUTOSAVE_INTERVAL,
+ add_timer_interval(gettick() + MAPREG_AUTOSAVE_INTERVAL,
script_autosave_mapreg, 0, 0,
MAPREG_AUTOSAVE_INTERVAL);
- scriptlabel_db = strdb_init (50);
+ scriptlabel_db = strdb_init(50);
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-28 20:35:42 +0000