summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2018-07-26 21:15:59 +0200
committerXaviDCR92 <xavi.dcr@gmail.com>2018-07-26 21:15:59 +0200
commitbfdc0b9f497ef10f6687abcc55d93405c611af11 (patch)
tree43914b2eada0bf5fb09093d61a250d4930b57a5d /Makefile
parent853c6cddaa2713a9eb0c1f1c55e3f61592f04a46 (diff)
downloadpocketempires-bfdc0b9f497ef10f6687abcc55d93405c611af11.tar.gz
* Menu.cpp: actions for CHOICE_SINGLE_PLAYER_GAME have been moved to a new function called MainMenuSinglePlayer().
+ BaseUnit.cpp, BaseUnit.h: new _selected flag. + Camera.cpp, Camera.h: linear movement has been taken over quadratic movement. Also, cursor now moves if dealing with screen borders. + Cursor.cpp, Cursor.h: new Cursor class holds cursor X/Y information. It is meant to be contained inside a HumanPlayer object. * Game.cpp: minor changes in casts and comments. + HumanPlayer.cpp: added callbacks for button release events. * HumanPlayer.cpp, HumanPlayerBtn.cpp: button handling has been transferred from HumanPlayer.cpp to HumanPlayerBtn.cpp in order to improve modularity. + Sprite.cpp: sprite data was not being checked against NULL. - Unit.cpp: drawHandler() is now executed by Player object.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 98922d9..97bd08d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,9 @@ CXX_FLAGS = $(CC_FLAGS) -std=c++11
OBJ_DIR = Obj
SRC_DIR = .
-OBJECTS=$(addprefix $(OBJ_DIR)/,main.o Game.o System.o HumanPlayer.o Sprite.o \
- Player.o Camera.o BaseUnit.o Unit.o Menu.o )
+OBJECTS=$(addprefix $(OBJ_DIR)/,main.o Game.o System.o HumanPlayer.o Sprite.o \
+ Player.o Camera.o BaseUnit.o Unit.o Menu.o \
+ Cursor.o HumanPlayerBtn.o)
DEPS = $(OBJECTS:.o=.d)