diff options
| author | dastgirpojee <dastgirpojee@rocketmail.com> | 2013-10-11 10:46:32 -0700 |
|---|---|---|
| committer | dastgirpojee <dastgirpojee@rocketmail.com> | 2013-10-11 10:46:32 -0700 |
| commit | d3d3fcdb60a03749aa927c4d9b8bf1e710e3d3b6 (patch) | |
| tree | 7a50cf8fcc99e189c856dbf4c2ef1403e93f0711 /src/map/atcommand.c | |
| parent | e105044ee8c1c625b886e2306c22a3f8a68f5bf5 (diff) | |
| parent | 231f7a4f31b27611af7006e3adc2d3c046356fd3 (diff) | |
| download | hercules-d3d3fcdb60a03749aa927c4d9b8bf1e710e3d3b6.tar.gz hercules-d3d3fcdb60a03749aa927c4d9b8bf1e710e3d3b6.tar.bz2 hercules-d3d3fcdb60a03749aa927c4d9b8bf1e710e3d3b6.tar.xz hercules-d3d3fcdb60a03749aa927c4d9b8bf1e710e3d3b6.zip | |
Merge pull request #3 from HerculesWS/master
Herc Merge
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 3d04a6bff..10c96e317 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6869,7 +6869,7 @@ ACMD(makehomun) { homunid = atoi(message); if( homunid == -1 && sd->status.hom_id && !homun_alive(sd->hd) ) { - if( !sd->hd->homunculus.vaporize ) + if( sd->hd->homunculus.vaporize ) homun->ressurect(sd, 100, sd->bl.x, sd->bl.y); else homun->call(sd); @@ -7956,10 +7956,14 @@ ACMD(feelreset) /*========================================== * AUCTION SYSTEM *------------------------------------------*/ -ACMD(auction) -{ +ACMD(auction) { nullpo_ret(sd); + if( !battle_config.feature_auction ) { + clif->colormes(sd->fd,COLOR_RED,msg_txt(1484)); + return false; + } + clif->auction_openwindow(sd); return true; |