From 3edc2f30543b794436ca873cb57a7f85777b44be Mon Sep 17 00:00:00 2001 From: Jerry Aldrich Date: Thu, 9 Apr 2015 21:18:37 -0500 Subject: [PATCH] Tweak Zombie Modifier logic --- collisionDetection.c | 4 +++- events.c | 3 --- gameLoop.c | 11 ----------- zombies.c | 17 ----------------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/collisionDetection.c b/collisionDetection.c index 246fb3a..ff07f6d 100644 --- a/collisionDetection.c +++ b/collisionDetection.c @@ -30,7 +30,9 @@ void checkProjectileCollision(struct Projectile *projectileRef ){ allEntities[0].killCount++; if (allEntities[0].killCount != 0 && allEntities[0].killCount%5==0){ itemModifier++; - zombieModifier-5; + if(zombieModifier>5){ + zombieModifier-=5; + } } mvwaddch(viewportWin, collisionEvent.collidedWithEntity->curYpos, collisionEvent.collidedWithEntity->curXpos, ' '); } diff --git a/events.c b/events.c index f42a649..a3cbf94 100644 --- a/events.c +++ b/events.c @@ -32,7 +32,4 @@ void randomEvents(){ addZombie(openPos.y, openPos.x); zombieModifier++; } - if (eventTrigger==zombieModifier){ - addHorde(); - } } diff --git a/gameLoop.c b/gameLoop.c index 00c64a9..aceb96c 100644 --- a/gameLoop.c +++ b/gameLoop.c @@ -56,17 +56,6 @@ void gameLoop(){ } break; } - case 'z': - case 'Z':{ - struct OpenPos openPos = getOpenPos(); - addZombie(openPos.y,openPos.x); - break; - } - case '=':{ - struct OpenPos openPos = getOpenPos(); - addItem("Pistol Magazine",openPos.y,openPos.x); - break; - } case KEY_UP:{ if(allEntities[0].weapons[allEntities[0].curWeapon].curCapacity>0){ fireWeapon(&allEntities[0].weapons[allEntities[0].curWeapon], "up"); diff --git a/zombies.c b/zombies.c index 7b661cc..29bdb42 100644 --- a/zombies.c +++ b/zombies.c @@ -25,23 +25,6 @@ void addZombie(int y, int x){ } } -void addHorde(){ -// if(getOpenPos()){ -// int y=openPos.y; -// int x=openPos.x; -// addZombie(); - /* - addZombie(y-1,x); - addZombie(y,x-1); - addZombie(y-1,x-1); - addZombie(y+1,x); - addZombie(y,x+1); - addZombie(y+1,x+1); - addZombie(y-1,x+1); - addZombie(y+1,x-1); - */ -// } -} void moveZombies(){ int i;