Moved Renderable and Character into Renderable/

This commit is contained in:
Kayne Ruse
2014-10-10 06:16:31 +11:00
parent 8dcd02aba3
commit 7c4762852b
6 changed files with 37 additions and 50 deletions
@@ -21,16 +21,6 @@
*/
#include "character.hpp"
void Character::Update() {
if (motion.x && motion.y) {
origin += motion * CHARACTER_WALKING_MOD;
}
else if (motion != 0) {
origin += motion;
}
sprite.Update(0.016);
}
void Character::CorrectSprite() {
//NOTE: These must correspond to the sprite sheet in use
if (motion.y > 0) {
@@ -36,16 +36,12 @@ public:
Character() = default;
~Character() = default;
void Update() override;
//graphics
void CorrectSprite();
//gameplay
Statistics* GetStats() { return &stats; }
//accessors and mutators
//metadata
int SetOwner(int i) { return owner = i; }
int GetOwner() { return owner; }
@@ -54,8 +50,6 @@ public:
std::string SetAvatar(std::string s) { return avatar = s; }
std::string GetAvatar() const { return avatar; }
//position
private:
//base statistics
Statistics stats;
+37
View File
@@ -0,0 +1,37 @@
#config
INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
LIBS+=
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
#objects
OBJDIR=obj
OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
#output
OUTDIR=..
OUT=$(addprefix $(OUTDIR)/,client.a)
#targets
all: $(OBJ) $(OUT)
ar -crs $(OUT) $(OBJ)
$(OBJ): | $(OBJDIR)
$(OUT): | $(OUTDIR)
$(OBJDIR):
mkdir $(OBJDIR)
$(OUTDIR):
mkdir $(OUTDIR)
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all