X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;h=f99f866d2ee0e39316403e2cd682bc5e7ef98c3a;hp=a784ae383ef3fa521bc86f7c1d1ce929914f2eaf;hb=8fb8cf52d2bf96beda40c30134e04a352ff988b4;hpb=b0df3bd887cce71fdbd60332b89db0a076b1ee4e;ds=sidebyside

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index a784ae3..f99f866 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -30,6 +30,7 @@ int main(int argc, const char **argv) {
   const char *arg;
   int i, ap;
   int granui;
+  const char *database=0;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
@@ -38,14 +39,18 @@ int main(int argc, const char **argv) {
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
+    if (!strcmp(arg,"-d")) {
+      database= *++argv;
+    } else if (!strcmp(arg,"-g")) {
+      granus= atoi(*++argv);
+      assert(granus>=1 && granus<=GRANUS);
 #ifndef debug_flags
-    if (!strcmp(arg,"-DN")) {
+    } else if (!strcmp(arg,"-DN")) {
       debug_flags= 0;
     } else if (!strcmp(arg,"-D1")) {
       debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
-    } else
+    } else {
 #endif
-    {
       abort();
     }
   }
@@ -77,8 +82,6 @@ int main(int argc, const char **argv) {
     debug_file= stderr;
   }
 
-  const char *database= *argv++;
-
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
 
   max_mass= atof(*argv++);
@@ -185,7 +188,7 @@ int main(int argc, const char **argv) {
 	  int midarch= route2midarch(ports,nports);
 	  fprintf(output,
 		  " @%2d %c#%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
-		  pos, "ap"[ap], nhighscores[granui][ap] - 1 - pos,
+		  pos, "ap"[ap], nhighscores[granui][ap] - pos,
 		  ports[0], midarch,midisle, finarch,finisle,
 		  (int)hs->value, (int)pr->value[A], (int)pr->value[P]);
 	  for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);