From f2bea0209bf2f90ec690a43b292381a8da186904 Mon Sep 17 00:00:00 2001
From: Jerry Aldrich <git@jerryaldrichiii.com>
Date: Sun, 5 Apr 2015 20:54:27 -0500
Subject: [PATCH] Add No-Spawn zone around player

---
 drawWindows.c     |  1 +
 gameLoop.c        |  2 +-
 initializeWorld.c | 13 ++++++------
 makefile          |  4 ++--
 world.h           |  7 ++++++-
 zombies.c         | 51 ++++++++++++++++++++++++++++++++---------------
 6 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/drawWindows.c b/drawWindows.c
index f2e3a08..1775874 100644
--- a/drawWindows.c
+++ b/drawWindows.c
@@ -1,6 +1,7 @@
 #include <world.h>
 #include <screen.h>
 #include <stdlib.h>
+
 void drawScore(){
 	werase(scoreWin);
 	box(scoreWin, 0, 0);
diff --git a/gameLoop.c b/gameLoop.c
index 4bbcb2c..e8cbf7b 100644
--- a/gameLoop.c
+++ b/gameLoop.c
@@ -1,12 +1,12 @@
 #include <world.h>
 #include <screen.h>
 #include <collisionDetection.h>
+
 void gameLoop(){
 	int lastPressed;
 	while(1) {
 		drawScore();
 		drawViewport();
-		//addZombie();
 		moveProjectiles();
 		moveZombies();
 		doupdate();
diff --git a/initializeWorld.c b/initializeWorld.c
index 23d2c74..5dd85a0 100644
--- a/initializeWorld.c
+++ b/initializeWorld.c
@@ -20,12 +20,6 @@ void initializeWorld() {
 	getmaxyx(viewportWin,viewportWinRows,viewportWinCols);
 	scoreWin=newwin(10,scrCols,scrRows-10,0);
 
-	int initialSpawn=(viewportWinRows*viewportWinCols)/100;
-	int i;
-	for(i=0;i<initialSpawn;i++){
-		addZombie();
-	}
-
 	allEntities[0]=player;
 	allEntities[0].curYpos=(rand()%(viewportWinRows-2))+1;
 	allEntities[0].curXpos=(rand()%(viewportWinCols-2))+1;
@@ -34,6 +28,11 @@ void initializeWorld() {
 	allEntities[0].weapons[0]=pistol;
 	allEntities[0].curWeapon=0;
 
-
+	drawScore();
+	drawViewport();	
+	int i;
+	for(i=0;i<INITIAL_SPAWN_NUM;i++){
+		addZombie();
+	}
 }
 
diff --git a/makefile b/makefile
index a348a53..6730424 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 CFLAGS=-I. -lncurses -lm
 
-nZombies:
+all:
 	gcc -o nZombies *.c $(CFLAGS)
 
 clean:
-	@rm *.o nZombies
+	@rm nZombies
diff --git a/world.h b/world.h
index c595deb..aad8082 100644
--- a/world.h
+++ b/world.h
@@ -1,10 +1,15 @@
 #ifndef _INITIALIZE_WORLD
 #define	_INITIALIZE_WORLD
 
-#define MAX_ALIVE 1000
+#define MAX_ALIVE 10000
 #include <structs.h>
+#include <screen.h>
+
+
 struct Entity allEntities[MAX_ALIVE];
 
+
+#define INITIAL_SPAWN_NUM 10
 void initializeWorld();
 
 #endif
diff --git a/zombies.c b/zombies.c
index b5a1ac8..ed38e89 100644
--- a/zombies.c
+++ b/zombies.c
@@ -4,24 +4,43 @@
 
 void addZombie(){
 	if(getOpenPos()){
-		int i;
-		for(i=0;i<MAX_ALIVE-1;i++){
-			if(!allEntities[i].isAlive){
-				struct Entity zombie;
-				zombie.curYpos=openPos.y;
-				zombie.curXpos=openPos.x;
-				zombie.nextYpos=openPos.y;
-				zombie.nextXpos=openPos.x;
-				zombie.type="zombie";
-				zombie.symbol='Z';
-				zombie.isAlive=1;
-				allEntities[i]=zombie;
-				mvwaddch(viewportWin, allEntities[i].curYpos, allEntities[i].curXpos, allEntities[i].symbol);
-				wnoutrefresh(viewportWin);
-				doupdate();
+		int attempts=0;
+		while (attempts<=10){
+			if(getOpenPos()){
+				if((openPos.y > allEntities[0].curYpos+5 || openPos.y < allEntities[0].curYpos-5) || (openPos.x > allEntities[0].curXpos+5 || openPos.x < allEntities[0].curXpos-5)) {
+					attempts=0;
+					break;
+				}
+				else{
+					getOpenPos();
+					attempts++;
+				}
+			}	
+			else{
+				attempts=0;
 				break;
 			}
 		}
+		if (attempts<10){
+			int i;
+			for(i=0;i<MAX_ALIVE-1;i++){
+				if(!allEntities[i].isAlive){
+					struct Entity zombie;
+					zombie.curYpos=openPos.y;
+					zombie.curXpos=openPos.x;
+					zombie.nextYpos=openPos.y;
+					zombie.nextXpos=openPos.x;
+					zombie.type="zombie";
+					zombie.symbol='Z';
+					zombie.isAlive=1;
+					allEntities[i]=zombie;
+					mvwaddch(viewportWin, allEntities[i].curYpos, allEntities[i].curXpos, allEntities[i].symbol);
+					wnoutrefresh(viewportWin);
+					doupdate();
+					break;
+				}
+			}
+		}
 	}
 }
 
@@ -29,7 +48,7 @@ void moveZombies(){
 		int i;
 		for(i=1;i<MAX_ALIVE;i++){
 			if(allEntities[i].isAlive){
-				int moveCheck = rand()%10000;
+				int moveCheck = rand()%2000;
 				if(moveCheck==1){
 				getNextPos(allEntities[i].curYpos,allEntities[i].curXpos,allEntities[0].curYpos,allEntities[0].curXpos);
 				allEntities[i].nextYpos = nextPos.y;