diff options
| author | Haru <haru@dotalux.com> | 2018-02-13 01:55:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 01:55:18 +0100 |
| commit | fa0591c15b0e821ba8c7901a3005c2674ae11796 (patch) | |
| tree | 70cc4d84135519c633a692f22b7f905da02ad980 | |
| parent | e47b550a0e6da897eeece63417ac35ec89dafd2d (diff) | |
| parent | 081694ca70c7ebbd91bb1f49c58687a6cd33dfa0 (diff) | |
| download | hercules-fa0591c15b0e821ba8c7901a3005c2674ae11796.tar.gz hercules-fa0591c15b0e821ba8c7901a3005c2674ae11796.tar.bz2 hercules-fa0591c15b0e821ba8c7901a3005c2674ae11796.tar.xz hercules-fa0591c15b0e821ba8c7901a3005c2674ae11796.zip | |
Merge pull request #1972 from 4144/clanfixes
fix some clan issues
| -rw-r--r-- | conf/messages.conf | 4 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 | ||||
| -rw-r--r-- | src/map/map.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index b5a675b25..3f395ab5e 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -151,7 +151,9 @@ 131: Unable to spawn clone. 132: Slave clone spawned. 133: Unable to spawn slave clone. -//134-138 FREE (possibly for other clone types) +//134-136 FREE (possibly for other clone types) +137: CvC: Off +138: CvC: On 139: CvC ON | 140: You can't join in a clan if you're in a guild. 141: CvC is already Off. diff --git a/src/map/atcommand.c b/src/map/atcommand.c index cb6428f1f..2bcb22738 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1691,7 +1691,7 @@ ACMD(cvcoff) clif->map_property_mapall(sd->bl.m, MAPPROPERTY_NOTHING); clif->maptypeproperty2(&sd->bl, ALL_SAMEMAP); map->foreachinmap(atcommand->stopattack, sd->bl.m, BL_CHAR, 0); - clif->message(fd, msg_fd(fd, 26)); // CvC: Off. + clif->message(fd, msg_fd(fd, 137)); // CvC: Off. return true; } @@ -1710,7 +1710,7 @@ ACMD(cvcon) map->list[sd->bl.m].flag.cvc = 1; clif->map_property_mapall(sd->bl.m, MAPPROPERTY_AGITZONE); clif->maptypeproperty2(&sd->bl, ALL_SAMEMAP); - clif->message(fd, msg_fd(fd, 27)); // CvC: On. + clif->message(fd, msg_fd(fd, 138)); // CvC: On. return true; } diff --git a/src/map/map.c b/src/map/map.c index 106224a47..bb367a08d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4502,6 +4502,8 @@ void map_zone_change2(int m, struct map_zone_data *zone) { const char *empty = ""; + if (zone == NULL) + return; Assert_retv(m >= 0 && m < map->count); if( map->list[m].zone == zone ) return; |