[Fix] Merging crap to git.
This commit is contained in:
parent
3e20041111
commit
996c6418b1
@ -8,7 +8,7 @@ LIBS += -lGL \
|
||||
-ltinyxml \
|
||||
-lSDL_mixer \
|
||||
-lSDL_ttf
|
||||
win32: {
|
||||
win32: {
|
||||
LIBS -= -lGL \
|
||||
-lGLU
|
||||
LIBS += -lkernel32 \
|
||||
@ -62,7 +62,7 @@ HEADERS += ../src/Actor/Player.h \
|
||||
../src/Animation/AnimationSequence.h \
|
||||
../src/System/String.h \
|
||||
../src/Font/Font.h \
|
||||
../src/Animation/AnimatingSprite.h
|
||||
../src/Animation/AnimatingSprite.h \
|
||||
SOURCES += ../src/Actor/Player.cpp \
|
||||
../src/Collision/AABB.cpp \
|
||||
../src/Global/Globals.cpp \
|
||||
@ -99,5 +99,5 @@ SOURCES += ../src/Actor/Player.cpp \
|
||||
../src/Animation/AnimationSequence.cpp \
|
||||
../src/System/String.cpp \
|
||||
../src/Font/Font.cpp \
|
||||
../src/Animation/AnimatingSprite.cpp
|
||||
OTHER_FILES +=
|
||||
../src/Animation/AnimatingSprite.cpp \
|
||||
OTHER_FILES +=
|
||||
|
@ -42,8 +42,8 @@ public:
|
||||
|
||||
void SetXY(float xArg, float yArg) { x = xArg; y = yArg; }
|
||||
|
||||
Facing GetDirection(void) { return _direction; }
|
||||
void SetDirection(Facing direction) { _direction = direction; }
|
||||
Facing GetDirection(void) { return _direction; }
|
||||
void SetDirection(Facing direction) { _direction = direction; }
|
||||
|
||||
protected:
|
||||
virtual void Move(float dt) = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user