nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed Corpse not being rendered.

Browse source
This commit is contained in:
Felix Ableitner 2013-05-08 11:30:02 +02:00
parent 73bb918a01
commit 8ea278030d
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
resources/textures/body.png → resources/textures/corpse.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

3
resources/yaml/body.yaml
View file

@ -1,3 +0,0 @@
name: Body
texture: body.png
size: [50, 50]

3
resources/yaml/corpse.yaml Normal file
View file

@ -0,0 +1,3 @@
name: Corpse
texture: corpse.png
radius: 25.0

10
source/Game.cpp
View file

@ -10,11 +10,8 @@
#include <Thor/Vectors.hpp> #include <Thor/Vectors.hpp>
#include "generator/Generator.h" #include "generator/Generator.h"
#include "sprites/Enemy.h" #include "sprites/Enemy.h"
#include "sprites/Player.h" #include "sprites/Player.h"
#include "util/Log.h"
#include "sprites/Corpse.h"
const int Game::FPS_GOAL = 60; const int Game::FPS_GOAL = 60;
@ -38,9 +35,8 @@ Game::Game(sf::RenderWindow& window) :
auto enemyPositions = mGenerator.getEnemySpawns(area); auto enemyPositions = mGenerator.getEnemySpawns(area);
for (const auto& position : enemyPositions) { for (const auto& position : enemyPositions) {
LOG_D(position);
if (thor::length(mPlayer->getPosition() - position) > Character::VISION_DISTANCE) if (thor::length(mPlayer->getPosition() - position) > Character::VISION_DISTANCE)
mWorld.insertCharacter(std::shared_ptr<Enemy>(new Enemy(mWorld, mPathfinder, position))); mWorld.insertCharacter(std::shared_ptr<Enemy>(new Enemy(mWorld, mPathfinder, position)));
} }
} }

1
source/abstract/CollisionModel.h
View file

@ -18,6 +18,7 @@ class CollisionModel {
public: public:
virtual ~CollisionModel() = 0; virtual ~CollisionModel() = 0;
protected:
static bool testCollision(const Circle& circle, const Rectangle& rect, static bool testCollision(const Circle& circle, const Rectangle& rect,
int elapsed); int elapsed);
static bool testCollision(const Circle& first, const Circle& second, static bool testCollision(const Circle& first, const Circle& second,