From 93d0c12e4b8a5ec65831ad6764ccc80face9d813 Mon Sep 17 00:00:00 2001
From: Jerry Aldrich <git@jerryaldrichiii.com>
Date: Thu, 9 Apr 2015 20:49:36 -0500
Subject: [PATCH] Add restart option on Game Over

---
 drawWindows.c     |  7 ++++++-
 initializeWorld.c | 14 ++++++++++++++
 world.h           |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/drawWindows.c b/drawWindows.c
index 2dec604..a52f949 100644
--- a/drawWindows.c
+++ b/drawWindows.c
@@ -10,6 +10,8 @@ void drawScore(){
 	mvwprintw(scoreWin, 2, 1, "Ammo: %d/%d:%d",allEntities[0].weapons[allEntities[0].curWeapon].curCapacity,allEntities[0].weapons[allEntities[0].curWeapon].maxCapacity,allEntities[0].weapons[allEntities[0].curWeapon].curMags);
 	mvwprintw(scoreWin,3,1,"Zombies Killed: %d",allEntities[0].killCount);
 	mvwprintw(scoreWin,4,1,"Projectiles Fired: %d",allEntities[0].projectilesFired);
+	mvwprintw(scoreWin,5,1,"Zombies Modifier: %d",zombieModifier);
+	mvwprintw(scoreWin,6,1,"Item Modifier: %d",itemModifier);
 	wnoutrefresh(scoreWin);
 }
 
@@ -42,7 +44,7 @@ void drawGameOverWin(){
 	mvwprintw(gameOverWin,1,(gameOverWinCols-strlen("GAME OVER"))/2,"%s","GAME OVER");
 	mvwprintw(gameOverWin,(gameOverWinRows/2)-1,1,"Shots Fired: %i",allEntities[0].projectilesFired);
 	mvwprintw(gameOverWin,(gameOverWinRows/2),1,"Zombies Killed: %i",allEntities[0].killCount);
-	mvwprintw(gameOverWin,(gameOverWinRows)-2,(gameOverWinCols-strlen("Press 'q' to quit"))/2,"%s","Press 'q' to quit");
+	mvwprintw(gameOverWin,(gameOverWinRows)-2,(gameOverWinCols-strlen("Press 'q' to quit or 'r' to restart"))/2,"%s","Press 'q' to quit or 'r' to restart");
 	nodelay(stdscr, FALSE);
 	wnoutrefresh(gameOverWin);
 	doupdate();
@@ -52,5 +54,8 @@ void drawGameOverWin(){
 			endwin();
 			exit(0);
 		}
+		if (input == 'r' || input == 'R'){
+			restartGame();
+		}
 	}
 }
diff --git a/initializeWorld.c b/initializeWorld.c
index e7d69d2..cbb0a75 100644
--- a/initializeWorld.c
+++ b/initializeWorld.c
@@ -6,6 +6,7 @@
 #include <getPos.h>
 
 void initializeWorld() {
+	
 	struct Entity player = {.type="player",.symbol='@', .curYpos=1, .curXpos=1, .nextYpos=1, .nextXpos=1 ,.isAlive=1};
 	struct Weapon pistol = {.type="Pistol", .isAlive=1, .range=3, .maxCapacity=12, .curCapacity=12, .symbols="-\\|/-\\|/"};
 
@@ -38,3 +39,16 @@ void initializeWorld() {
 	}
 }
 
+void restartGame(){
+	int i;
+	for(i=0;i<MAX_ENTITIES;i++){
+		allEntities[i].isAlive=0;
+	}
+	for(i=0;i<MAX_ITEMS;i++){
+		allItems[i].isAlive=0;
+	}
+	zombieModifier=0;
+	itemModifier=0;
+	endwin();
+	main();
+}
diff --git a/world.h b/world.h
index f475992..6a9eda1 100644
--- a/world.h
+++ b/world.h
@@ -1,5 +1,5 @@
-#ifndef _INITIALIZE_WORLD
-#define	_INITIALIZE_WORLD
+#ifndef _WORLD
+#define	_WORLD
 
 #define MAX_ENTITIES 10000
 #define MAX_ITEMS 100