diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-15 22:40:00 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-15 22:40:00 +0000 |
| commit | 1fabc2250529b3ed092c2635c09023d8dd6f74e9 (patch) | |
| tree | d0d7fdb007d5d226854b96cc0a057acae2ab963b | |
| parent | f58856d5ab5a79e09e4aad906cecd7aa931a2224 (diff) | |
| download | hercules-1fabc2250529b3ed092c2635c09023d8dd6f74e9.tar.gz hercules-1fabc2250529b3ed092c2635c09023d8dd6f74e9.tar.bz2 hercules-1fabc2250529b3ed092c2635c09023d8dd6f74e9.tar.xz hercules-1fabc2250529b3ed092c2635c09023d8dd6f74e9.zip | |
- Fixed .@GID not being set in Gld_Trea_Spawn, since r13559. (bugreport:5067)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14974 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | doc/script_commands.txt | 5 | ||||
| -rw-r--r-- | npc/guild/agit_template.txt | 4 | ||||
| -rw-r--r-- | src/char_sql/int_storage.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 1afff5377..6f19db54e 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -2208,8 +2208,9 @@ This is equivalent to using: The reason for this is, that this short form is internally converted into a call to getelementofarray, when the script is loaded. -Also useful when passing arrays to functions. -getelementofarray(getarg(0),<index>) will work, but getarg(0)[<index>] will not. +Also useful when passing arrays to functions or accessing another npc's arrays: + getelementofarray(getarg(0),<index>) + getelementofarray(getvariableofnpc(.var, "testNPC"),<index>) --------------------------------------- diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt index 68e9e7f3a..41b706fb2 100644 --- a/npc/guild/agit_template.txt +++ b/npc/guild/agit_template.txt @@ -1156,8 +1156,10 @@ OnClock0001: // Do nothing if this script is the template. if (strnpcinfo(1) == "Gld_Trea_Spawn") end; + set .@GID, GetCastleData(strnpcinfo(2),1); + // If there is no owner, do nothing. - if (!GetCastleData(strnpcinfo(2),1)) end; + if (!.@GID) end; // Is there Economy in this castle? set .@Treasure,GetCastleData(strnpcinfo(2),2)/5+4; diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c index 0719685ae..e4d2395f1 100644 --- a/src/char_sql/int_storage.c +++ b/src/char_sql/int_storage.c @@ -17,7 +17,7 @@ #define STORAGE_MEMINC 16 -/// Save guild_storage data to sql +/// Save storage data to sql int storage_tosql(int account_id, struct storage_data* p) { memitemdata_to_sql(p->items, MAX_STORAGE, account_id, TABLE_STORAGE); @@ -25,7 +25,7 @@ int storage_tosql(int account_id, struct storage_data* p) } #ifndef TXT_SQL_CONVERT -/// Load guild_storage data to mem +/// Load storage data to mem int storage_fromsql(int account_id, struct storage_data* p) { StringBuf buf; |