summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-11 11:21:27 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-11 11:21:27 -0600
commit942dfed655b9e59a20e93e28bb41fe779516bc86 (patch)
tree53e6feaaac186507021dc6fa5422f40817a3e794 /src
parentbdc081d262eeb2adb3f3352026be431b846e48b1 (diff)
downloadtmwa-942dfed655b9e59a20e93e28bb41fe779516bc86.tar.gz
tmwa-942dfed655b9e59a20e93e28bb41fe779516bc86.tar.bz2
tmwa-942dfed655b9e59a20e93e28bb41fe779516bc86.tar.xz
tmwa-942dfed655b9e59a20e93e28bb41fe779516bc86.zip
FIx a bug dealing with storage and scripting
Also remove some depug printing statements that were accidentally commited
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/script.c1
-rw-r--r--src/map/storage.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index dbee8b8..61377d2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7682,6 +7682,8 @@ void clif_parse_CloseKafra(int fd, struct map_session_data *sd) {
storage_guild_storageclose(sd);
else
storage_storageclose(sd);
+
+ map_scriptcont(sd, sd->npc_id);
}
/*==========================================
diff --git a/src/map/script.c b/src/map/script.c
index ae7bd8f..a51f65f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3522,6 +3522,7 @@ int buildin_gettimestr(struct script_state *st)
*/
int buildin_openstorage(struct script_state *st)
{
+ st->state=STOP;
storage_storageopen(script_rid2sd(st));
return 0;
}
diff --git a/src/map/storage.c b/src/map/storage.c
index 3edd7b8..0158f38 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -140,7 +140,6 @@ int storage_additem(struct map_session_data *sd,struct storage *stor,struct item
i=MAX_STORAGE;
if(!itemdb_isequip2(data)){
- printf("A");
// 装備品ではないので、既所有品なら個数のみ変化させる
for(i=0;i<MAX_STORAGE;i++){
if(stor->storage[i].nameid == item_data->nameid &&
@@ -155,7 +154,6 @@ int storage_additem(struct map_session_data *sd,struct storage *stor,struct item
}
}
if(i>=MAX_STORAGE){
- printf("B");
// 装備品か未所有品だったので空き欄へ追加
for(i=0;i<MAX_STORAGE;i++){
if(stor->storage[i].nameid==0){