From 6fbbb527533b6dd6149cdf7afe47089601288355 Mon Sep 17 00:00:00 2001 From: Ian C Date: Mon, 12 Dec 2022 00:14:27 +0000 Subject: Updated Makefile for MacOS and fixed some compiler warnings. --- Makefile | 2 +- galax.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6155d74..5c4b7b5 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CC=cc # Paths to X11 includes and libraries. Edit as appropriate for your system # -DIRS=-L/usr/openwin/lib -I/usr/openwin/include -L/usr/X11R6/lib -I/usr/local/include -L/usr/local/lib +DIRS=-L/usr/openwin/lib -I/usr/openwin/include -L/usr/X11R6/lib -I/usr/local/include -L/usr/local/lib -I/usr/X11/include -L/usr/X11/lib # Add on -lsocket for solaris 2 (and perhaps other SysV's) # diff --git a/galax.c b/galax.c index e9596ef..2ed9170 100644 --- a/galax.c +++ b/galax.c @@ -531,7 +531,6 @@ static XFuncControl Key(Window w, XPressRelease s, XEvent *e) break; default: - keymap[NONE]=False; break; } } @@ -1685,6 +1684,7 @@ static void MoveAliens(void) case 6: /* THE COLLECTIVE 1 */ for(f=0;fdata[alien[f].sy][alien[f].sx]!=BLACK) { alien[f].x=WINW/2-(SPRW+2)*4+alien[f].sx*(SPRW+2); @@ -1695,12 +1695,14 @@ static void MoveAliens(void) alien[f].x=-100; alien[f].y=SHIPY; } + } break; case 7: /* THE COLLECTIVE 2 */ for(f=0;fdata[alien[f].sy][alien[f].sx]!=BLACK) { alien[f].x=WINW/2-(SPRW+2)*4+alien[f].sx*(SPRW+2); @@ -1711,12 +1713,14 @@ static void MoveAliens(void) alien[f].x=-100; alien[f].y=SHIPY; } + } break; case 8: /* THE COLLECTIVE 3 */ for(f=0;fdata[alien[f].sy][alien[f].sx]!=BLACK) { alien[f].x=WINW/2-(SPRW+2)*4+alien[f].sx*(SPRW+2); @@ -1727,6 +1731,7 @@ static void MoveAliens(void) alien[f].x=-100; alien[f].y=SHIPY; } + } break; @@ -1734,6 +1739,7 @@ static void MoveAliens(void) for(y=f=0;y<3;y++) for(x=0;x<20;x++,f++) if (alien[f].alive) + { if (y%2) { if ((alien[f].x+=(y+1))>=WINW) @@ -1744,6 +1750,7 @@ static void MoveAliens(void) if ((alien[f].x-=(y+1))<=-SPRW) alien[f].x+=WINW+SPRW; } + } break; -- cgit v1.2.3