renamed collisionHandler to Manager

diff --git a/src/Makefile b/src/Makefile
index 65787c3..2fae2ba 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,10 +20,10 @@ SRCS += ticks.cpp
 SRCS += Vector2.cpp
 SRCS += handleSignal.cpp
 
+SRCS += entityCreator.cpp
 SRCS += entityManager.cpp
 SRCS += effectManager.cpp
-SRCS += entityCreator.cpp
-SRCS += collisionHandler.cpp
+SRCS += collisionManager.cpp
 SRCS += CollisionInfo.cpp
 
 SRCS += Entities/Ball.cpp

diff --git a/src/collisionHandler.cpp b/src/collisionManager.cpp
similarity index 99%
rename from src/collisionHandler.cpp
rename to src/collisionManager.cpp
index 7d99469..3327ebb 100644 (file)
--- a/src/collisionHandler.cpp
+++ b/src/collisionManager.cpp
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "collisionHandler.h"
+#include "collisionManager.h"
 #include "debug.h"
 
 #include "Vector2.h"

diff --git a/src/collisionHandler.h b/src/collisionManager.h
similarity index 92%
rename from src/collisionHandler.h
rename to src/collisionManager.h
index d9b54c1..72151d7 100644 (file)
--- a/src/collisionHandler.h
+++ b/src/collisionManager.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COLLISIONHANDLER_H
-#define COLLISIONHANDLER_H
+#ifndef COLLISIONMANAGER_H
+#define COLLISIONMANAGER_H
 
 #include "Entities/PhysicsEntity.h"
 
@@ -32,4 +32,4 @@ namespace collision
     void update(setPhys&);
 }
 
-#endif // COLLISIONHANDLER_H
+#endif // COLLISIONMANAGER_H

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index cbe9e03..0707dfe 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -24,7 +24,7 @@
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
 
-#include "collisionHandler.h"
+#include "collisionManager.h"
 #include "effectManager.h"
 
 /// ***** Private Method Headers *****