diff options
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 830 |
1 files changed, 415 insertions, 415 deletions
diff --git a/src/map/script.c b/src/map/script.c index a058e8ddc..eebc52a21 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -72,7 +72,7 @@ //## TODO possible enhancements: [FlavioJS] // - 'callfunc' supporting labels in the current npc "::LabelName" // - 'callfunc' supporting labels in other npcs "NpcName::LabelName" -// - 'function FuncName;' function declarations reverting to global functions +// - 'function FuncName;' function declarations reverting to global functions // if local label isn't found // - join callfunc and callsub's functionality // - remove dynamic allocation in add_word() @@ -230,7 +230,7 @@ static int buildin_callsub_ref = 0; static int buildin_callfunc_ref = 0; static int buildin_getelementofarray_ref = 0; -// Caches compiled autoscript item code. +// Caches compiled autoscript item code. // Note: This is not cleared when reloading itemdb. static DBMap* autobonus_db=NULL; // char* script -> char* bytecode @@ -282,9 +282,9 @@ static struct { int count; int flag; struct linkdb_node *case_label; - } curly[256]; // �E�J�b�R�̏�� - int curly_count; // �E�J�b�R�̐� - int index; // �X�N���v�g���Ŏg�p�����\���̐� + } curly[256]; // ?��E?��J?��b?��R?��̏�?�� + int curly_count; // ?��E?��J?��b?��R?��̐� + int index; // ?��X?��N?��?��?��v?��g?��?��?��Ŏg?��p?��?��?��?��?��\?��?��?��̐� } syntax; const char* parse_curly_close(const char* p); @@ -337,7 +337,7 @@ struct { #endif /*========================================== - * ���[�J���v���g�^�C�v�錾 (�K�v�ȕ��̂�) + * ?��?��?��[?��J?��?��?��v?��?��?��g?��^?��C?��v?��錾 (?��K?��v?��ȕ�?��̂�) *------------------------------------------*/ const char* parse_subexpr(const char* p,int limit); int run_func(struct script_state *st); @@ -617,7 +617,7 @@ static void script_reportfunc(struct script_state* st) /*========================================== - * �G���[���b�Z�[�W�o�� + * ?��G?��?��?��[?��?��?��b?��Z?��[?��W?��o?��?�� *------------------------------------------*/ static void disp_error_message2(const char *mes,const char *pos,int report) { @@ -800,7 +800,7 @@ static void add_scripti(int a) /// /// @param l The id of the str_data entry -// �ő�16M�܂� +// ?��ő�16M?��܂� static void add_scriptl(int l) { int backpatch = str_data[l].backpatch; @@ -815,7 +815,7 @@ static void add_scriptl(int l) break; case C_NOP: case C_USERFUNC: - // ���x���̉\��������̂�backpatch�p�f�[�^���ߍ��� + // ?��?��?��x?��?��?��̉\?��?��?��?��?��?��?��?��̂�backpatch?��p?��f?��[?��^?��?��?��ߍ�?��?�� add_scriptc(C_NAME); str_data[l].backpatch = script_pos; add_scriptb(backpatch); @@ -837,7 +837,7 @@ static void add_scriptl(int l) } /*========================================== - * ���x������������ + * ?��?��?��x?��?��?��?��?��?��?��?��?��?��?��?�� *------------------------------------------*/ void set_label(int l,int pos, const char* script_pos) { @@ -947,7 +947,7 @@ int add_word(const char* p) word = (char*)aMalloc(len+1); memcpy(word, p, len); word[len] = 0; - + // add the word i = add_str(word); aFree(word); @@ -1080,7 +1080,7 @@ const char* parse_variable(const char* p) { c_op type = C_NOP; const char *p2 = NULL; const char *var = p; - + // skip the variable where applicable p = skip_word(p); p = skip_space(p); @@ -1140,7 +1140,7 @@ const char* parse_variable(const char* p) { if( p == NULL ) {// end of line or invalid buffer return NULL; } - + // push the set function onto the stack add_scriptl(buildin_set_ref); add_scriptc(C_ARG); @@ -1152,7 +1152,7 @@ const char* parse_variable(const char* p) { // increment the total curly count for the position in the script ++ syntax.curly_count; - + // parse the variable currently being modified word = add_word(var); @@ -1168,7 +1168,7 @@ const char* parse_variable(const char* p) { add_scriptl(buildin_getelementofarray_ref); add_scriptc(C_ARG); add_scriptl(word); - + // process the sub-expression for this assignment p3 = parse_subexpr(p2 + 1, 1); p3 = skip_space(p3); @@ -1183,10 +1183,10 @@ const char* parse_variable(const char* p) { } else {// simply push the variable or value onto the stack add_scriptl(word); } - + if( type != C_EQ ) add_scriptc(C_REF); - + if( type == C_ADD_PP || type == C_SUB_PP ) {// incremental operator for the method add_scripti(1); add_scriptc(type == C_ADD_PP ? C_ADD : C_SUB); @@ -1201,16 +1201,16 @@ const char* parse_variable(const char* p) { // decrement the curly count for the position within the script -- syntax.curly_count; - + // close the script by appending the function operator add_scriptc(C_FUNC); - + // push the buffer from the method return p; } /*========================================== - * ���̉�� + * ?��?��?��̉�?�� *------------------------------------------*/ const char* parse_simpleexpr(const char *p) { @@ -1296,7 +1296,7 @@ const char* parse_simpleexpr(const char *p) add_scriptl(buildin_getelementofarray_ref); add_scriptc(C_ARG); add_scriptl(l); - + p=parse_subexpr(p+1,-1); p=skip_space(p); if( *p != ']' ) @@ -1312,7 +1312,7 @@ const char* parse_simpleexpr(const char *p) } /*========================================== - * ���̉�� + * ?��?��?��̉�?�� *------------------------------------------*/ const char* parse_subexpr(const char* p,int limit) { @@ -1374,7 +1374,7 @@ const char* parse_subexpr(const char* p,int limit) } /*========================================== - * ���̕]�� + * ?��?��?��̕]?��?�� *------------------------------------------*/ const char* parse_expr(const char *p) { @@ -1388,7 +1388,7 @@ const char* parse_expr(const char *p) } /*========================================== - * �s�̉�� + * ?��s?��̉�?�� *------------------------------------------*/ const char* parse_line(const char* p) { @@ -1396,7 +1396,7 @@ const char* parse_line(const char* p) p=skip_space(p); if(*p==';') { - // if(); for(); while(); �̂��߂ɕ����� + // if(); for(); while(); ?��̂�?��߂ɕ�?��?��?��?�� p = parse_syntax_close(p + 1); return p; } @@ -1413,8 +1413,8 @@ const char* parse_line(const char* p) } else if(p[0] == '}') { return parse_curly_close(p); } - - // �\���֘A�̏��� + + // ?��\?��?��?��֘A?��̏�?��?�� p2 = parse_syntax(p); if(p2 != NULL) return p2; @@ -1429,7 +1429,7 @@ const char* parse_line(const char* p) p = parse_callfunc(p,0,0); p = skip_space(p); - + if(parse_syntax_for_flag) { if( *p != ')' ) disp_error_message("parse_line: need ')'",p); @@ -1438,13 +1438,13 @@ const char* parse_line(const char* p) disp_error_message("parse_line: need ';'",p); } - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p+1); return p; } -// { ... } �̕����� +// { ... } ?��̕�?��?��?��?�� const char* parse_curly_close(const char* p) { if(syntax.curly_count <= 0) { @@ -1452,46 +1452,46 @@ const char* parse_curly_close(const char* p) return p + 1; } else if(syntax.curly[syntax.curly_count-1].type == TYPE_NULL) { syntax.curly_count--; - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p + 1); return p; } else if(syntax.curly[syntax.curly_count-1].type == TYPE_SWITCH) { - // switch() ������ + // switch() ?���?��?��?��?�� int pos = syntax.curly_count-1; char label[256]; int l; - // �ꎞ�ϐ������� + // ?��ꎞ�ϐ�?��?��?��?��?��?�� sprintf(label,"set $@__SW%x_VAL,0;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // �������ŏI���|�C���^�Ɉړ� + // ?��?��?��?��?��?��?��ŏI?��?��?��|?��C?��?��?��^?��Ɉړ� sprintf(label,"goto __SW%x_FIN;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���ݒn�̃��x����t���� + // ?��?��?��ݒn?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__SW%x_%x",syntax.curly[pos].index,syntax.curly[pos].count); l=add_str(label); set_label(l,script_pos, p); if(syntax.curly[pos].flag) { - // default �����݂��� + // default ?��?��?��?��?��݂�?��?�� sprintf(label,"goto __SW%x_DEF;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; } - // �I�����x����t���� + // ?��I?��?��?��?��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__SW%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos, p); linkdb_final(&syntax.curly[pos].case_label); // free the list of case label syntax.curly_count--; - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p + 1); return p; } else { @@ -1500,9 +1500,9 @@ const char* parse_curly_close(const char* p) } } -// �\���֘A�̏��� +// ?��\?��?��?��֘A?��̏�?��?�� // break, case, continue, default, do, for, function, -// if, switch, while �����̓����ŏ������܂��B +// if, switch, while ?��?��?��?��?��̓�?��?��?��ŏ�?��?��?��?��?��܂�?��B const char* parse_syntax(const char* p) { const char *p2 = skip_word(p); @@ -1511,7 +1511,7 @@ const char* parse_syntax(const char* p) case 'B': case 'b': if(p2 - p == 5 && !strncasecmp(p,"break",5)) { - // break �̏��� + // break ?��̏�?��?�� char label[256]; int pos = syntax.curly_count - 1; while(pos >= 0) { @@ -1540,7 +1540,7 @@ const char* parse_syntax(const char* p) p = skip_space(p2); if(*p != ';') disp_error_message("parse_syntax: need ';'",p); - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p + 1); return p; } @@ -1548,7 +1548,7 @@ const char* parse_syntax(const char* p) case 'c': case 'C': if(p2 - p == 4 && !strncasecmp(p,"case",4)) { - // case �̏��� + // case ?��̏�?��?�� int pos = syntax.curly_count-1; if(pos < 0 || syntax.curly[pos].type != TYPE_SWITCH) { disp_error_message("parse_syntax: unexpected 'case' ",p); @@ -1558,18 +1558,18 @@ const char* parse_syntax(const char* p) int l,v; char *np; if(syntax.curly[pos].count != 1) { - // FALLTHRU �p�̃W�����v + // FALLTHRU ?��p?��̃W?��?��?��?��?��v sprintf(label,"goto __SW%x_%xJ;",syntax.curly[pos].index,syntax.curly[pos].count); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���ݒn�̃��x����t���� + // ?��?��?��ݒn?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__SW%x_%x",syntax.curly[pos].index,syntax.curly[pos].count); l=add_str(label); set_label(l,script_pos, p); } - // switch ���蕶 + // switch ?��?��?��蕶 p = skip_space(p2); if(p == p2) { disp_error_message("parse_syntax: expect space ' '",p); @@ -1597,12 +1597,12 @@ const char* parse_syntax(const char* p) sprintf(label,"if(%d != $@__SW%x_VAL) goto __SW%x_%x;", v,syntax.curly[pos].index,syntax.curly[pos].index,syntax.curly[pos].count+1); syntax.curly[syntax.curly_count++].type = TYPE_NULL; - // �Q��parse ���Ȃ��ƃ_�� + // ?��Q?��?��parse ?��?��?��Ȃ�?��ƃ_?��?�� p2 = parse_line(label); parse_line(p2); syntax.curly_count--; if(syntax.curly[pos].count != 1) { - // FALLTHRU �I����̃��x�� + // FALLTHRU ?��I?��?��?��?���??��?��x?��?�� sprintf(label,"__SW%x_%xJ",syntax.curly[pos].index,syntax.curly[pos].count); l=add_str(label); set_label(l,script_pos,p); @@ -1614,20 +1614,20 @@ const char* parse_syntax(const char* p) sprintf(label,"set $@__SW%x_VAL,0;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; - + parse_line(label); syntax.curly_count--; syntax.curly[pos].count++; } return p + 1; } else if(p2 - p == 8 && !strncasecmp(p,"continue",8)) { - // continue �̏��� + // continue ?��̏�?��?�� char label[256]; int pos = syntax.curly_count - 1; while(pos >= 0) { if(syntax.curly[pos].type == TYPE_DO) { sprintf(label,"goto __DO%x_NXT;",syntax.curly[pos].index); - syntax.curly[pos].flag = 1; // continue �p�̃����N����t���O + syntax.curly[pos].flag = 1; // continue ?��p?���??��?��?��?��N?��?��?��?��t?��?��?��O break; } else if(syntax.curly[pos].type == TYPE_FOR) { sprintf(label,"goto __FR%x_NXT;",syntax.curly[pos].index); @@ -1648,7 +1648,7 @@ const char* parse_syntax(const char* p) p = skip_space(p2); if(*p != ';') disp_error_message("parse_syntax: need ';'",p); - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p + 1); return p; } @@ -1656,7 +1656,7 @@ const char* parse_syntax(const char* p) case 'd': case 'D': if(p2 - p == 7 && !strncasecmp(p,"default",7)) { - // switch - default �̏��� + // switch - default ?��̏�?��?�� int pos = syntax.curly_count-1; if(pos < 0 || syntax.curly[pos].type != TYPE_SWITCH) { disp_error_message("parse_syntax: unexpected 'default'",p); @@ -1665,7 +1665,7 @@ const char* parse_syntax(const char* p) } else { char label[256]; int l; - // ���ݒn�̃��x����t���� + // ?��?��?��ݒn?���??��?��x?��?��?��?��t?��?��?��?�� p = skip_space(p2); if(*p != ':') { disp_error_message("parse_syntax: need ':'",p); @@ -1674,13 +1674,13 @@ const char* parse_syntax(const char* p) l=add_str(label); set_label(l,script_pos,p); - // �������Ŏ��̃����N�ɔ�� + // ?��?��?��?��?��?��?��Ŏ�?���??��?��?��?��N?��ɔ�� sprintf(label,"goto __SW%x_%x;",syntax.curly[pos].index,syntax.curly[pos].count+1); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // default �̃��x����t���� + // default ?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__SW%x_DEF",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -1698,7 +1698,7 @@ const char* parse_syntax(const char* p) syntax.curly[syntax.curly_count].count = 1; syntax.curly[syntax.curly_count].index = syntax.index++; syntax.curly[syntax.curly_count].flag = 0; - // ���ݒn�̃��x���`������ + // ?��?��?��ݒn?���??��?��x?��?��?��`?��?��?��?��?��?�� sprintf(label,"__DO%x_BGN",syntax.curly[syntax.curly_count].index); l=add_str(label); set_label(l,script_pos,p); @@ -1724,22 +1724,22 @@ const char* parse_syntax(const char* p) disp_error_message("parse_syntax: need '('",p); p++; - // ���������s���� + // ?��?��?��?��?��?��?��?��?��s?��?��?��?�� syntax.curly[syntax.curly_count++].type = TYPE_NULL; p=parse_line(p); syntax.curly_count--; - // �������f�J�n�̃��x���`������ + // ?��?��?��?��?��?��?��f?��J?��n?���??��?��x?��?��?��`?��?��?��?��?��?�� sprintf(label,"__FR%x_J",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); p=skip_space(p); if(*p == ';') { - // for(;;) �̃p�^�[���Ȃ̂ŕK���^ + // for(;;) ?��̃p?��^?��[?��?��?��Ȃ̂ŕK?��?��?��^ ; } else { - // �������U�Ȃ�I���n�_�ɔ�� + // ?��?��?��?��?��?��?��U?��Ȃ�I?��?��?��n?��_?��ɔ�� sprintf(label,"__FR%x_FIN",syntax.curly[pos].index); add_scriptl(add_str("jump_zero")); add_scriptc(C_ARG); @@ -1751,33 +1751,33 @@ const char* parse_syntax(const char* p) if(*p != ';') disp_error_message("parse_syntax: need ';'",p); p++; - - // ���[�v�J�n�ɔ�� + + // ?��?��?��[?��v?��J?��n?��ɔ�� sprintf(label,"goto __FR%x_BGN;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���̃��[�v�ւ̃��x���`������ + // ?��?��?���??��?��[?��v?��ւ�??��?��x?��?��?��`?��?��?��?��?��?�� sprintf(label,"__FR%x_NXT",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); - - // ���̃��[�v�ɓ�鎞�̏��� - // for �Ō�� ')' �� ';' �Ƃ��Ĉ����t���O + + // ?��?��?���??��?��[?��v?��ɓ�鎞�̏�?��?�� + // for ?��Ō�?�� ')' ?��?�� ';' ?��Ƃ�?��Ĉ�?��?��?��t?��?��?��O parse_syntax_for_flag = 1; syntax.curly[syntax.curly_count++].type = TYPE_NULL; p=parse_line(p); syntax.curly_count--; parse_syntax_for_flag = 0; - // �������菈���ɔ�� + // ?��?��?��?��?��?��?��菈�?��?��ɔ�� sprintf(label,"goto __FR%x_J;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���[�v�J�n�̃��x���t�� + // ?��?��?��[?��v?��J?��n?���??��?��x?��?��?��t?��?�� sprintf(label,"__FR%x_BGN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -1804,7 +1804,7 @@ const char* parse_syntax(const char* p) else disp_error_message("parse_syntax:function: function name is invalid", func_name); - // if, for , while �̕����� + // if, for , while ?��̕�?��?��?��?�� p = parse_syntax_close(p2 + 1); return p; } @@ -1849,7 +1849,7 @@ const char* parse_syntax(const char* p) case 'i': case 'I': if(p2 - p == 2 && !strncasecmp(p,"if",2)) { - // if() �̏��� + // if() ?��̏�?��?�� char label[256]; p=skip_space(p2); if(*p != '(') { //Prevent if this {} non-c syntax. from Rayce (jA) @@ -1873,7 +1873,7 @@ const char* parse_syntax(const char* p) case 's': case 'S': if(p2 - p == 6 && !strncasecmp(p,"switch",6)) { - // switch() �̏��� + // switch() ?��̏�?��?�� char label[256]; p=skip_space(p2); if(*p != '(') { @@ -1910,12 +1910,12 @@ const char* parse_syntax(const char* p) syntax.curly[syntax.curly_count].count = 1; syntax.curly[syntax.curly_count].index = syntax.index++; syntax.curly[syntax.curly_count].flag = 0; - // �������f�J�n�̃��x���`������ + // ?��?��?��?��?��?��?��f?��J?��n?���??��?��x?��?��?��`?��?��?��?��?��?�� sprintf(label,"__WL%x_NXT",syntax.curly[syntax.curly_count].index); l=add_str(label); set_label(l,script_pos,p); - // �������U�Ȃ�I���n�_�ɔ�� + // ?��?��?��?��?��?��?��U?��Ȃ�I?��?��?��n?��_?��ɔ�� sprintf(label,"__WL%x_FIN",syntax.curly[syntax.curly_count].index); syntax.curly_count++; add_scriptl(add_str("jump_zero")); @@ -1932,7 +1932,7 @@ const char* parse_syntax(const char* p) } const char* parse_syntax_close(const char *p) { - // if(...) for(...) hoge(); �̂悤�ɁA�P�x����ꂽ��ēx�����邩�m�F���� + // if(...) for(...) hoge(); ?��̂悤?��ɁA?��P?��x?���?��?��ꂽ?��?��ēx?���?��?��?��邩?��m?��F?��?��?��?�� int flag; do { @@ -1941,9 +1941,9 @@ const char* parse_syntax_close(const char *p) { return p; } -// if, for , while , do �̕����� -// flag == 1 : ����ꂽ -// flag == 0 : �����Ȃ� +// if, for , while , do ?��̕�?��?��?��?�� +// flag == 1 : ?���?��?��ꂽ +// flag == 0 : ?���?��?��?��Ȃ� const char* parse_syntax_close_sub(const char* p,int* flag) { char label[256]; @@ -1961,13 +1961,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) // if-block and else-block end is a new line parse_nextline(false, p); - // if �ŏI�ꏊ�֔�� + // if ?��ŏI?��ꏊ�֔�� sprintf(label,"goto __IF%x_FIN;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���ݒn�̃��x����t���� + // ?��?��?��ݒn?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__IF%x_%x",syntax.curly[pos].index,syntax.curly[pos].count); l=add_str(label); set_label(l,script_pos,p); @@ -2003,14 +2003,14 @@ const char* parse_syntax_close_sub(const char* p,int* flag) } } } - // if �� + // if ?��� syntax.curly_count--; - // �ŏI�n�̃��x����t���� + // ?��ŏI?��n?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__IF%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); if(syntax.curly[pos].flag == 1) { - // ����if�ɑ���else����Ȃ��̂Ń|�C���^�̈ʒu�͓��� + // ?��?��?��?��if?��ɑ�?��?��else?��?��?��?��Ȃ�?��̂Ń|?��C?��?��?��^?��̈ʒu?��͓�?��?�� return bp; } return p; @@ -2020,13 +2020,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) const char *p2; if(syntax.curly[pos].flag) { - // ���ݒn�̃��x���`������(continue �ł����ɗ���) + // ?��?��?��ݒn?���??��?��x?��?��?��`?��?��?��?��?��?��(continue ?��ł�?��?��?��ɗ�?��?��) sprintf(label,"__DO%x_NXT",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); } - // �������U�Ȃ�I���n�_�ɔ�� + // ?��?��?��?��?��?��?��U?��Ȃ�I?��?��?��n?��_?��ɔ�� p = skip_space(p); p2 = skip_word(p); if(p2 - p != 5 || strncasecmp(p,"while",5)) @@ -2048,13 +2048,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) add_scriptl(add_str(label)); add_scriptc(C_FUNC); - // �J�n�n�_�ɔ�� + // ?��J?��n?��n?��_?��ɔ�� sprintf(label,"goto __DO%x_BGN;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // �����I���n�_�̃��x���`������ + // ?��?��?��?��?��I?��?��?��n?��_?���??��?��x?��?��?��`?��?��?��?��?��?�� sprintf(label,"__DO%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -2070,13 +2070,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) // for-block end is a new line parse_nextline(false, p); - // ���̃��[�v�ɔ�� + // ?��?��?���??��?��[?��v?��ɔ�� sprintf(label,"goto __FR%x_NXT;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // for �I���̃��x���t�� + // for ?��I?��?��?���??��?��x?��?��?��t?��?�� sprintf(label,"__FR%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -2086,13 +2086,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) // while-block end is a new line parse_nextline(false, p); - // while �������f�֔�� + // while ?��?��?��?��?��?��?��f?��֔�� sprintf(label,"goto __WL%x_NXT;",syntax.curly[pos].index); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // while �I���̃��x���t�� + // while ?��I?��?��?���??��?��x?��?��?��t?��?�� sprintf(label,"__WL%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -2102,13 +2102,13 @@ const char* parse_syntax_close_sub(const char* p,int* flag) int pos = syntax.curly_count-1; char label[256]; int l; - // �߂� + // ?��߂� sprintf(label,"return;"); syntax.curly[syntax.curly_count++].type = TYPE_NULL; parse_line(label); syntax.curly_count--; - // ���ݒn�̃��x����t���� + // ?��?��?��ݒn?���??��?��x?��?��?��?��t?��?��?��?�� sprintf(label,"__FN%x_FIN",syntax.curly[pos].index); l=add_str(label); set_label(l,script_pos,p); @@ -2121,7 +2121,7 @@ const char* parse_syntax_close_sub(const char* p,int* flag) } /*========================================== - * �g�ݍ��݊��̒lj� + * ?��g?��ݍ�?��݊�?��̒lj� *------------------------------------------*/ static void add_buildin_func(void) { @@ -2194,7 +2194,7 @@ void script_set_constant(const char* name, int value, bool isparameter) } /*========================================== - * �萔�f�[�^�x�[�X�̓ǂݍ��� + * ?��萔�f?��[?��^?��x?��[?��X?��̓ǂݍ�?��?�� *------------------------------------------*/ static void read_constdb(void) { @@ -2222,13 +2222,13 @@ static void read_constdb(void) } /*========================================== - * �G���[�\�� + * ?��G?��?��?��[?��\?��?�� *------------------------------------------*/ static const char* script_print_line(StringBuf* buf, const char* p, const char* mark, int line) { int i; if( p == NULL || !p[0] ) return NULL; - if( line < 0 ) + if( line < 0 ) StringBuf_Printf(buf, "*% 5d : ", -line); else StringBuf_Printf(buf, " % 5d : ", line); @@ -2244,7 +2244,7 @@ static const char* script_print_line(StringBuf* buf, const char* p, const char* void script_error(const char* src, const char* file, int start_line, const char* error_msg, const char* error_pos) { - // �G���[�����������s�����߂� + // ?��G?��?��?��[?��?��?��?��?��?��?��?��?��?��?��s?��?��?��?��?��߂� int j; int line = start_line; const char *p; @@ -2279,7 +2279,7 @@ void script_error(const char* src, const char* file, int start_line, const char* } /*========================================== - * �X�N���v�g�̉�� + * ?��X?��N?��?��?��v?��g?��̉�?�� *------------------------------------------*/ struct script_code* parse_script(const char *src,const char *file,int line,int options) { @@ -2375,7 +2375,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o { if( *p == '\0' ) disp_error_message("unexpected end of script",p); - // label�������ꏈ�� + // label?��?��?��?��?��?��?��ꏈ�?�� tmpp=skip_space(skip_word(p)); if(*tmpp==':' && !(!strncasecmp(p,"default:",8) && p + 7 == tmpp)){ i=add_word(p); @@ -2387,7 +2387,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o continue; } - // ���͑S���ꏏ���� + // ?��?��?��͑S?��?��?��ꏏ�?��?��?�� p=parse_line(p); p=skip_space(p); @@ -2827,7 +2827,7 @@ int conv_num(struct script_state* st, struct script_data* data) data->u.num = (int)num; } #if 0 - // FIXME this function is being used to retrieve the position of labels and + // FIXME this function is being used to retrieve the position of labels and // probably other stuff [FlavioJS] else {// unsupported data type @@ -2973,7 +2973,7 @@ void pop_stack(struct script_state* st, int start, int end) /// /*========================================== - * �X�N���v�g�ˑ��ϐ��A���ˑ��ϐ��̉�� + * ?��X?��N?��?��?��v?��g?��ˑ�?��ϐ�?��A?���?��ˑ�?��ϐ�?��̉�?�� *------------------------------------------*/ void script_free_vars(struct DBMap* storage) { @@ -3038,10 +3038,10 @@ void script_free_state(struct script_state* st) } // -// ���s��main +// ?��?��?��s?��?��main // /*========================================== - * �R�}���h�̓ǂݎ�� + * ?��R?��}?��?��?��h?��̓ǂݎ�?�� *------------------------------------------*/ c_op get_com(unsigned char *script,int *pos) { @@ -3058,7 +3058,7 @@ c_op get_com(unsigned char *script,int *pos) } /*========================================== - * ���l�̏��� + * ?��?��?��l?��̏�?��?�� *------------------------------------------*/ int get_num(unsigned char *script,int *pos) { @@ -3072,7 +3072,7 @@ int get_num(unsigned char *script,int *pos) } /*========================================== - * �X�^�b�N����l�����o�� + * ?��X?��^?��b?��N?��?��?��?��l?��?��?��?��?��o?��?�� *------------------------------------------*/ int pop_val(struct script_state* st) { @@ -3533,7 +3533,7 @@ void script_stop_sleeptimers(int id) } /*========================================== - * �w��m�[�h��sleep_db����폜 + * ?��w?��?��m?��[?��h?��?��sleep_db?��?��?��?��?�� *------------------------------------------*/ struct linkdb_node* script_erase_sleepdb(struct linkdb_node *n) { @@ -3549,11 +3549,11 @@ struct linkdb_node* script_erase_sleepdb(struct linkdb_node *n) n->next->prev = n->prev; retnode = n->next; aFree( n ); - return retnode; // ���̃m�[�h��Ԃ� + return retnode; // ?��?��?��̃m?��[?��h?��?��Ԃ� } /*========================================== - * sleep�p�^�C�}�[�� + * sleep?��p?��^?��C?��}?��[?��� *------------------------------------------*/ int run_script_timer(int tid, unsigned int tick, int id, intptr_t data) { @@ -3657,7 +3657,7 @@ static void script_attach_state(struct script_state* st) } /*========================================== - * �X�N���v�g�̎��s���C������ + * ?��X?��N?��?��?��v?��g?��̎�?��s?��?��?��C?��?��?��?��?��?�� *------------------------------------------*/ void run_script_main(struct script_state *st) { @@ -3967,89 +3967,89 @@ int buildin_query_sql_sub(struct script_state* st, Sql* handle); int queryThread_timer(int tid, unsigned int tick, int id, intptr_t data) { int i, cursor = 0; bool allOk = true; - + EnterSpinLock(&queryThreadLock); - + for( i = 0; i < queryThreadData.count; i++ ) { struct queryThreadEntry *entry = queryThreadData.entry[i]; - + if( !entry->ok ) { allOk = false; continue; } run_script_main(entry->st); - + entry->st = NULL;/* empty entries */ aFree(entry); queryThreadData.entry[i] = NULL; } - + if( allOk ) { /* cancel the repeating timer -- it'll re-create itself when necessary, dont need to remain looping */ delete_timer(queryThreadData.timer, queryThread_timer); queryThreadData.timer = INVALID_TIMER; } - + /* now lets clear the mess. */ for( i = 0; i < queryThreadData.count; i++ ) { struct queryThreadEntry *entry = queryThreadData.entry[i]; if( entry == NULL ) continue;/* entry on hold */ - + /* move */ memmove(&queryThreadData.entry[cursor], &queryThreadData.entry[i], sizeof(struct queryThreadEntry*)); - + cursor++; } - + queryThreadData.count = cursor; - + LeaveSpinLock(&queryThreadLock); - + return 0; } void queryThread_add(struct script_state *st, bool type) { int idx = 0; struct queryThreadEntry* entry = NULL; - + EnterSpinLock(&queryThreadLock); - + if( queryThreadData.count++ != 0 ) RECREATE(queryThreadData.entry, struct queryThreadEntry* , queryThreadData.count); - + idx = queryThreadData.count-1; - + CREATE(queryThreadData.entry[idx],struct queryThreadEntry,1); - + entry = queryThreadData.entry[idx]; - + entry->st = st; entry->ok = false; entry->type = type; if( queryThreadData.timer == INVALID_TIMER ) { /* start the receiver timer */ queryThreadData.timer = add_timer_interval(gettick() + 100, queryThread_timer, 0, 0, 100); } - + LeaveSpinLock(&queryThreadLock); - + /* unlock the queryThread */ racond_signal(queryThreadCond); } /* adds a new log to the queue */ void queryThread_log(char * entry, int length) { int idx = logThreadData.count; - + EnterSpinLock(&queryThreadLock); - + if( logThreadData.count++ != 0 ) - RECREATE(logThreadData.entry, char* , logThreadData.count); - + RECREATE(logThreadData.entry, char* , logThreadData.count); + CREATE(logThreadData.entry[idx], char, length + 1 ); safestrncpy(logThreadData.entry[idx], entry, length + 1 ); - + LeaveSpinLock(&queryThreadLock); /* unlock the queryThread */ @@ -4060,48 +4060,48 @@ void queryThread_log(char * entry, int length) { static void *queryThread_main(void *x) { Sql *queryThread_handle = Sql_Malloc(); int i; - + if ( SQL_ERROR == Sql_Connect(queryThread_handle, map_server_id, map_server_pw, map_server_ip, map_server_port, map_server_db) ) exit(EXIT_FAILURE); - + if( strlen(default_codepage) > 0 ) if ( SQL_ERROR == Sql_SetEncoding(queryThread_handle, default_codepage) ) Sql_ShowDebug(queryThread_handle); if( log_config.sql_logs ) { logmysql_handle = Sql_Malloc(); - + if ( SQL_ERROR == Sql_Connect(logmysql_handle, log_db_id, log_db_pw, log_db_ip, log_db_port, log_db_db) ) exit(EXIT_FAILURE); - + if( strlen(default_codepage) > 0 ) if ( SQL_ERROR == Sql_SetEncoding(logmysql_handle, default_codepage) ) Sql_ShowDebug(logmysql_handle); } - + while( 1 ) { - + if(queryThreadTerminate > 0) break; - + EnterSpinLock(&queryThreadLock); - + /* mess with queryThreadData within the lock */ for( i = 0; i < queryThreadData.count; i++ ) { struct queryThreadEntry *entry = queryThreadData.entry[i]; - + if( entry->ok ) continue; else if ( !entry->st || !entry->st->stack ) { entry->ok = true;/* dispose */ continue; } - + buildin_query_sql_sub(entry->st, entry->type ? logmysql_handle : queryThread_handle); - + entry->ok = true;/* we're done with this */ } - + /* also check for any logs in need to be sent */ if( log_config.sql_logs ) { for( i = 0; i < logThreadData.count; i++ ) { @@ -4111,26 +4111,26 @@ static void *queryThread_main(void *x) { } logThreadData.count = 0; } - + LeaveSpinLock(&queryThreadLock); - + ramutex_lock( queryThreadMutex ); racond_wait( queryThreadCond, queryThreadMutex, -1 ); ramutex_unlock( queryThreadMutex ); } - + Sql_Free(queryThread_handle); - + if( log_config.sql_logs ) { Sql_Free(logmysql_handle); } - + return NULL; } #endif /*========================================== - * �I�� + * ?��I?��?�� *------------------------------------------*/ int do_final_script() { int i; @@ -4212,7 +4212,7 @@ int do_final_script() { for( i = 0; i < atcmd_binding_count; i++ ) { aFree(atcmd_binding[i]); } - + if( atcmd_binding_count != 0 ) aFree(atcmd_binding); #ifdef BETA_THREAD_TEST @@ -4220,29 +4220,29 @@ int do_final_script() { InterlockedIncrement(&queryThreadTerminate); racond_signal(queryThreadCond); rathread_wait(queryThread, NULL); - + // Destroy cond var and mutex. racond_destroy( queryThreadCond ); ramutex_destroy( queryThreadMutex ); - + /* Clear missing vars */ for( i = 0; i < queryThreadData.count; i++ ) { aFree(queryThreadData.entry[i]); } - + aFree(queryThreadData.entry); - + for( i = 0; i < logThreadData.count; i++ ) { aFree(logThreadData.entry[i]); } - - aFree(logThreadData.entry); + + aFree(logThreadData.entry); #endif - + return 0; } /*========================================== - * ���� + * ?��?��?��?�� *------------------------------------------*/ int do_init_script() { userfunc_db=strdb_alloc(DB_OPT_DUP_KEY,0); @@ -4256,16 +4256,16 @@ int do_init_script() { CREATE(logThreadData.entry, char *, 1); logThreadData.count = 0; /* QueryThread Start */ - + InitializeSpinLock(&queryThreadLock); - + queryThreadData.timer = INVALID_TIMER; queryThreadTerminate = 0; queryThreadMutex = ramutex_create(); queryThreadCond = racond_create(); - + queryThread = rathread_create(queryThread_main, NULL); - + if(queryThread == NULL){ ShowFatalError("do_init_script: cannot spawn Query Thread.\n"); exit(EXIT_FAILURE); @@ -4282,21 +4282,21 @@ int script_reload() { #ifdef BETA_THREAD_TEST /* we're reloading so any queries undergoing should be...exterminated. */ EnterSpinLock(&queryThreadLock); - + for( i = 0; i < queryThreadData.count; i++ ) { aFree(queryThreadData.entry[i]); } queryThreadData.count = 0; - + if( queryThreadData.timer != INVALID_TIMER ) { delete_timer(queryThreadData.timer, queryThread_timer); queryThreadData.timer = INVALID_TIMER; } - + LeaveSpinLock(&queryThreadLock); #endif - + userfunc_db->clear(userfunc_db, db_script_free_code_sub); db_clear(scriptlabel_db); @@ -4305,10 +4305,10 @@ int script_reload() { for( i = 0; i < atcmd_binding_count; i++ ) { aFree(atcmd_binding[i]); } - + if( atcmd_binding_count != 0 ) aFree(atcmd_binding); - + atcmd_binding_count = 0; if(sleep_db) { @@ -4518,7 +4518,7 @@ BUILDIN_FUNC(menu) } st->state = RERUNLINE; sd->state.menu_or_input = 1; - + /** * menus beyond this length crash the client (see bugreport:6402) **/ @@ -4532,7 +4532,7 @@ BUILDIN_FUNC(menu) aFree(menu); } else clif_scriptmenu(sd, st->oid, StringBuf_Value(&buf)); - + StringBuf_Destroy(&buf); if( sd->npc_menu >= 0xff ) @@ -4609,7 +4609,7 @@ BUILDIN_FUNC(select) sd->npc_menu = 0; for( i = 2; i <= script_lastdata(st); ++i ) { text = script_getstr(st, i); - + if( sd->npc_menu > 0 ) StringBuf_AppendStr(&buf, ":"); @@ -4619,7 +4619,7 @@ BUILDIN_FUNC(select) st->state = RERUNLINE; sd->state.menu_or_input = 1; - + /** * menus beyond this length crash the client (see bugreport:6402) **/ @@ -4660,7 +4660,7 @@ BUILDIN_FUNC(select) } /// Displays a menu with options and returns the selected option. -/// Behaves like 'menu' without the target labels, except when cancel is +/// Behaves like 'menu' without the target labels, except when cancel is /// pressed. /// When cancel is pressed, the script continues and 255 is returned. /// @@ -4694,7 +4694,7 @@ BUILDIN_FUNC(prompt) st->state = RERUNLINE; sd->state.menu_or_input = 1; - + /** * menus beyond this length crash the client (see bugreport:6402) **/ @@ -4997,35 +4997,35 @@ BUILDIN_FUNC(warp) return 0; } /*========================================== - * �G���A�w�胏�[�v + * ?��G?��?��?��A?��w?��胏�[?��v *------------------------------------------*/ static int buildin_areawarp_sub(struct block_list *bl,va_list ap) { int x2,y2,x3,y3; unsigned int index; - + index = va_arg(ap,unsigned int); x2 = va_arg(ap,int); y2 = va_arg(ap,int); x3 = va_arg(ap,int); y3 = va_arg(ap,int); - + if(index == 0) pc_randomwarp((TBL_PC *)bl,CLR_TELEPORT); else if(x3 && y3) { int max, tx, ty, j = 0; - + // choose a suitable max number of attempts if( (max = (y3-y2+1)*(x3-x2+1)*3) > 1000 ) max = 1000; - + // find a suitable map cell do { tx = rnd()%(x3-x2+1)+x2; ty = rnd()%(y3-y2+1)+y2; j++; } while( map_getcell(index,tx,ty,CELL_CHKNOPASS) && j < max ); - + pc_setpos((TBL_PC *)bl,index,tx,ty,CLR_OUTSIGHT); } else @@ -5047,7 +5047,7 @@ BUILDIN_FUNC(areawarp) str = script_getstr(st,7); x2 = script_getnum(st,8); y2 = script_getnum(st,9); - + if( script_hasdata(st,10) && script_hasdata(st,11) ) { // Warp area to area if( (x3 = script_getnum(st,10)) < 0 || (y3 = script_getnum(st,11)) < 0 ){ x3 = 0; @@ -5105,7 +5105,7 @@ BUILDIN_FUNC(areapercentheal) /*========================================== * warpchar [LuzZza] - * Useful for warp one player from + * Useful for warp one player from * another player npc-session. * Using: warpchar "mapname",x,y,Char_ID; *------------------------------------------*/ @@ -5114,7 +5114,7 @@ BUILDIN_FUNC(warpchar) int x,y,a; const char *str; TBL_PC *sd; - + str=script_getstr(st,2); x=script_getnum(st,3); y=script_getnum(st,4); @@ -5131,9 +5131,9 @@ BUILDIN_FUNC(warpchar) pc_setpos(sd, sd->status.save_point.map,sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT); else pc_setpos(sd, mapindex_name2id(str), x, y, CLR_TELEPORT); - + return 0; -} +} /*========================================== * Warpparty - [Fredzilla] [Paradox924X] * Syntax: warpparty "to_mapname",x,y,Party_ID,{"from_mapname"}; @@ -5159,7 +5159,7 @@ BUILDIN_FUNC(warpparty) p = party_search(p_id); if(!p) return 0; - + type = ( strcmp(str,"Random")==0 ) ? 0 : ( strcmp(str,"SavePointAll")==0 ) ? 1 : ( strcmp(str,"SavePoint")==0 ) ? 2 @@ -5216,7 +5216,7 @@ BUILDIN_FUNC(warpparty) break; case 3: // Leader case 4: // m,x,y - if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp) + if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp) pc_setpos(pl_sd,mapindex,x,y,CLR_TELEPORT); break; } @@ -5244,7 +5244,7 @@ BUILDIN_FUNC(warpguild) g = guild_search(gid); if( g == NULL ) return 0; - + type = ( strcmp(str,"Random")==0 ) ? 0 : ( strcmp(str,"SavePointAll")==0 ) ? 1 : ( strcmp(str,"SavePoint")==0 ) ? 2 @@ -5292,10 +5292,10 @@ BUILDIN_FUNC(heal) { TBL_PC *sd; int hp,sp; - + sd = script_rid2sd(st); if (!sd) return 0; - + hp=script_getnum(st,2); sp=script_getnum(st,3); status_heal(&sd->bl, hp, sp, 1); @@ -5317,7 +5317,7 @@ BUILDIN_FUNC(itemheal) potion_sp = sp; return 0; } - + sd = script_rid2sd(st); if (!sd) return 0; pc_itemheal(sd,sd->itemid,hp,sp); @@ -5365,7 +5365,7 @@ BUILDIN_FUNC(jobchange) if (pcdb_checkid(job)) { TBL_PC* sd; - + sd = script_rid2sd(st); if( sd == NULL ) return 0; @@ -5387,9 +5387,9 @@ BUILDIN_FUNC(jobname) } /// Get input from the player. -/// For numeric inputs the value is capped to the range [min,max]. Returns 1 if +/// For numeric inputs the value is capped to the range [min,max]. Returns 1 if /// the value was higher than 'max', -1 if lower than 'min' and 0 otherwise. -/// For string inputs it returns 1 if the string was longer than 'max', -1 is +/// For string inputs it returns 1 if the string was longer than 'max', -1 is /// shorter than 'min' and 0 otherwise. /// /// input(<var>{,<min>{,<max>}}) -> <int> @@ -5867,7 +5867,7 @@ BUILDIN_FUNC(deletearray) for( ; start < end; ++start ) set_reg(st, sd, reference_uid(id, start), name, (void *)"", reference_getref(data)); } - else + else { for( ; start < end; ++start ) set_reg(st, sd, reference_uid(id, start), name, (void*)0, reference_getref(data)); @@ -5990,7 +5990,7 @@ BUILDIN_FUNC(viewpoint) y=script_getnum(st,4); id=script_getnum(st,5); color=script_getnum(st,6); - + sd = script_rid2sd(st); if( sd == NULL ) return 0; @@ -6056,7 +6056,7 @@ BUILDIN_FUNC(countitem2) int i; struct item_data* id = NULL; struct script_data* data; - + TBL_PC* sd = script_rid2sd(st); if (!sd) { script_pushint(st,0); @@ -6106,7 +6106,7 @@ BUILDIN_FUNC(countitem2) } /*========================================== - * �d�ʃ`�F�b�N + * ?��d?��ʃ`?��F?��b?��N *------------------------------------------*/ BUILDIN_FUNC(checkweight) { @@ -6314,7 +6314,7 @@ BUILDIN_FUNC(getitem2) c3=(short)script_getnum(st,9); c4=(short)script_getnum(st,10); - if(nameid<0) { // �����_�� + if(nameid<0) { // ?��?��?��?��?��_?��?�� nameid = -nameid; flag = 1; } @@ -6427,7 +6427,7 @@ BUILDIN_FUNC(rentitem) clif_additem(sd, 0, 0, flag); return 1; } - + return 0; } @@ -6448,9 +6448,9 @@ BUILDIN_FUNC(getnameditem) if (sd == NULL) { //Player not attached! script_pushint(st,0); - return 0; + return 0; } - + data=script_getdata(st,2); get_val(st,data); if( data_isstring(data) ){ @@ -6477,7 +6477,7 @@ BUILDIN_FUNC(getnameditem) tsd=map_nick2sd(conv_str(st,data)); else //Char Id was given tsd=map_charid2sd(conv_num(st,data)); - + if( tsd == NULL ) { //Failed script_pushint(st,0); @@ -6550,7 +6550,7 @@ BUILDIN_FUNC(makeitem) } else m=map_mapname2mapid(mapname); - if(nameid<0) { // �����_�� + if(nameid<0) { // ?��?��?��?��?��_?��?�� nameid = -nameid; flag = 1; } @@ -6879,7 +6879,7 @@ BUILDIN_FUNC(disableitemuse) } /*========================================== - *�L�����W�̃p�����[�^�擾 + *?��L?��?��?��?��?��W?��̃p?��?��?��?��?��[?��^?��擾 *------------------------------------------*/ BUILDIN_FUNC(readparam) { @@ -6902,7 +6902,7 @@ BUILDIN_FUNC(readparam) return 0; } /*========================================== - *�L�����W��ID�擾 + *?��L?��?��?��?��?��W?��?��ID?��擾 *------------------------------------------*/ BUILDIN_FUNC(getcharid) { @@ -6931,7 +6931,7 @@ BUILDIN_FUNC(getcharid) script_pushint(st,0); break; } - + return 0; } /*========================================== @@ -6965,7 +6965,7 @@ BUILDIN_FUNC(getnpcid) return 0; } /*========================================== - *�w��ID��PT���擾 + *?��w?��?��ID?��?��PT?��?��?��擾 *------------------------------------------*/ BUILDIN_FUNC(getpartyname) { @@ -6985,7 +6985,7 @@ BUILDIN_FUNC(getpartyname) return 0; } /*========================================== - *�w��ID��PT�l���ƃ����o�[ID�擾 + *?��w?��?��ID?��?��PT?��l?��?��?���??��?��?��?��o?��[ID?��擾 *------------------------------------------*/ BUILDIN_FUNC(getpartymember) { @@ -6996,7 +6996,7 @@ BUILDIN_FUNC(getpartymember) if( script_hasdata(st,3) ) type=script_getnum(st,3); - + if(p!=NULL){ for(i=0;i<MAX_PARTY;i++){ if(p->party.member[i].account_id){ @@ -7020,7 +7020,7 @@ BUILDIN_FUNC(getpartymember) } /*========================================== - * Retrieves party leader. if flag is specified, + * Retrieves party leader. if flag is specified, * return some of the leader data. Otherwise, return name. *------------------------------------------*/ BUILDIN_FUNC(getpartyleader) @@ -7057,7 +7057,7 @@ BUILDIN_FUNC(getpartyleader) } /*========================================== - *�w��ID�̃M���h���擾 + *?��w?��?��ID?��̃M?��?��?��h?��?��?��擾 *------------------------------------------*/ BUILDIN_FUNC(getguildname) { @@ -7078,7 +7078,7 @@ BUILDIN_FUNC(getguildname) } /*========================================== - *�w��ID��GuildMaster���擾 + *?��w?��?��ID?��?��GuildMaster?��?��?��擾 *------------------------------------------*/ BUILDIN_FUNC(getguildmaster) { @@ -7117,7 +7117,7 @@ BUILDIN_FUNC(getguildmasterid) } /*========================================== - * �L�����N�^�̖��O + * ?��L?��?��?��?��?��N?��^?��̖�?��O *------------------------------------------*/ BUILDIN_FUNC(strcharinfo) { @@ -7169,7 +7169,7 @@ BUILDIN_FUNC(strcharinfo) } /*========================================== - * �Ăяo������NPC�����擾���� + * ?��Ăяo?��?��?��?��?��?��NPC?��?��?��?��?��擾?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(strnpcinfo) { @@ -7247,7 +7247,7 @@ BUILDIN_FUNC(getequipid) script_pushint(st,-1); return 0; } - + item = sd->inventory_data[i]; if( item != 0 ) script_pushint(st,item->nameid); @@ -7258,7 +7258,7 @@ BUILDIN_FUNC(getequipid) } /*========================================== - * ������������i���B���j���[�p�j + * ?��?��?��?��?��?��?��?��?��?��?��?��i?��?��?��B?��?��?��j?��?��?��[?��p?��j *------------------------------------------*/ BUILDIN_FUNC(getequipname) { @@ -7384,7 +7384,7 @@ BUILDIN_FUNC(repairall) } /*========================================== - * �����`�F�b�N + * ?��?��?��?��?��`?��F?��b?��N *------------------------------------------*/ BUILDIN_FUNC(getequipisequiped) { @@ -7407,7 +7407,7 @@ BUILDIN_FUNC(getequipisequiped) } /*========================================== - * �����i���B�\�`�F�b�N + * ?��?��?��?��?��i?��?��?��B?��\?��`?��F?��b?��N *------------------------------------------*/ BUILDIN_FUNC(getequipisenableref) { @@ -7430,7 +7430,7 @@ BUILDIN_FUNC(getequipisenableref) } /*========================================== - * �����i�Ӓ�`�F�b�N + * ?��?��?��?��?��i?��Ӓ�`?��F?��b?��N *------------------------------------------*/ BUILDIN_FUNC(getequipisidentify) { @@ -7453,7 +7453,7 @@ BUILDIN_FUNC(getequipisidentify) } /*========================================== - * �����i���B�x + * ?��?��?��?��?��i?��?��?��B?��x *------------------------------------------*/ BUILDIN_FUNC(getequiprefinerycnt) { @@ -7476,7 +7476,7 @@ BUILDIN_FUNC(getequiprefinerycnt) } /*========================================== - * �����i����LV + * ?��?��?��?��?��i?��?��?��?��LV *------------------------------------------*/ BUILDIN_FUNC(getequipweaponlv) { @@ -7499,7 +7499,7 @@ BUILDIN_FUNC(getequipweaponlv) } /*========================================== - * �����i���B������ + * ?��?��?��?��?��i?��?��?��B?��?��?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(getequippercentrefinery) { @@ -7522,7 +7522,7 @@ BUILDIN_FUNC(getequippercentrefinery) } /*========================================== - * ���B���� + * ?��?��?��B?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(successrefitem) { @@ -7576,7 +7576,7 @@ BUILDIN_FUNC(successrefitem) } /*========================================== - * ���B���s + * ?��?��?��B?��?��?��s *------------------------------------------*/ BUILDIN_FUNC(failedrefitem) { @@ -7593,11 +7593,11 @@ BUILDIN_FUNC(failedrefitem) if(i >= 0) { sd->status.inventory[i].refine = 0; pc_unequipitem(sd,i,3); - // ���B���s�G�t�F�N�g�̃p�P�b�g + // ?��?��?��B?��?��?��s?��G?��t?��F?��N?��g?��̃p?��P?��b?��g clif_refine(sd->fd,1,i,sd->status.inventory[i].refine); pc_delitem(sd,i,1,0,2,LOG_TYPE_SCRIPT); - // ���̐l�ɂ����s��ʒm + // ?��?��?��̐l?��ɂ�?��?��?��s?��?��ʒm clif_misceffect(&sd->bl,2); } @@ -7998,7 +7998,7 @@ BUILDIN_FUNC(getgdskilllv) } /// Returns the 'basic_skill_check' setting. -/// This config determines if the server checks the skill level of NV_BASIC +/// This config determines if the server checks the skill level of NV_BASIC /// before allowing the basic actions. /// /// basicskillcheck() -> <bool> @@ -8380,7 +8380,7 @@ BUILDIN_FUNC(gettimetick) /* Asgard Version */ type=script_getnum(st,2); switch(type){ - case 2: + case 2: //type 2:(Get the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC // from the system clock.) script_pushint(st,(int)time(NULL)); @@ -8471,7 +8471,7 @@ BUILDIN_FUNC(gettimestr) } /*========================================== - * �J�v���q�ɂ��J�� + * ?��J?��v?��?��?��q?��ɂ�?��J?��?�� *------------------------------------------*/ BUILDIN_FUNC(openstorage) { @@ -8500,7 +8500,7 @@ BUILDIN_FUNC(guildopenstorage) } /*========================================== - * �A�C�e���ɂ��X�L������ + * ?��A?��C?��e?��?��?��ɂ�?��X?��L?��?��?��?��?��?�� *------------------------------------------*/ /// itemskill <skill id>,<level> /// itemskill "<skill name>",<level> @@ -8523,7 +8523,7 @@ BUILDIN_FUNC(itemskill) return 0; } /*========================================== - * �A�C�e���쐬 + * ?��A?��C?��e?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(produce) { @@ -8555,7 +8555,7 @@ BUILDIN_FUNC(cooking) return 0; } /*========================================== - * NPC�Ńy�b�g��� + * NPC?��Ńy?��b?��g?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(makepet) { @@ -8583,7 +8583,7 @@ BUILDIN_FUNC(makepet) return 0; } /*========================================== - * NPC�Ōo���l�グ�� + * NPC?��Ōo?��?��?��l?��グ?��?�� *------------------------------------------*/ BUILDIN_FUNC(getexp) { @@ -8653,7 +8653,7 @@ BUILDIN_FUNC(guildchangegm) } /*========================================== - * �����X�^�[���� + * ?��?��?��?��?��X?��^?��[?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(monster) { @@ -8675,7 +8675,7 @@ BUILDIN_FUNC(monster) event = script_getstr(st, 8); check_event(st, event); } - + if (script_hasdata(st, 9)) { size = script_getnum(st, 9); @@ -8685,7 +8685,7 @@ BUILDIN_FUNC(monster) return 1; } } - + if (script_hasdata(st, 10)) { ai = script_getnum(st, 10); @@ -8758,7 +8758,7 @@ BUILDIN_FUNC(getmobdrops) return 0; } /*========================================== - * �����X�^�[���� + * ?��?��?��?��?��X?��^?��[?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(areamonster) { @@ -8782,7 +8782,7 @@ BUILDIN_FUNC(areamonster) event = script_getstr(st, 10); check_event(st, event); } - + if (script_hasdata(st, 11)) { size = script_getnum(st, 11); @@ -8792,7 +8792,7 @@ BUILDIN_FUNC(areamonster) return 1; } } - + if (script_hasdata(st, 12)) { ai = script_getnum(st, 12); @@ -8819,12 +8819,12 @@ BUILDIN_FUNC(areamonster) } } } - + mob_once_spawn_area(sd, m, x0, y0, x1, y1, str, class_, amount, event, size, ai); return 0; } /*========================================== - * �����X�^�[�폜 + * ?��?��?��?��?��X?��^?��[?��?�� *------------------------------------------*/ static int buildin_killmonster_sub_strip(struct block_list *bl,va_list ap) { //same fix but with killmonster instead - stripping events from mobs. @@ -8833,7 +8833,7 @@ BUILDIN_FUNC(areamonster) int allflag=va_arg(ap,int); md->state.npc_killmonster = 1; - + if(!allflag){ if(strcmp(event,md->npc_event)==0) status_kill(bl); @@ -8872,7 +8872,7 @@ BUILDIN_FUNC(killmonster) if( (m=map_mapname2mapid(mapname))<0 ) return 0; - + if( map[m].flag.src4instance && st->instance_id && (m = instance_mapid2imapid(m, st->instance_id)) < 0 ) return 0; @@ -8882,7 +8882,7 @@ BUILDIN_FUNC(killmonster) return 0; } } - + map_freeblock_lock(); map_foreachinmap(buildin_killmonster_sub_strip, m, BL_MOB, event ,allflag); map_freeblock_unlock(); @@ -8892,11 +8892,11 @@ BUILDIN_FUNC(killmonster) static int buildin_killmonsterall_sub_strip(struct block_list *bl,va_list ap) { //Strips the event from the mob if it's killed the old method. struct mob_data *md; - + md = BL_CAST(BL_MOB, bl); if (md->npc_event[0]) md->npc_event[0] = 0; - + status_kill(bl); return 0; } @@ -8910,7 +8910,7 @@ BUILDIN_FUNC(killmonsterall) const char *mapname; int m; mapname=script_getstr(st,2); - + if( (m = map_mapname2mapid(mapname))<0 ) return 0; @@ -8923,7 +8923,7 @@ BUILDIN_FUNC(killmonsterall) return 0; } } - + map_foreachinmap(buildin_killmonsterall_sub_strip,m,BL_MOB); return 0; } @@ -8953,7 +8953,7 @@ BUILDIN_FUNC(clone) if( script_hasdata(st,9) ) flag=script_getnum(st,9); - + if( script_hasdata(st,10) ) duration=script_getnum(st,10); @@ -8979,7 +8979,7 @@ BUILDIN_FUNC(clone) return 0; } /*========================================== - * �C�x���g���s + * ?��C?��x?��?��?��g?��?��?��s *------------------------------------------*/ BUILDIN_FUNC(doevent) { @@ -8996,7 +8996,7 @@ BUILDIN_FUNC(doevent) return 0; } /*========================================== - * NPC��̃C�x���g���s + * NPC?��?��̃C?��x?��?��?��g?��?��?��s *------------------------------------------*/ BUILDIN_FUNC(donpcevent) { @@ -9025,7 +9025,7 @@ BUILDIN_FUNC(cmdothernpc) // Added by RoVeRT } /*========================================== - * �C�x���g�^�C�}�[�lj� + * ?��C?��x?��?��?��g?��^?��C?��}?��[?��lj� *------------------------------------------*/ BUILDIN_FUNC(addtimer) { @@ -9042,7 +9042,7 @@ BUILDIN_FUNC(addtimer) return 0; } /*========================================== - * �C�x���g�^�C�}�[�폜 + * ?��C?��x?��?��?��g?��^?��C?��}?��[?��?�� *------------------------------------------*/ BUILDIN_FUNC(deltimer) { @@ -9059,7 +9059,7 @@ BUILDIN_FUNC(deltimer) return 0; } /*========================================== - * �C�x���g�^�C�}�[�̃J�E���g�l�lj� + * ?��C?��x?��?��?��g?��^?��C?��}?��[?��̃J?��E?��?��?��g?��l?��lj� *------------------------------------------*/ BUILDIN_FUNC(addtimercount) { @@ -9079,7 +9079,7 @@ BUILDIN_FUNC(addtimercount) } /*========================================== - * NPC�^�C�}�[���� + * NPC?��^?��C?��}?��[?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(initnpctimer) { @@ -9128,7 +9128,7 @@ BUILDIN_FUNC(initnpctimer) return 0; } /*========================================== - * NPC�^�C�}�[�J�n + * NPC?��^?��C?��}?��[?��J?��n *------------------------------------------*/ BUILDIN_FUNC(startnpctimer) { @@ -9175,7 +9175,7 @@ BUILDIN_FUNC(startnpctimer) return 0; } /*========================================== - * NPC�^�C�}�[��~ + * NPC?��^?��C?��}?��[?��?��~ *------------------------------------------*/ BUILDIN_FUNC(stopnpctimer) { @@ -9217,7 +9217,7 @@ BUILDIN_FUNC(stopnpctimer) return 0; } /*========================================== - * NPC�^�C�}�[��� + * NPC?��^?��C?��}?��[?��?��?���� *------------------------------------------*/ BUILDIN_FUNC(getnpctimer) { @@ -9230,7 +9230,7 @@ BUILDIN_FUNC(getnpctimer) nd = npc_name2id(script_getstr(st,3)); else nd = (struct npc_data *)map_id2bl(st->oid); - + if( !nd || nd->bl.type != BL_NPC ) { script_pushint(st,0); @@ -9262,7 +9262,7 @@ BUILDIN_FUNC(getnpctimer) return 0; } /*========================================== - * NPC�^�C�}�[�l�ݒ� + * NPC?��^?��C?��}?��[?��l?��ݒ� *------------------------------------------*/ BUILDIN_FUNC(setnpctimer) { @@ -9358,7 +9358,7 @@ BUILDIN_FUNC(playerattached) } /*========================================== - * �V�̐��A�i�E���X + * ?��V?��̐�?��A?��i?��E?��?��?��X *------------------------------------------*/ BUILDIN_FUNC(announce) { @@ -9369,14 +9369,14 @@ BUILDIN_FUNC(announce) int fontSize = script_hasdata(st,6) ? script_getnum(st,6) : 12; // default fontSize int fontAlign = script_hasdata(st,7) ? script_getnum(st,7) : 0; // default fontAlign int fontY = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontY - + if (flag&0x0f) // Broadcast source or broadcast region defined { send_target target; struct block_list *bl = (flag&0x08) ? map_id2bl(st->oid) : (struct block_list *)script_rid2sd(st); // If bc_npc flag is set, use NPC as broadcast source if (bl == NULL) return 0; - + flag &= 0x07; target = (flag == 1) ? ALL_SAMEMAP : (flag == 2) ? AREA : @@ -9397,7 +9397,7 @@ BUILDIN_FUNC(announce) return 0; } /*========================================== - * �V�̐��A�i�E���X�i����}�b�v�j + * ?��V?��̐�?��A?��i?��E?��?��?��X?��i?��?��?��?��}?��b?��v?��j *------------------------------------------*/ static int buildin_announce_sub(struct block_list *bl, va_list ap) { @@ -9436,7 +9436,7 @@ BUILDIN_FUNC(mapannounce) return 0; } /*========================================== - * �V�̐��A�i�E���X�i����G���A�j + * ?��V?��̐�?��A?��i?��E?��?��?��X?��i?��?��?��?��G?��?��?��A?��j *------------------------------------------*/ BUILDIN_FUNC(areaannounce) { @@ -9463,7 +9463,7 @@ BUILDIN_FUNC(areaannounce) } /*========================================== - * ���[�U�[������ + * ?��?��?��[?��U?��[?��?��?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(getusers) { @@ -9526,7 +9526,7 @@ BUILDIN_FUNC(getusersname) clif_scriptmes(sd,st->oid,pl_sd->status.name); } mapit_free(iter); - + return 0; } /*========================================== @@ -9558,7 +9558,7 @@ BUILDIN_FUNC(getmapguildusers) return 0; } /*========================================== - * �}�b�v�w�胆�[�U�[������ + * ?��}?��b?��v?��w?���??��[?��U?��[?��?��?��?��?��?�� *------------------------------------------*/ BUILDIN_FUNC(getmapusers) { @@ -9573,7 +9573,7 @@ BUILDIN_FUNC(getmapusers) return 0; } /*========================================== - * �G���A�w�胆�[�U�[������ + * ?��G?��?��?��A?��w?���??��[?��U?��[?��?��?��?��?��?�� *------------------------------------------*/ static int buildin_getareausers_sub(struct block_list *bl,va_list ap) { @@ -9601,7 +9601,7 @@ BUILDIN_FUNC(getareausers) } /*========================================== - * �G���A�w��h���b�v�A�C�e�������� + * ?��G?��?��?��A?��w?��?��h?��?��?��b?��v?��A?��C?��e?��?��?��?��?��?��?��?�� *------------------------------------------*/ static int buildin_getareadropitem_sub(struct block_list *bl,va_list ap) { @@ -9647,7 +9647,7 @@ BUILDIN_FUNC(getareadropitem) return 0; } /*========================================== - * NPC�̗L�� + * NPC?��̗L?��?�� *------------------------------------------*/ BUILDIN_FUNC(enablenpc) { @@ -9657,7 +9657,7 @@ BUILDIN_FUNC(enablenpc) return 0; } /*========================================== - * NPC�̖��� + * NPC?��̖�?��?�� *------------------------------------------*/ BUILDIN_FUNC(disablenpc) { @@ -9668,7 +9668,7 @@ BUILDIN_FUNC(disablenpc) } /*========================================== - * �B��Ă���NPC�̕\�� + * ?��B?��?��Ă�?��?��NPC?��̕\?��?�� *------------------------------------------*/ BUILDIN_FUNC(hideoffnpc) { @@ -9678,7 +9678,7 @@ BUILDIN_FUNC(hideoffnpc) return 0; } /*========================================== - * NPC���n�C�f�B���O + * NPC?��?��?��n?��C?��f?��B?��?��?��O *------------------------------------------*/ BUILDIN_FUNC(hideonnpc) { @@ -9818,7 +9818,7 @@ BUILDIN_FUNC(sc_end) bl = map_id2bl(script_getnum(st,3)); else bl = map_id2bl(st->rid); - + if( potion_flag==1 && potion_target ) {//##TODO how does this work [FlavioJS] bl = map_id2bl(potion_target); @@ -9840,7 +9840,7 @@ BUILDIN_FUNC(sc_end) } /*========================================== - * ��Ԉُ�ϐ����v�Z�����m����Ԃ� + * ?��?��Ԉُ�ϐ�?��?��?��v?��Z?��?��?��?��?��m?��?��?��?��Ԃ� *------------------------------------------*/ BUILDIN_FUNC(getscrate) { @@ -9849,7 +9849,7 @@ BUILDIN_FUNC(getscrate) type=script_getnum(st,2); rate=script_getnum(st,3); - if( script_hasdata(st,4) ) //�w�肵���L�����̑ϐ����v�Z���� + if( script_hasdata(st,4) ) //?��w?��肵?��?��?��L?��?��?��?��?��̑ϐ�?��?��?��v?��Z?��?��?��?�� bl = map_id2bl(script_getnum(st,4)); else bl = map_id2bl(st->rid); @@ -9888,7 +9888,7 @@ BUILDIN_FUNC(getstatus) script_pushint(st, 0); return 0; } - + switch( type ) { case 1: script_pushint(st, sd->sc.data[id]->val1); break; @@ -9923,7 +9923,7 @@ BUILDIN_FUNC(debugmes) } /*========================================== - *�ߊl�A�C�e���g�p + *?��ߊl?��A?��C?��e?��?��?��g?��p *------------------------------------------*/ BUILDIN_FUNC(catchpet) { @@ -9981,7 +9981,7 @@ BUILDIN_FUNC(homunculus_mutate) if(merc_is_hom_active(sd->hd)) { m_class = hom_class2mapid(sd->hd->homunculus.class_); m_id = hom_class2mapid(homun_id); - + if ( m_class != -1 && m_id != -1 && m_class&HOM_EVO && m_id&HOM_S && sd->hd->homunculus.level >= 99 ) hom_mutate(sd->hd, homun_id); else @@ -10077,7 +10077,7 @@ BUILDIN_FUNC(resetlvl) return 0; } /*========================================== - * �X�e�[�^�X���Z�b�g + * ?��X?��e?��[?��^?��X?��?��?��Z?��b?��g *------------------------------------------*/ BUILDIN_FUNC(resetstatus) { @@ -10130,7 +10130,7 @@ BUILDIN_FUNC(changebase) { if (!battle_config.wedding_modifydisplay || //Do not show the wedding sprites sd->class_&JOBL_BABY //Baby classes screw up when showing wedding sprites. [Skotlex] They don't seem to anymore. - ) + ) return 0; } @@ -10148,7 +10148,7 @@ BUILDIN_FUNC(changebase) } /*========================================== - * ���ʕϊ� + * ?��?��?��ʕϊ� *------------------------------------------*/ BUILDIN_FUNC(changesex) { @@ -10173,16 +10173,16 @@ BUILDIN_FUNC(globalmes) struct npc_data *nd = (struct npc_data *)bl; const char *name=NULL,*mes; - mes=script_getstr(st,2); // ���b�Z�[�W�̎擾 + mes=script_getstr(st,2); // ?��?��?��b?��Z?��[?��W?��̎擾 if(mes==NULL) return 0; - - if(script_hasdata(st,3)){ // NPC���̎擾(123#456) + + if(script_hasdata(st,3)){ // NPC?��?��?��̎擾(123#456) name=script_getstr(st,3); } else { name=nd->name; } - npc_globalmessage(name,mes); // �O���[�o�����b�Z�[�W���M + npc_globalmessage(name,mes); // ?��O?��?��?��[?��o?��?��?��?��?��b?��Z?��[?��W?��?��?��M return 0; } @@ -10384,7 +10384,7 @@ BUILDIN_FUNC(warpwaitingpc) {// no zeny to cover set fee break; } - pc_payzeny(sd, cd->zeny); + pc_payzeny(sd, cd->zeny, LOG_TYPE_NPC, NULL); } mapreg_setreg(reference_uid(add_str("$@warpwaitingpc"), i), sd->bl.id); @@ -10417,7 +10417,7 @@ static void script_detach_rid(struct script_state* st) } /*========================================== - * RID�̃A�^�b�` + * RID?��̃A?��^?��b?��` *------------------------------------------*/ BUILDIN_FUNC(attachrid) { @@ -10435,7 +10435,7 @@ BUILDIN_FUNC(attachrid) return 0; } /*========================================== - * RID�̃f�^�b�` + * RID?��̃f?��^?��b?��` *------------------------------------------*/ BUILDIN_FUNC(detachrid) { @@ -10443,7 +10443,7 @@ BUILDIN_FUNC(detachrid) return 0; } /*========================================== - * ���݃`�F�b�N + * ?��?��?��݃`?��F?��b?��N *------------------------------------------*/ BUILDIN_FUNC(isloggedin) { @@ -10471,7 +10471,7 @@ BUILDIN_FUNC(setmapflagnosave) y=script_getnum(st,5); m = map_mapname2mapid(str); mapindex = mapindex_name2id(str2); - + if(m >= 0 && mapindex) { map[m].flag.nosave=1; map[m].save.map=mapindex; @@ -10801,7 +10801,7 @@ BUILDIN_FUNC(pvpoff) if(battle_config.pk_mode) // disable ranking options if pk_mode is on [Valaris] return 0; - + map_foreachinmap(buildin_pvpoff_sub, m, BL_PC); return 0; } @@ -10843,14 +10843,14 @@ BUILDIN_FUNC(emotion) { int type; int player=0; - + type=script_getnum(st,2); if(type < 0 || type > 100) return 0; if( script_hasdata(st,3) ) player=script_getnum(st,3); - + if (player) { TBL_PC *sd = NULL; if( script_hasdata(st,4) ) @@ -11067,7 +11067,7 @@ BUILDIN_FUNC(setcastledata) } /* ===================================================================== - * �M���h����v������ + * ?��M?��?��?��h?��?��?��?��v?��?��?��?��?��?�� * ---------------------------------------------------------------------*/ BUILDIN_FUNC(requestguildinfo) { @@ -11133,7 +11133,7 @@ BUILDIN_FUNC(successremovecards) { return 0; } - if(itemdb_isspecial(sd->status.inventory[i].card[0])) + if(itemdb_isspecial(sd->status.inventory[i].card[0])) return 0; for( c = sd->inventory_data[i]->slot - 1; c >= 0; --c ) { @@ -11145,18 +11145,18 @@ BUILDIN_FUNC(successremovecards) { item_tmp.nameid = sd->status.inventory[i].card[c]; item_tmp.identify = 1; - if((flag=pc_additem(sd,&item_tmp,1,LOG_TYPE_SCRIPT))){ // ���ĂȂ��Ȃ�h���b�v + if((flag=pc_additem(sd,&item_tmp,1,LOG_TYPE_SCRIPT))){ // ?��?��?��ĂȂ�?��Ȃ�h?��?��?��b?��v clif_additem(sd,0,0,flag); map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } } } - if(cardflag == 1) {// �J�[�h����菜�����A�C�e������ + if(cardflag == 1) {// ?��J?��[?��h?��?��?��?��菜�?��?��?��?��A?��C?��e?��?��?��?��?��?�� int flag; struct item item_tmp; memset(&item_tmp,0,sizeof(item_tmp)); - + item_tmp.nameid = sd->status.inventory[i].nameid; item_tmp.identify = 1; item_tmp.refine = sd->status.inventory[i].refine; @@ -11167,7 +11167,7 @@ BUILDIN_FUNC(successremovecards) { item_tmp.card[j]=sd->status.inventory[i].card[j]; pc_delitem(sd,i,1,0,3,LOG_TYPE_SCRIPT); - if((flag=pc_additem(sd,&item_tmp,1,LOG_TYPE_SCRIPT))){ // ���ĂȂ��Ȃ�h���b�v + if((flag=pc_additem(sd,&item_tmp,1,LOG_TYPE_SCRIPT))){ // ?��?��?��ĂȂ�?��Ȃ�h?��?��?��b?��v clif_additem(sd,0,0,flag); map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } @@ -11203,12 +11203,12 @@ BUILDIN_FUNC(failedremovecards) { if( sd->status.inventory[i].card[c] && itemdb_type(sd->status.inventory[i].card[c]) == IT_CARD ) { cardflag = 1; - if(typefail == 2) {// add cards to inventory, clear + if(typefail == 2) {// add cards to inventory, clear int flag; struct item item_tmp; - + memset(&item_tmp,0,sizeof(item_tmp)); - + item_tmp.nameid = sd->status.inventory[i].card[c]; item_tmp.identify = 1; @@ -11221,15 +11221,15 @@ BUILDIN_FUNC(failedremovecards) { } if(cardflag == 1) { - if(typefail == 0 || typefail == 2){ // ����� + if(typefail == 0 || typefail == 2){ // ?��?��?��?��?��?�� pc_delitem(sd,i,1,0,2,LOG_TYPE_SCRIPT); } - if(typefail == 1){ // �J�[�h�̂ݑ����i�����Ԃ��j + if(typefail == 1){ // ?��J?��[?��h?��̂ݑ�?��?��?��i?��?��?��?��?��Ԃ�?��j int flag; struct item item_tmp; - + memset(&item_tmp,0,sizeof(item_tmp)); - + item_tmp.nameid = sd->status.inventory[i].nameid; item_tmp.identify = 1; item_tmp.refine = sd->status.inventory[i].refine; @@ -11238,7 +11238,7 @@ BUILDIN_FUNC(failedremovecards) { for (j = sd->inventory_data[i]->slot; j < MAX_SLOTS; j++) item_tmp.card[j]=sd->status.inventory[i].card[j]; - + pc_delitem(sd,i,1,0,2,LOG_TYPE_SCRIPT); if((flag=pc_additem(sd,&item_tmp,1,LOG_TYPE_SCRIPT))){ @@ -11344,7 +11344,7 @@ BUILDIN_FUNC(mobcount) // Added by RoVeRT script_pushint(st,-1); return 0; } - + if( map[m].flag.src4instance && map[m].instance_id == 0 && st->instance_id && (m = instance_mapid2imapid(m, st->instance_id)) < 0 ) { script_pushint(st,-1); @@ -11563,7 +11563,7 @@ BUILDIN_FUNC(setwall) const char *map, *name; int x, y, m, size, dir; bool shootable; - + map = script_getstr(st,2); x = script_getnum(st,3); y = script_getnum(st,4); @@ -11628,7 +11628,7 @@ BUILDIN_FUNC(guardianinfo) } /*========================================== - * ID����Item�� + * ID?��?��?��?��Item?��?�� *------------------------------------------*/ BUILDIN_FUNC(getitemname) { @@ -11839,7 +11839,7 @@ BUILDIN_FUNC(petloot) int max; struct pet_data *pd; TBL_PC *sd=script_rid2sd(st); - + if(sd==NULL || sd->pd==NULL) return 0; @@ -11849,7 +11849,7 @@ BUILDIN_FUNC(petloot) max = 1; //Let'em loot at least 1 item. else if (max > MAX_PETLOOT_SIZE) max = MAX_PETLOOT_SIZE; - + pd = sd->pd; if (pd->loot != NULL) { //Release whatever was there already and reallocate memory @@ -11860,7 +11860,7 @@ BUILDIN_FUNC(petloot) pd->loot = (struct pet_loot *)aMalloc(sizeof(struct pet_loot)); pd->loot->item = (struct item *)aCalloc(max,sizeof(struct item)); - + pd->loot->max=max; pd->loot->count = 0; pd->loot->weight = 0; @@ -11868,13 +11868,13 @@ BUILDIN_FUNC(petloot) return 0; } /*========================================== - * PC�̏����i���ǂݎ�� + * PC?��̏�?��?��?��i?��?��?��ǂݎ�?�� *------------------------------------------*/ BUILDIN_FUNC(getinventorylist) { TBL_PC *sd=script_rid2sd(st); char card_var[NAME_LENGTH]; - + int i,j=0,k; if(!sd) return 0; for(i=0;i<MAX_INVENTORY;i++){ @@ -11966,9 +11966,9 @@ BUILDIN_FUNC(undisguise) } /*========================================== - * NPC�N���X�`�F���W - * class�͕ς�肽��class - * type�͒ʏ�0�Ȃ̂��ȁH + * NPC?��N?��?��?��X?��`?��F?��?��?��W + * class?��͕ς�肽?��?��class + * type?��͒ʏ�0?��Ȃ̂�?��ȁH *------------------------------------------*/ BUILDIN_FUNC(classchange) { @@ -11984,7 +11984,7 @@ BUILDIN_FUNC(classchange) } /*========================================== - * NPC���甭������G�t�F�N�g + * NPC?��?��?��甭?��?��?��?��?��?��G?��t?��F?��N?��g *------------------------------------------*/ BUILDIN_FUNC(misceffect) { @@ -12071,7 +12071,7 @@ BUILDIN_FUNC(playBGMall) } /*========================================== - * �T�E���h�G�t�F�N�g + * ?��T?��E?��?��?��h?��G?��t?��F?��N?��g *------------------------------------------*/ BUILDIN_FUNC(soundeffect) { @@ -12154,14 +12154,14 @@ BUILDIN_FUNC(petrecovery) return 0; pd=sd->pd; - + if (pd->recovery) { //Halt previous bonus if (pd->recovery->timer != INVALID_TIMER) delete_timer(pd->recovery->timer, pet_recovery_timer); } else //Init pd->recovery = (struct pet_recovery *)aMalloc(sizeof(struct pet_recovery)); - + pd->recovery->type = (sc_type)script_getnum(st,2); pd->recovery->delay = script_getnum(st,3); pd->recovery->timer = INVALID_TIMER; @@ -12191,8 +12191,8 @@ BUILDIN_FUNC(petheal) delete_timer(pd->s_skill->timer, pet_heal_timer); } } else //init memory - pd->s_skill = (struct pet_skill_support *) aMalloc(sizeof(struct pet_skill_support)); - + pd->s_skill = (struct pet_skill_support *) aMalloc(sizeof(struct pet_skill_support)); + pd->s_skill->id=0; //This id identifies that it IS petheal rather than pet_skillsupport //Use the lv as the amount to heal pd->s_skill->lv=script_getnum(st,2); @@ -12225,7 +12225,7 @@ BUILDIN_FUNC(petskillattack) pd=sd->pd; if (pd->a_skill == NULL) pd->a_skill = (struct pet_skill_attack *)aMalloc(sizeof(struct pet_skill_attack)); - + pd->a_skill->id=( script_isstring(st,2) ? skill_name2id(script_getstr(st,2)) : script_getnum(st,2) ); pd->a_skill->lv=script_getnum(st,3); pd->a_skill->div_ = 0; @@ -12251,7 +12251,7 @@ BUILDIN_FUNC(petskillattack2) pd=sd->pd; if (pd->a_skill == NULL) pd->a_skill = (struct pet_skill_attack *)aMalloc(sizeof(struct pet_skill_attack)); - + pd->a_skill->id=( script_isstring(st,2) ? skill_name2id(script_getstr(st,2)) : script_getnum(st,2) ); pd->a_skill->lv=script_getnum(st,3); pd->a_skill->div_ = script_getnum(st,4); @@ -12285,8 +12285,8 @@ BUILDIN_FUNC(petskillsupport) delete_timer(pd->s_skill->timer, pet_heal_timer); } } else //init memory - pd->s_skill = (struct pet_skill_support *) aMalloc(sizeof(struct pet_skill_support)); - + pd->s_skill = (struct pet_skill_support *) aMalloc(sizeof(struct pet_skill_support)); + pd->s_skill->id=( script_isstring(st,2) ? skill_name2id(script_getstr(st,2)) : script_getnum(st,2) ); pd->s_skill->lv=script_getnum(st,3); pd->s_skill->delay=script_getnum(st,4); @@ -12485,7 +12485,7 @@ BUILDIN_FUNC(recovery) return 0; } /*========================================== - * Get your pet info: getpetinfo(n) + * Get your pet info: getpetinfo(n) * n -> 0:pet_id 1:pet_class 2:pet_name * 3:friendly 4:hungry, 5: rename flag. *------------------------------------------*/ @@ -12494,7 +12494,7 @@ BUILDIN_FUNC(getpetinfo) TBL_PC *sd=script_rid2sd(st); TBL_PET *pd; int type=script_getnum(st,2); - + if(!sd || !sd->pd) { if (type == 2) script_pushconststr(st,"null"); @@ -12518,7 +12518,7 @@ BUILDIN_FUNC(getpetinfo) } /*========================================== - * Get your homunculus info: gethominfo(n) + * Get your homunculus info: gethominfo(n) * n -> 0:hom_id 1:class 2:name * 3:friendly 4:hungry, 5: rename flag. * 6: level @@ -12944,7 +12944,7 @@ BUILDIN_FUNC(getmapxy) x= bl->x; y= bl->y; safestrncpy(mapname, map[bl->m].name, MAP_NAME_LENGTH); - + //Set MapName$ num=st->stack->stack_data[st->start+2].u.num; name=get_str(num&0x00ffffff); @@ -13010,7 +13010,7 @@ BUILDIN_FUNC(summon) sd=script_rid2sd(st); if (!sd) return 0; - + str =script_getstr(st,2); _class=script_getnum(st,3); if( script_hasdata(st,4) ) @@ -13066,12 +13066,12 @@ BUILDIN_FUNC(isequippedcnt) script_pushint(st,0); return 0; } - + for (i=0; id!=0; i++) { FETCH (i+2, id) else id = 0; if (id <= 0) continue; - + for (j=0; j<EQI_MAX; j++) { int index; index = sd->equip_index[j]; @@ -13079,7 +13079,7 @@ BUILDIN_FUNC(isequippedcnt) if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) continue; if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) continue; if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == index || sd->equip_index[EQI_HEAD_LOW] == index)) continue; - + if(!sd->inventory_data[index]) continue; @@ -13090,13 +13090,13 @@ BUILDIN_FUNC(isequippedcnt) if (itemdb_isspecial(sd->status.inventory[index].card[0])) continue; //No cards for(k=0; k<sd->inventory_data[index]->slot; k++) { - if (sd->status.inventory[index].card[k] == id) + if (sd->status.inventory[index].card[k] == id) ret++; //[Lupus] } } } } - + script_pushint(st,ret); return 0; } @@ -13117,7 +13117,7 @@ BUILDIN_FUNC(isequipped) unsigned int setitem_hash = 0, setitem_hash2 = 0; sd = script_rid2sd(st); - + if (!sd) { //If the player is not attached it is a script error anyway... but better prevent the map server from crashing... script_pushint(st,0); return 0; @@ -13136,10 +13136,10 @@ BUILDIN_FUNC(isequipped) if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) continue; if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) continue; if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == index || sd->equip_index[EQI_HEAD_LOW] == index)) continue; - + if(!sd->inventory_data[index]) continue; - + if (itemdb_type(id) != IT_CARD) { if (sd->inventory_data[index]->nameid != id) continue; @@ -13199,15 +13199,15 @@ BUILDIN_FUNC(cardscnt) int index; sd = script_rid2sd(st); - + for (i=0; id!=0; i++) { FETCH (i+2, id) else id = 0; if (id <= 0) continue; - + index = current_equip_item_index; //we get CURRENT WEAPON inventory index from status.c [Lupus] if(index < 0) continue; - + if(!sd->inventory_data[index]) continue; @@ -13326,7 +13326,7 @@ BUILDIN_FUNC(setbattleflag) flag = script_getstr(st,2); value = script_getstr(st,3); // HACK: Retrieve number as string (auto-converted) for battle_set_value - + if (battle_set_value(flag, value) == 0) ShowWarning("buildin_setbattleflag: unknown battle_config flag '%s'\n",flag); else @@ -13404,7 +13404,7 @@ BUILDIN_FUNC(charislower) BUILDIN_FUNC(charat) { const char *str = script_getstr(st,2); int pos = script_getnum(st,3); - + if( pos >= 0 && (unsigned int)pos < strlen(str) ) { char output[2]; output[0] = str[pos]; @@ -13537,7 +13537,7 @@ BUILDIN_FUNC(substr) len = end - start + 1; output = (char*)aMalloc(len + 1); memcpy(output, &str[start], len); - } else + } else output = (char*)aMalloc(1); output[len] = '\0'; @@ -13559,7 +13559,7 @@ BUILDIN_FUNC(explode) size_t len = strlen(str); int i = 0, j = 0; int start; - + char *temp; const char* name; @@ -14004,8 +14004,8 @@ BUILDIN_FUNC(strpos) { //=============================================================== // replacestr <input>, <search>, <replace>{, <usecase>{, <count>}} // -// Note: Finds all instances of <search> in <input> and replaces -// with <replace>. If specified will only replace as many +// Note: Finds all instances of <search> in <input> and replaces +// with <replace>. If specified will only replace as many // instances as specified in <count>. By default will be case // sensitive. //--------------------------------------------------------------- @@ -14090,7 +14090,7 @@ BUILDIN_FUNC(replacestr) //======================================================== // countstr <input>, <search>{, <usecase>} // -// Note: Counts the number of times <search> occurs in +// Note: Counts the number of times <search> occurs in // <input>. By default will be case sensitive. //-------------------------------------------------------- BUILDIN_FUNC(countstr) @@ -14301,7 +14301,7 @@ BUILDIN_FUNC(setd) } else { setd_sub(st, sd, varname, elem, (void *)__64BPRTSIZE(script_getnum(st, 3)), NULL); } - + return 0; } @@ -14389,7 +14389,7 @@ int buildin_query_sql_sub(struct script_state* st, Sql* handle) // Free data Sql_FreeResult(handle); script_pushint(st, i); - + return 0; } @@ -14401,7 +14401,7 @@ BUILDIN_FUNC(query_sql) { st->state = RERUNLINE;/* will continue when the query is finished running. */ } else st->state = RUN; - + return 0; #else return buildin_query_sql_sub(st, mmysql_handle); @@ -14417,12 +14417,12 @@ BUILDIN_FUNC(query_logsql) { #ifdef BETA_THREAD_TEST if( st->state != RERUNLINE ) { queryThread_add(st,true); - + st->state = RERUNLINE;/* will continue when the query is finished running. */ } else st->state = RUN; - - return 0; + + return 0; #else return buildin_query_sql_sub(st, logmysql_handle); #endif @@ -14510,7 +14510,7 @@ BUILDIN_FUNC(callshop) script_pushint(st,0); return 1; } - + if( nd->subtype == SHOP ) { // flag the user as using a valid script call for opening the shop (for floating NPCs) @@ -15063,7 +15063,7 @@ BUILDIN_FUNC(unitwarp) mapname = script_getstr(st, 3); x = (short)script_getnum(st,4); y = (short)script_getnum(st,5); - + if (!unit_id) //Warp the script's runner bl = map_id2bl(st->rid); else @@ -15083,7 +15083,7 @@ BUILDIN_FUNC(unitwarp) } /// Makes the unit attack the target. -/// If the unit is a player and <action type> is not 0, it does a continuous +/// If the unit is a player and <action type> is not 0, it does a continuous /// attack instead of a single attack. /// Returns if the request was successfull. /// @@ -15102,7 +15102,7 @@ BUILDIN_FUNC(unitattack) script_pushint(st, 0); return 0; } - + data = script_getdata(st, 3); get_val(st, data); if( data_isstring(data) ) @@ -15118,7 +15118,7 @@ BUILDIN_FUNC(unitattack) script_pushint(st, 0); return 0; } - + // get actiontype if( script_hasdata(st,4) ) actiontype = script_getnum(st,4); @@ -15271,7 +15271,7 @@ BUILDIN_FUNC(unitskillusepos) BUILDIN_FUNC(sleep) { int ticks; - + ticks = script_getnum(st,2); // detach the player @@ -15300,7 +15300,7 @@ BUILDIN_FUNC(sleep) BUILDIN_FUNC(sleep2) { int ticks; - + ticks = script_getnum(st,2); if( ticks <= 0 ) @@ -15532,7 +15532,7 @@ BUILDIN_FUNC(mercenary_create) if( (sd = script_rid2sd(st)) == NULL || sd->md || sd->status.mer_id != 0 ) return 0; - + class_ = script_getnum(st,2); if( !merc_class(class_) ) @@ -15931,7 +15931,7 @@ BUILDIN_FUNC(bg_monster_set_team) struct block_list *mbl; int id = script_getnum(st,2), bg_id = script_getnum(st,3); - + if( (mbl = map_id2bl(id)) == NULL || mbl->type != BL_MOB ) return 0; md = (TBL_MOB *)mbl; @@ -15950,7 +15950,7 @@ BUILDIN_FUNC(bg_leave) struct map_session_data *sd = script_rid2sd(st); if( sd == NULL || !sd->bg_id ) return 0; - + bg_team_leave(sd,0); return 0; } @@ -16068,7 +16068,7 @@ BUILDIN_FUNC(instance_create) script_pushint(st, -2); return 0; } - + script_pushint(st, res); return 0; } @@ -16103,7 +16103,7 @@ BUILDIN_FUNC(instance_attachmap) int m; int instance_id; bool usebasename = false; - + name = script_getstr(st,2); instance_id = script_getnum(st,3); if( script_hasdata(st,4) && script_getnum(st,4) > 0) @@ -16116,7 +16116,7 @@ BUILDIN_FUNC(instance_attachmap) return 0; } script_pushconststr(st, map[m].name); - + return 0; } @@ -16126,7 +16126,7 @@ BUILDIN_FUNC(instance_detachmap) struct party_data *p; const char *str; int m, instance_id; - + str = script_getstr(st, 2); if( script_hasdata(st, 3) ) instance_id = script_getnum(st, 3); @@ -16135,7 +16135,7 @@ BUILDIN_FUNC(instance_detachmap) else if( (sd = script_rid2sd(st)) != NULL && sd->status.party_id && (p = party_search(sd->status.party_id)) != NULL && p->instance_id ) instance_id = p->instance_id; else return 0; - + if( (m = map_mapname2mapid(str)) < 0 || (m = instance_map2imap(m,instance_id)) < 0 ) { ShowError("buildin_instance_detachmap: Trying to detach invalid map %s\n", str); @@ -16149,11 +16149,11 @@ BUILDIN_FUNC(instance_detachmap) BUILDIN_FUNC(instance_attach) { int instance_id; - + instance_id = script_getnum(st, 2); if( instance_id <= 0 || instance_id >= MAX_INSTANCE ) return 0; - + st->instance_id = instance_id; return 0; } @@ -16163,7 +16163,7 @@ BUILDIN_FUNC(instance_id) int type, instance_id; struct map_session_data *sd; struct party_data *p; - + if( script_hasdata(st, 2) ) { type = script_getnum(st, 2); @@ -16187,7 +16187,7 @@ BUILDIN_FUNC(instance_set_timeout) int instance_id; struct map_session_data *sd; struct party_data *p; - + progress_timeout = script_getnum(st, 2); idle_timeout = script_getnum(st, 3); @@ -16201,7 +16201,7 @@ BUILDIN_FUNC(instance_set_timeout) if( instance_id > 0 ) instance_set_timeout(instance_id, progress_timeout, idle_timeout); - + return 0; } @@ -16245,7 +16245,7 @@ BUILDIN_FUNC(instance_announce) if( instance_id <= 0 || instance_id >= MAX_INSTANCE ) return 0; - + for( i = 0; i < instance[instance_id].num_map; i++ ) map_foreachinmap(buildin_announce_sub, instance[instance_id].map[i], BL_PC, mes, strlen(mes)+1, flag&0xf0, fontColor, fontType, fontSize, fontAlign, fontY); @@ -16261,7 +16261,7 @@ BUILDIN_FUNC(instance_npcname) struct map_session_data *sd; struct party_data *p; struct npc_data *nd; - + str = script_getstr(st, 2); if( script_hasdata(st, 3) ) instance_id = script_getnum(st, 3); @@ -16292,7 +16292,7 @@ BUILDIN_FUNC(has_instance) struct party_data *p; const char *str; int m, instance_id = 0; - + str = script_getstr(st, 2); if( script_hasdata(st, 3) ) instance_id = script_getnum(st, 3); @@ -16382,21 +16382,21 @@ BUILDIN_FUNC(instance_check_party) } for( i = 0; i < MAX_PARTY; i++ ) - if( (pl_sd = p->data[i].sd) ) - if(map_id2bl(pl_sd->bl.id)){ + if( (pl_sd = p->data[i].sd) ) + if(map_id2bl(pl_sd->bl.id)){ if(pl_sd->status.base_level < min){ script_pushint(st, 0); - return 0; + return 0; }else if(pl_sd->status.base_level > max){ script_pushint(st, 0); return 0; } c++; } - + if(c < amount){ script_pushint(st, 0); // Not enough Members in the Party to join Instance. - }else + }else script_pushint(st, 1); return 0; @@ -16416,7 +16416,7 @@ BUILDIN_FUNC(setfont) sd->user_font = font; else sd->user_font = 0; - + clif_font(sd); return 0; } @@ -16490,7 +16490,7 @@ BUILDIN_FUNC(areamobuseskill) cancel = script_getnum(st,10); emotion = script_getnum(st,11); target = script_getnum(st,12); - + map_foreachinrange(buildin_mobuseskill_sub, ¢er, range, BL_MOB, mobid, skillid, skilllv, casttime, cancel, emotion, target); return 0; } @@ -16797,19 +16797,19 @@ BUILDIN_FUNC(bindatcmd) { const char* eventName; int i, level = 0, level2 = 0; bool create = false; - + atcmd = script_getstr(st,2); eventName = script_getstr(st,3); if( *atcmd == atcommand_symbol || *atcmd == charcommand_symbol ) atcmd++; - + if( script_hasdata(st,4) ) level = script_getnum(st,4); if( script_hasdata(st,5) ) level2 = script_getnum(st,5); if( atcmd_binding_count == 0 ) { CREATE(atcmd_binding,struct atcmd_binding_data*,1); - + create = true; } else { ARR_FIND(0, atcmd_binding_count, i, strcmp(atcmd_binding[i]->command,atcmd) == 0); @@ -16820,21 +16820,21 @@ BUILDIN_FUNC(bindatcmd) { } else create = true; } - + if( create ) { i = atcmd_binding_count; - + if( atcmd_binding_count++ != 0 ) RECREATE(atcmd_binding,struct atcmd_binding_data*,atcmd_binding_count); - + CREATE(atcmd_binding[i],struct atcmd_binding_data,1); - + safestrncpy(atcmd_binding[i]->command, atcmd, 50); safestrncpy(atcmd_binding[i]->npc_event, eventName, 50); atcmd_binding[i]->level = level; atcmd_binding[i]->level2 = level2; } - + return 0; } @@ -16846,12 +16846,12 @@ BUILDIN_FUNC(unbindatcmd) { if( *atcmd == atcommand_symbol || *atcmd == charcommand_symbol ) atcmd++; - + if( atcmd_binding_count == 0 ) { script_pushint(st, 0); return 0; } - + ARR_FIND(0, atcmd_binding_count, i, strcmp(atcmd_binding[i]->command, atcmd) == 0); if( i < atcmd_binding_count ) { int cursor = 0; @@ -16861,21 +16861,21 @@ BUILDIN_FUNC(unbindatcmd) { for( i = 0, cursor = 0; i < atcmd_binding_count; i++ ) { if( atcmd_binding[i] == NULL ) continue; - + if( cursor != i ) { memmove(&atcmd_binding[cursor], &atcmd_binding[i], sizeof(struct atcmd_binding_data*)); } - + cursor++; } if( (atcmd_binding_count = cursor) == 0 ) aFree(atcmd_binding); - + script_pushint(st, 1); } else script_pushint(st, 0);/* not found */ - + return 0; } @@ -16987,10 +16987,10 @@ BUILDIN_FUNC(getrandgroupitem) { TBL_PC* sd; int i, get_count = 0, flag, nameid, group = script_getnum(st, 2), qty = script_getnum(st,3); struct item item_tmp; - + if( !( sd = script_rid2sd(st) ) ) return 0; - + if( qty <= 0 ) { ShowError("getrandgroupitem: qty is <= 0!\n"); return 1; @@ -16998,18 +16998,18 @@ BUILDIN_FUNC(getrandgroupitem) { if( (nameid = itemdb_searchrandomid(group)) == UNKNOWN_ITEM_ID ) { return 1;/* itemdb_searchrandomid will already scream a error */ } - + memset(&item_tmp,0,sizeof(item_tmp)); - + item_tmp.nameid = nameid; item_tmp.identify = itemdb_isidentified(nameid); - + //Check if it's stackable. if (!itemdb_isstackable(nameid)) get_count = 1; else get_count = qty; - + for (i = 0; i < qty; i += get_count) { // if not pet egg if (!pet_create_egg(sd, nameid)) { @@ -17020,7 +17020,7 @@ BUILDIN_FUNC(getrandgroupitem) { } } } - + return 0; } |