[Fix] Makefiles now work. I am sure I did this about 3-4 commits ago....
This commit is contained in:
parent
77d959d0ec
commit
943916ce8c
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<save>
|
<save>
|
||||||
<name>Allanis</name>
|
<name>Allanis</name>
|
||||||
<x>100</x>
|
<x>120</x>
|
||||||
<y>168</y>
|
<y>144</y>
|
||||||
<map>map</map>
|
<map>map</map>
|
||||||
</save>
|
</save>
|
||||||
|
BIN
Unuk-QT/Unuk-QT
BIN
Unuk-QT/Unuk-QT
Binary file not shown.
@ -1,6 +1,7 @@
|
|||||||
#include "Game.h"
|
#include "Game.h"
|
||||||
|
|
||||||
Game::Game(void) {
|
Game::Game(void) {
|
||||||
|
Debug::logger->message("Creating characters..");
|
||||||
_player = new Player(&_map);
|
_player = new Player(&_map);
|
||||||
_npc = new NPC(&_map);
|
_npc = new NPC(&_map);
|
||||||
|
|
||||||
@ -8,7 +9,7 @@ Game::Game(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Game::~Game(void) {
|
Game::~Game(void) {
|
||||||
Debug::logger->message("----- Cleaning Up ------");
|
Debug::logger->message("\n----- Cleaning Up ------");
|
||||||
// cleaning _player up caused a nice seg fault. I'll look later.
|
// cleaning _player up caused a nice seg fault. I'll look later.
|
||||||
//delete _player;
|
//delete _player;
|
||||||
delete _npc;
|
delete _npc;
|
||||||
|
@ -3,7 +3,7 @@ CFLAGS = -ansi -Wall -g
|
|||||||
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
|
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
|
||||||
objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
|
objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
|
||||||
Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
|
Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
|
||||||
Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
|
Map.o MapElement.o MapEntities.o MemManager.o NPC.o ParticleEmitter.o \
|
||||||
Rect.o Text.o Texture.o TextureManager.o Timer.o \
|
Rect.o Text.o Texture.o TextureManager.o Timer.o \
|
||||||
AStar.o \
|
AStar.o \
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user