diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-04 08:04:55 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-04 08:04:55 +0000 |
| commit | 1e5c8f86c0a64f93c18303c07196c6cd564e85e6 (patch) | |
| tree | faeed9d2f57de26841edf2434b2d8fd581765aac | |
| parent | f4909097fde3e8b7e9f8368cca3d4c122c12336d (diff) | |
| download | hercules-1e5c8f86c0a64f93c18303c07196c6cd564e85e6.tar.gz hercules-1e5c8f86c0a64f93c18303c07196c6cd564e85e6.tar.bz2 hercules-1e5c8f86c0a64f93c18303c07196c6cd564e85e6.tar.xz hercules-1e5c8f86c0a64f93c18303c07196c6cd564e85e6.zip | |
Fixed a copy-paste typo messing up script variables pretty bad D:
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10850 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 368b687c4..2d0b23b32 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. +2007/07/04 + * Fixed a copy-paste typo messing up script variables pretty bad D: 2007/07/03 * Fixed a typo in script engine erroring when working with char params * Made Homun Resurrection only fail on cast-end (see topic:155223) diff --git a/src/map/script.c b/src/map/script.c index b70ff9634..cfe0ce1b0 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2196,9 +2196,9 @@ int get_val(struct script_state* st, struct script_data* data) break; case '#': if( name[1] == '#' ) - data->u.str = pc_readaccountreg2str(sd, name);// global + data->u.num = pc_readaccountreg2(sd, name);// global else - data->u.str = pc_readaccountregstr(sd, name);// local + data->u.num = pc_readaccountreg(sd, name);// local break; case '.': { |