From 30251c21f6e8f643a52034caf2e433111b0849ce Mon Sep 17 00:00:00 2001 From: Lance Date: Wed, 26 Apr 2006 08:03:03 +0000 Subject: * Fixed typo in skill.c: skill_clear_group * Fixed command descriptions in script_commands.txt * Cosmetic changes to script.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6289 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 5 +++++ doc/script_commands.txt | 12 ++++++------ src/map/script.c | 2 +- src/map/skill.c | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a5615d153..2d9ecedaa 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -2,6 +2,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2006/04/26 + * Fixed typo in skill.c: skill_clear_group [Lance] + 2006/04/25 * Added battle config traps_setting to determine how traps should behave. With &1 traps are invisible if you didn't see them get set up. With &2 @@ -121,6 +124,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. [Skotlex] * Armor defense is no longer reduced by the amount of characters targetting you. [Skotlex] + 2006/04/19 * Updated the doc/script_commands.txt documentation in regards to npc mob spawn lines. [Skotlex] @@ -142,6 +146,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. $@partynameaid). By default it returns party member names. [Skotlex] * Updated script_commands.txt with the updated behaviour of getpartymember. [Skotlex] + 2006/04/18 * Fixed a typo in map_search_freecell which was returning incorrect cells according to the ranges given. [Skotlex] diff --git a/doc/script_commands.txt b/doc/script_commands.txt index b095ce5bd..7c0822bb8 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -5079,7 +5079,7 @@ Note: rid2name may not produce correct character names since rid = account id. --------------------------------------- *function ; -*(); +*; *function { } @@ -5087,9 +5087,8 @@ Note: rid2name may not produce correct character names since rid = account id. (Skotlex stop being so selfish and give us all the commands T~T! J/k lol :P) This works like callfunc, but doesn't support arguments like callfunc. It's used for cleaner -and fast script that doesn't require arguments for it to work. Labels must start with SF_ -(SubFunctions I guess). Also they must be inside a script. They're not separated scripts -and they work more like labels. +and fast script that doesn't require arguments for it to work. Also they must be inside a script. +They're not separated scripts and they work more like labels. Note it looks like the normal declaration @@ -5097,7 +5096,7 @@ Usage: You first Declare the function with function ;. -Put the rest of your code. You can use then (); to call the function. If it returns a value is unsure, +Put the rest of your code. You can use then ; to call the function. If it returns a value is unsure, test it if you want and give us some comments ;3 And at least, but inside the script itself, put the function {}. @@ -5114,7 +5113,7 @@ next; if (Zeny > 50) && (BaseLevel > 50) { mes "Welcome"; next; - SF_Selling(); + SF_Selling; close; } else @@ -5145,6 +5144,7 @@ function SF_Selling { close; } } + return; } diff --git a/src/map/script.c b/src/map/script.c index 626512003..e708ef2ca 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10874,7 +10874,6 @@ int run_func(struct script_state *st) int run_script_main(struct script_state *st) { int c/*,rerun_pos*/; - struct block_list *bl; int cmdcount=script_config.check_cmdcount; int gotocount=script_config.check_gotocount; struct script_stack *stack=st->stack; @@ -10886,6 +10885,7 @@ int run_script_main(struct script_state *st) st->state = RUN; } } else { + struct block_list *bl; st->state = RUN; if(st->oid && st->rid && (bl = map_id2bl(st->oid))){ if(bl->type == BL_PC){ diff --git a/src/map/skill.c b/src/map/skill.c index e17af7e23..887bc62ce 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8943,7 +8943,7 @@ int skill_clear_group(struct block_list *bl, int flag) } } - for (i=0;i