diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-23 08:22:53 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-23 08:22:53 +0000 |
| commit | efac9030a63b8353237cb26cf6cc1ac272288f1e (patch) | |
| tree | 31dfb7f97a1ed83a11b8c93c552d70f270ef8e02 | |
| parent | 3d265a82001fb2527e8beaf04820f896cb5fb3d0 (diff) | |
| download | hercules-efac9030a63b8353237cb26cf6cc1ac272288f1e.tar.gz hercules-efac9030a63b8353237cb26cf6cc1ac272288f1e.tar.bz2 hercules-efac9030a63b8353237cb26cf6cc1ac272288f1e.tar.xz hercules-efac9030a63b8353237cb26cf6cc1ac272288f1e.zip | |
* [Scripting Engine Update] New variables are ready to be used.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6703 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 29c0899d8..c886856b1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ 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/05/23
+ * [Scripting Engine Update] New variables are ready to be used. [Lance]
2006/05/22
* Updated skill_delayfix to return 0 for mobs since they have no skill
delay other than the one specified in mob_skill_db [Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c index 6f23e1c7f..bfd3d0779 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8622,7 +8622,7 @@ void clif_parse_GetCharNameRequest(int fd, struct map_session_data *sd) { sprintf(gm_msg, "Hack on NameRequest: character '%s' (account: %d) requests name of invisible chars.", sd->status.name, sd->status.account_id);
ShowWarning(gm_msg);
// information is sended to all online GM
- // intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, gm_msg);
+ intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, gm_msg);
return;
}
clif_charnameack(fd, bl);
diff --git a/src/map/script.c b/src/map/script.c index 8809c9f91..f45e722fc 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1043,11 +1043,11 @@ static unsigned char *skip_space(unsigned char *p) static unsigned char *skip_word(unsigned char *p)
{
// prefix
+ if(*p=='\'') p++;
if(*p=='$') p++; // MAP鯖内共有変数用
if(*p=='@') p++; // 一時的変数用(like weiss)
if(*p=='#') p++; // account変数用
if(*p=='#') p++; // ワールドaccount変数用
- if(*p=='\'') p++;
while(isalnum(*p)||*p=='_'|| *p>=0x81)
if(*p>=0x81 && p[1]){
|