Mercurial > hg > batmud > maputils

changeset 254:0ca2ab58c1bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed some generated stuff, postprocess output with sed and other tools for flexibility.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 31 May 2007 00:45:19 +0000
parents c8039152d896
children be481e1dca9e
files mkloc.c
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mkloc.c	Fri May 25 19:50:22 2007 +0000
+++ b/mkloc.c	Thu May 31 00:45:19 2007 +0000
@@ -666,19 +666,17 @@
  */
 void outputLocationScript(FILE *outFile, locations_t *l)
 {
-	int i, numCity, numLoc, numTotal, unitSize, fontSize;
+	int i, numCity, numLoc, numTotal, unitSize;
 	float globScale;
 
 	globScale = (optInfoScale);
 
-	fontSize = (int) (3.0f * globScale);
 	unitSize = (int) (1.0f * globScale);
 
 	/* Output script start */
 	fprintf(outFile,
 		"#!/bin/sh\n"
-		"convert \"$1\" -font \"$2\" -pointsize %d -type TruecolorMatte \\\n",
-		fontSize);
+		"convert \"$1\" @OPTS_START@ \\\n");
 	
 	numCity = numLoc = numTotal = 0;
 	
@@ -760,14 +758,15 @@
 	}
 
 	fprintf(outFile,
-		"-pointsize %d -fill white -box none -draw \"text 10,25 '$3\n%d locations\n%d player cities\n%d total'\" \\\n",
-		fontSize * 2,
+		"@OPTS_END@"
+		"%d locations.\n"
+		"%d player cities.\n"
+		"%d total.'\" \\\n",
 		numLoc,
 		numCity,
 		numTotal);
-	
 
-	fprintf(outFile, "\t\"$4\"\n");
+	fprintf(outFile, "\t\"$2\"\n");
 }