diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-09 18:56:27 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-09 18:56:27 +0000 |
| commit | e35044d26d45bf7e9a4acc357be3738e3379f3e3 (patch) | |
| tree | 5233ac4ef955794af13c8f928050a09f18fa3069 /src/map/script.c | |
| parent | c10d6dd38c9fff3ea0ec335465b7f632d5b086db (diff) | |
| download | hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.gz hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.bz2 hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.xz hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.zip | |
- stable -> trunk sync
- battle.c and pc.c formatting
- fixed one badly defined npc shop format string
- removed the "selling item for no buying price" warning when the item has a buying price of 20 (see topic:157465)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10971 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index a08d06466..99a3434f5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9602,7 +9602,7 @@ BUILDIN_FUNC(getcastledata) int i; for(i=1;i<26;i++) // Initialize[AgitInit] guild_castledataload(gc->castle_id,i); - } break; + } break; case 1: script_pushint(st,gc->guild_id); break; case 2: @@ -9653,7 +9653,7 @@ BUILDIN_FUNC(setcastledata) const char* mapname = mapindex_getmapname(script_getstr(st,2),NULL); int index = script_getnum(st,3); int value = script_getnum(st,4); - + struct guild_castle* gc = guild_mapname2gc(mapname); if(gc) { |