Use MAPWIDTH() to allocate map buffers

sona(), radmap2() and satmap() used WORLD_X + 1, which equals
MAPWIDTH(1).  Using MAPWIDTH() is somewhat clearer and cleaner.

diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index c2e229825fdc9223ee9c481a9f623096f33b4564..f2639b05ffa9459c33bd55c591af01b6f0983785 100644 (file)
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -73,9 +73,9 @@ sona(void)
     if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     if (!radbuf)
-       radbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+       radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!visbuf)
-       visbuf = malloc((WORLD_Y * (WORLD_X + 1)));
+       visbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad && radbuf) {
        rad = malloc(WORLD_Y * sizeof(char *));
        if (rad) {

diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c
index 305976cb38ce44f1be7b238d5ba966758922453e..4f1226971f0deb38a37362ba52458f25d8d2913d 100644 (file)
--- a/src/lib/subs/radmap.c
+++ b/src/lib/subs/radmap.c
@@ -91,9 +91,9 @@ radmap2(int owner,
     int changed = 0;
 
     if (!radbuf)
-       radbuf = malloc(WORLD_Y * (WORLD_X + 1));
+       radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!visbuf)
-       visbuf = malloc(WORLD_Y * (WORLD_X + 1));
+       visbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad) {
        rad = malloc(WORLD_Y * sizeof(char *));
        if (rad && radbuf) {

diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index 151136060a657421632a87a330926bc3f12f0e32..cf69c5f0c13e88a776468cd6718ce41bb2c7c054 100644 (file)
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -73,7 +73,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
        return;
 
     if (!radbuf)
-       radbuf = malloc(WORLD_Y * (WORLD_X + 1));
+       radbuf = malloc(WORLD_Y * MAPWIDTH(1));
     if (!rad) {
        rad = malloc(WORLD_Y * sizeof(char *));
        if (rad && radbuf) {