diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-02-04 00:32:19 -0200 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-02-04 00:32:19 -0200 |
| commit | 524291493e64196d8ce02f4b637ea0ee1a176d0a (patch) | |
| tree | 7a15790fb1b7658d7fb39deaae83f562fd81c872 /src/map/pc.c | |
| parent | f651ffc9f92dbf339e9691c24d66577bf4a43d47 (diff) | |
| download | hercules-524291493e64196d8ce02f4b637ea0ee1a176d0a.tar.gz hercules-524291493e64196d8ce02f4b637ea0ee1a176d0a.tar.bz2 hercules-524291493e64196d8ce02f4b637ea0ee1a176d0a.tar.xz hercules-524291493e64196d8ce02f4b637ea0ee1a176d0a.zip | |
Merged some commits from rAthena.
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 6f608cd49..4fb555d0f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8194,6 +8194,10 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) { cursor++; } + + /* check if combo requirements still fit */ + if( pc_checkcombo( sd, data ) ) + continue; /* it's empty, we can clear all the memory */ if( (sd->combos.count = cursor) == 0 ) { |