diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-06-25 01:00:54 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-06-25 01:13:21 +0200 |
| commit | 01164c90ef975e90f8eac9bebc77e0ff93fbcf52 (patch) | |
| tree | 669c71bc5a5d23beef58d946543938482f0c3c42 /src/map/atcommand.c | |
| parent | 9478575520ed4ee5d36c4996522171cb35aab756 (diff) | |
| download | tmwa-01164c90ef975e90f8eac9bebc77e0ff93fbcf52.tar.gz tmwa-01164c90ef975e90f8eac9bebc77e0ff93fbcf52.tar.bz2 tmwa-01164c90ef975e90f8eac9bebc77e0ff93fbcf52.tar.xz tmwa-01164c90ef975e90f8eac9bebc77e0ff93fbcf52.zip | |
Move storage NPC close fix to storage.c. Fix @storeall, from ea stable.
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index e85ca7d..74567bb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6520,9 +6520,18 @@ atcommand_storeall(const int fd, struct map_session_data* sd, const char* command, const char* message) { int i; - if (storage_storageopen(sd) == 1) { - clif_displaymessage(fd, "run this command again.."); - return 0; + nullpo_retr(-1, sd); + + if (sd->state.storage_flag != 1) + { //Open storage. + switch (storage_storageopen(sd)) { + case 2: //Try again + clif_displaymessage(fd, "run this command again.."); + return 0; + case 1: //Failure + clif_displaymessage(fd, "You can't open the storage currently."); + return 1; + } } for (i = 0; i < MAX_INVENTORY; i++) { if (sd->status.inventory[i].amount) { |