batmud/maputils: mkloc.c comparison

comparison mkloc.c @ 1775:db7fdbc8f81b

Modernification cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 28 Oct 2017 04:07:28 +0300
parents	72adabd8e746
children	77d6e13fb95e

comparison

equal deleted inserted replaced

-:c7ee1c1e5bdf
+:db7fdbc8f81b
 /* Adjust location label coordinates for the ASCII-CTRL map
 */
 void adjustLocInfoCoords(MapBlock *map, MapLocations *l)
 {
-int i;
+for (int i = 0; i < l->n; i++)
-for (i = 0; i < l->n; i++)
 {
 int y, x0, x1, len;
 LocMarker *tmp = l->locations[i];
 len = strlen(tmp->names[0].name);
 /* Scan given map and update location list with new locations,
 * if any are found.
 */
 void updateLocations(MapBlock *worldMap, MapLocations *worldLoc)
 {
-int x, y, n, numNewLoc = 0, numInvLoc = 0, numNoMarker = 0;
+int n, numNewLoc = 0, numInvLoc = 0, numNoMarker = 0;
-unsigned char *dp;
 LocMarker *tmpl;
 THMSG(2, "Updating location information ..\n");
 // Find new, unknown locations
-for (y = 0; y < worldMap->height; y++)
+for (int y = 0; y < worldMap->height; y++)
 {
-dp = worldMap->data + (worldMap->scansize * y);
+unsigned char *dp = worldMap->data + (worldMap->scansize * y);
-for (x = 0; x < worldMap->width; x++)
+for (int x = 0; x < worldMap->width; x++)
 {
 if (strchr(optLocMarkers, dp[x]))
 {
 LocName tmpNames[LOC_MAX_NAMES];
 char tmpDesc[512];
 /* Sort locations by name
 */
 void maplocSort(MapLocations *l)
 {
-int i;
+for (int i = 0; i < l->n; i++)
-for (i = 0; i < l->n; i++)
 {
 LocMarker *loc = l->locations[i];
 loc->val = 2;
 switch (loc->flags & LOCF_M_MASK)
 {
 case LOCF_M_CITY:   loc->val = 1; break;
 case LOCF_M_PCITY:  loc->val = 10; break;
 default:
 switch (loc->flags & LOCF_T_MASK)
 {
 case LOCF_T_GUILD:   loc->val = 3; break;
 case LOCF_T_TRAINER: loc->val = 4; break;
 case LOCF_T_SHRINE:  loc->val = 5; break;
 case LOCF_T_SS:      loc->val = 6; break;
 case LOCF_T_MONSTER: loc->val = 7; break;
 case LOCF_T_FORT:    loc->val = 100; break;
 }
 }
 }
 qsort(l->locations, l->n, sizeof(LocMarker *), maplocCompare);
 }
 /* Output the map with labels and location markers, etc. in
 * special ASCII-CTRL format understood by colormap utility.
 */
 void outputMapCTRL(FILE *outFile, MapBlock *map, MapLocations *l)
 {
-unsigned char *dp;
+for (int y = 0; y < map->height; y++)
-int x, y, n;
+{
+unsigned char *dp = map->data + (map->scansize * y);
-for (y = 0; y < map->height; y++)
-{
+for (int x = 0; x < map->width; x++)
-dp = map->data + (map->scansize * y);
+{
+int n;
-for (x = 0; x < map->width; x++)
-{
 if ((n = locFindByCoords(l, x, y, TRUE)) >= 0)
 {
 LocMarker *tmp = l->locations[n];
 char chm = dp[x];
 else
 fputc(dp[x], outFile);
 }
 else
 fputc(dp[x], outFile);
-} else
+}
+else
 fputc(dp[x], outFile);
 }
 fprintf(outFile, "\n");
 }
 /* Print out location list as HTML option list.
 */
 void outputMapLocHTML(FILE *outFile, MapLocations *l)
 {
-int i;
 assert(l != NULL);
 fprintf(outFile, "<option value=\"\">-</option>\n");
-for (i = 0; i < l->n; i++)
+for (int i = 0; i < l->n; i++)
 {
 LocMarker *tmp = l->locations[i];
 if (tmp->flags & LOCF_INVIS)
 continue;
 }
 void outputLocationFile(FILE *outFile, MapLocations *l)
 {
-int i, n;
 // Output header
 fprintf(outFile,
 "# " LOC_MAGIC " (version %d.%d)\n",
 LOC_VERSION_MAJOR, LOC_VERSION_MINOR
 );
 "# Refer to README.loc for more information.\n"
 "#\n"
 );
 // Output each location entry
-for (i = 0; i < l->n; i++)
+for (int i = 0; i < l->n; i++)
 {
 LocMarker *tmp = l->locations[i];
 // Add comment in few cases
 if (tmp->flags & LOCF_Q_MASK)
 if (tmp->flags & LOCF_INVIS)
 fputc('-', outFile);
 fprintf(outFile, "\t;");
 printLocNameEsc(outFile, &tmp->names[0]);
-for (n = 1; n < tmp->nnames; n++)
+for (int n = 1; n < tmp->nnames; n++)
 {
 fprintf(outFile, "|");
 printLocNameEsc(outFile, &tmp->names[n]);
 }
 fprintf(outFile, ";");
 if (tmp->ncoders > 0)
 {
 printLocNameEsc(outFile, &tmp->coders[0]);
-for (n = 1; n < tmp->ncoders; n++)
+for (int n = 1; n < tmp->ncoders; n++)
 {
 fprintf(outFile, ",");
 printLocNameEsc(outFile, &tmp->coders[n]);
 }
 }
 /* Generate a shell-script for running ImageMagick to add
 * location and label information to an map image.
 */
 void outputMagickScript(FILE *outFile, MapLocations *l)
 {
-int i, numCity, numLoc, numTotal;
+int numCity, numLoc, numTotal;
 // Output script start
 fprintf(outFile,
 "#!/bin/sh\n"
 "convert \"$1\" @OPTS_START@ \\\n");
 numCity = numLoc = numTotal = 0;
 // Output instructions for each visible location
-for (i = 0; i < l->n; i++)
+for (int i = 0; i < l->n; i++)
 {
 LocMarker *tmp = l->locations[i];
 int x, y, leftMove;
 char *cs;
 * is not performed, caller must take care of it via iconv or similar.
 */
 static char *getQuestLink(const char *name, const char *desc)
 {
 char *str, *tmp = th_strdup(name);
-size_t i;
-for (i = 0; i < strlen(tmp); i++)
+for (size_t i = 0; i < strlen(tmp); i++)
 tmp[i] = th_isspace(tmp[i]) ? '+' : th_tolower(tmp[i]);
 str = th_strdup_printf("<a target=\"_blank\" href=\"http://www.bat.org/help/quests?str=%s\">%s</a>", tmp, desc);
 th_free(tmp);
 return str;
 }
 void outputGMapsHTML(FILE *outFile, LocMarker *tmp,
 int (*fpr)(FILE *, const char *fmt, ...), int (*fps)(const char *, FILE *))
 {
-int n;
 if (tmp->uri != NULL)
 {
 fpr(outFile, "<b><a target=\"_blank\" href=\"%s\">", tmp->uri);
 locPrintType(outFile, tmp, FALSE, fps, TRUE);
 fpr(outFile, "</a></b><br>");
 // Alternative names, if any
 if (tmp->nnames > 1)
 {
 fpr(outFile, "Also known as <i>");
-for (n = 1; n < tmp->nnames; n++)
+for (int n = 1; n < tmp->nnames; n++)
 {
 fps(tmp->names[n].name, outFile);
 if (tmp->names[n].flags & NAME_ORIG)
 fprintf(outFile, " (*)");
 if (n < tmp->nnames - 1)
 if (tmp->ncoders > 0)
 {
 if (tmp->flags & LOCF_M_PCITY)
 {
 fprintf(outFile, "Societies: ");
-for (n = 0; n < tmp->ncoders; n++)
+for (int n = 0; n < tmp->ncoders; n++)
 {
 fps(tmp->coders[n].name, outFile);
 if (n < tmp->ncoders - 1)
 fprintf(outFile, ", ");
 }
 }
 else
 {
 fprintf(outFile, "Coders: ");
-for (n = 0; n < tmp->ncoders; n++)
+for (int n = 0; n < tmp->ncoders; n++)
 {
 char *info = "", *sinfo = "";
 switch (tmp->coders[n].flags)
 {
 case NAME_ORIG: info = " (O)"; sinfo = "Original coder"; break;
 }
 void outputGMapsXML(FILE *outFile, MapLocations *l)
 {
-int i;
 fprintf(outFile,
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<markers>\n");
 // Output each location entry
-for (i = 0; i < l->n; i++)
+for (int i = 0; i < l->n; i++)
 {
 LocMarker *tmp = l->locations[i];
 // Skip disabled / invisible locations
 if (tmp->flags & (LOCF_INVIS | LOCF_INVALID)) continue;
 }
 void outputGMapsJSON(FILE *outFile, MapLocations *l)
 {
-int i;
 fprintf(outFile, "[\n");
 // Output each location entry
-for (i = 0; i < l->n; i++)
+for (int i = 0; i < l->n; i++)
 {
 LocMarker *tmp = l->locations[i];
 // Skip disabled / invisible locations
 if (tmp->flags & (LOCF_INVIS | LOCF_INVALID)) continue;

Mercurial > hg > batmud > maputils

comparison mkloc.c @ 1775:db7fdbc8f81b