Fixed compile errors (I accidentally renamed ObjectPool at some point).

PxlBuzzard · Aug 18, 2014 · e965b42 · e965b42
1 parent 7a08993
commit e965b42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/FourGuns/FourGuns/Game Objects/Weapons/Gun.cs b/FourGuns/FourGuns/Game Objects/Weapons/Gun.cs
@@ -28,7 +28,7 @@ public enum GunWeight
             { Light, Medium, Heavy }
         public GunWeight gunWeight; //which weight category the gun is
 
-        protected ObjectPool<Bullet> bulletPool; //bullet pool for the gun
+        protected DynamicObjectPool<Bullet> bulletPool; //bullet pool for the gun
         #endregion
 
         protected Gun() { }
@@ -72,7 +72,7 @@ public Gun(ContentManager theContentManager, Color bColor, bool ChargeGun) : thi
             currentAmmo = maxAmmo;
             bulletSprite = theContentManager.Load<Texture2D>("Sprites/Gun/Bullet/bullet");
 
-            bulletPool = new ObjectPool<Bullet>(10, new Bullet(bulletSprite, bulletColor));
+            bulletPool = new DynamicObjectPool<Bullet>(10, new Bullet(bulletSprite, bulletColor));
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ public Gun(ContentManager theContentManager, string weaponName,
             timeBetweenAttack = timeBetweenShots;
             bulletSprite = theContentManager.Load<Texture2D>(theBulletSprite);
             currentAmmo = maxAmmo;
-            bulletPool = new ObjectPool<Bullet>(10, new Bullet(bulletSprite, bulletColor));
+            bulletPool = new DynamicObjectPool<Bullet>(10, new Bullet(bulletSprite, bulletColor));
         }
 
         /// <summary>

diff --git a/FourGuns/FourGuns/Missions/GameModes/WaveSurvival.cs b/FourGuns/FourGuns/Missions/GameModes/WaveSurvival.cs
@@ -20,7 +20,7 @@ public class WaveSurvival : Gamemode
     {
         #region Fields
         private Random rnd;
-        private ObjectPool<Zombie> enemyPool;
+        private DynamicObjectPool<Zombie> enemyPool;
         private Vector2 spawnPosition;
         private int mapWidth;
         private int mapHeight;
@@ -46,7 +46,7 @@ public WaveSurvival(ContentManager theContentManager, TileLayer map)
             //instantiate things
             activeEnemies = new List<Enemy>();
             rnd = new Random();
-            enemyPool = new ObjectPool<Zombie>(15, new Zombie(theContentManager, Vector2.Zero));
+            enemyPool = new DynamicObjectPool<Zombie>(15, new Zombie(theContentManager, Vector2.Zero));
 
             //save map size
             mapWidth = map.WidthInPixels;

diff --git a/FourGuns/FourGuns/ObjectPool.cs b/FourGuns/FourGuns/ObjectPool.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 #endregion 
 
-namespace CodeSamples
+namespace FourGuns
 {
     /// <summary>
     /// A generic-type object pool that can create new objects if empty.