fixed drifting in calm sea bug
authorEdward Wang <edward@ucbvax.Berkeley.EDU>
Sun, 29 Apr 1984 05:32:35 +0000 (21:32 -0800)
committerEdward Wang <edward@ucbvax.Berkeley.EDU>
Sun, 29 Apr 1984 05:32:35 +0000 (21:32 -0800)
SCCS-vsn: games/sail/dr_2.c 2.6
SCCS-vsn: games/sail/dr_3.c 2.6

usr/src/games/sail/dr_2.c
usr/src/games/sail/dr_3.c

index 97c9583..c55b4bd 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint
-static char *sccsid = "@(#)dr_2.c      2.5 84/01/19";
+static char *sccsid = "@(#)dr_2.c      2.6 84/04/28";
 #endif
 
 #include "driver.h"
 #endif
 
 #include "driver.h"
@@ -174,10 +174,8 @@ register char *drift;
                        break;
                }
        }
                        break;
                }
        }
-       if (!windspeed)
-               *drift = 1;
        if (!moved) {
        if (!moved) {
-               if (++*drift > 2) {
+               if (windspeed != 0 && ++*drift > 2) {
                        if (ship->specs->class >= 3 && !snagged(ship)
                            || (turn & 1) == 0) {
                                *row -= dr[winddir];
                        if (ship->specs->class >= 3 && !snagged(ship)
                            || (turn & 1) == 0) {
                                *row -= dr[winddir];
index 5d96805..78548aa 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint
-static char *sccsid = "@(#)dr_3.c      2.5 84/01/19";
+static char *sccsid = "@(#)dr_3.c      2.6 84/04/28";
 #endif
 
 #include "driver.h"
 #endif
 
 #include "driver.h"
@@ -209,7 +209,7 @@ char *moved;
                break;
        case 'd':
                if (!*moved) {
                break;
        case 'd':
                if (!*moved) {
-                       if (++sp->file->drift > 2 &&
+                       if (windspeed != 0 && ++sp->file->drift > 2 &&
                            (sp->specs->class >= 3 && !snagged(sp)
                             || (turn & 1) == 0)) {
                                sp->file->row -= dr[winddir];
                            (sp->specs->class >= 3 && !snagged(sp)
                             || (turn & 1) == 0)) {
                                sp->file->row -= dr[winddir];