summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/messages.conf4
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/map.c2
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;