Commit: 6846bdb3682d352dd20597ee14c3f3e3f74d1de1 - ogatool (git)

oga's tools

Commit MetaInfo

• Revision: 6846bdb3682d352dd20597ee14c3f3e3f74d1de1 (tree)
• Zeit: 2013-12-31 13:57:33
• Autor: oga <oga@mxg....>
• Commiter: oga

Log Message

2013/12/12 fix galaxian prob. (no env, rnd() is always 0)

Ändern Zusammenfassung

• modified: galaxian.c

Diff

--- a/galaxian.c
+++ b/galaxian.c
@@ -9,6 +9,7 @@
  *			1995.08.21	Ver 1.04   high score support
  *			1995.08.23	Ver 1.05   star support
  *			2003.05.23	Ver 1.06   use usleep
+ *			2013.12.31	Ver 1.07   fix noenv, rnd() prob
  */
 
 #include <stdio.h>
@@ -80,7 +81,7 @@ int wait = 10;				/* game speed  0.2 sec       */
 int wait = 40;				/* game speed                */
 #endif /* X68000 */
 
-int xmin = 2, xmax, ymax; 
+int xmin = 2, xmax = 0, ymax = 0;       /* V1.07-C                   */
 int sc = 0, stage = 0, typ = 0;		/* score, stage, alien_type  */
 int hisc = 0;				/* high score                */
 char hinm[100];				/* high name                 */
@@ -114,13 +115,16 @@ char *b[];
 	/* INITIALIZE */
 	for (i = 1; i<a ; i++) {
 		if (!strcmp(b[i],"-h")) {
-			printf("usage : galaxian [speed<%d>] [-n]\n",wait);
+			printf("usage : galaxian [<wait(%d)>] [-n]\n",wait);
+			printf("        <wait>    : wait <wait> x 1/100sec\n");
+			printf("        -n        : no star\n");
+			printf("        move ship : [J]<=>[L]\n");
 			exit(1);
 		} else if (!strcmp(b[i],"-n")) {
 			starf = 0;
 		} else {
 			wait = atoi(b[1]);
-			printf("speed = %d\n",wait);
+			printf("wait = %d\n",wait);
 		}
 	}
 #ifdef X3050RX
@@ -131,8 +135,12 @@ char *b[];
 	alien[1]="v  VXOOX\n";
 #endif /* X68000 */
 #ifdef X3050RX
-        xmax = atoi(getenv("COLUMNS"))-RSPACE;
-        ymax = atoi(getenv("LINES"))-1;
+        if (getenv("COLUMNS")) {    /* V1.07-A */
+        	xmax = atoi(getenv("COLUMNS"))-RSPACE;
+	}
+	if (getenv("LINES")) {      /* V1.07-A */
+        	ymax = atoi(getenv("LINES"))-1;
+	}
         if (xmax == 0)
                 xmax = 80-RSPACE;
         if (ymax == 0)
@@ -487,7 +495,14 @@ struct al_loc *alp;
 rnd(n)
 int n;
 {
-	return(rand()*n/RAND_MAX);
+	int val;
+	int max = RAND_MAX;
+
+	if (max > 0xffff) {
+		max = 0xffff;
+	}
+	/* return(rand()*n/RAND_MAX); */
+	return((rand() & max)*n/max);
 }
 
 /* DISPLAY SCORE  */