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

Switched to linux, updated sfml, thor.

Browse source
This commit is contained in:
Felix Ableitner 2013-05-20 12:07:05 +02:00
parent 6418de7774
commit 4b222e9c7a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Game.cpp
View file

@ -156,7 +156,7 @@ Game::keyDown(const sf::Event& event) {
*/
sf::Vector2<float>
Game::convertCoordinates(int x, int y) {
return mWindow.convertCoords(sf::Vector2i(x, y), mView);
return mWindow.mapPixelToCoords(sf::Vector2i(x, y), mView);
}
void

2
source/generator/Generator.cpp
View file

@ -100,7 +100,7 @@ Generator::getEnemySpawns(const sf::IntRect& area) const {
for (int y = area.top; y < area.top + area.height; y++) {
if (scaled_octave_noise_3d(2, 2, 0.5f, 10.0f, 0, x, y, LAYER_ENEMIES)
< 1.0f) {
ret.insert(sf::Vector2f(thor::componentwiseProduct(
ret.insert(sf::Vector2f(thor::cwiseProduct(
findClosestFloor(sf::Vector2i(x, y)), Tile::TILE_SIZE)));
}
}

2
source/items/Weapon.cpp
View file

@ -7,7 +7,7 @@
#include "Weapon.h"
#include <thor/Vectors.hpp>
#include <Thor/Vectors.hpp>
#include "../World.h"
#include "../effects/Bullet.h"