Merge branch 'wall' of lcmstaff/invaders into master

makefile

@@ -1,13 +1,9 @@
 #MACROS
 
-CXX_FLAGS := -O3
+CXX_FLAGS := -O3 -Wall -Wextra -Wpedantic
 
 CXX := g++ -std=c++11
 
-WARNINGS := -Wall
-
-EDITOR := gedit
-
 CURSES := -lncurses
 
 THREADS := -pthread
@@ -25,6 +21,7 @@ all: invaders bossrush
 
 invaders: game_object.o bullet.o enemy.o player.o functions.o pic.o body.o boss.o wall.o powerup.o rocket.o invaders.o
 	$(CXX) $(CXX_FLAGS) $^ -o $@ $(OPTIONS)
+
 bossrush: game_object.o bullet.o enemy.o player.o functions.o pic.o body.o boss.o wall.o powerup.o rocket.o bossrush.o
 	$(CXX) $(CXX_FLAGS) $^ -o $@ $(OPTIONS) 
 
@@ -67,17 +64,6 @@ powerup.o: powerup.cpp powerup.hpp bullet.hpp
 rocket.o: rocket.cpp rocket.hpp bullet.hpp definitions.hpp
 	$(CXX) $(CXX_FLAGS) -c $<
 
-#UTILITIES
-
-open:  
-	$(EDITOR) *.cpp *.hpp makefile &
-
-openhpp:
-	$(EDITOR) *.hpp&
-
-opencpp:
-	$(EDITOR) *.cpp&
-
 clean:
 	rm -f *~ *.o