From 4b222e9c7a021a08820b1b7f4d8ce02c4f45e683 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <felixableitner@gmail.com>
Date: Mon, 20 May 2013 12:07:05 +0200
Subject: [PATCH] Switched to linux, updated sfml, thor.

---
 source/Game.cpp                | 2 +-
 source/generator/Generator.cpp | 2 +-
 source/items/Weapon.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/Game.cpp b/source/Game.cpp
index b18083c..8ea7889 100644
--- a/source/Game.cpp
+++ b/source/Game.cpp
@@ -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
diff --git a/source/generator/Generator.cpp b/source/generator/Generator.cpp
index 6924e34..66a725c 100644
--- a/source/generator/Generator.cpp
+++ b/source/generator/Generator.cpp
@@ -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)));
 			}
 		}
diff --git a/source/items/Weapon.cpp b/source/items/Weapon.cpp
index 7bf98be..1679fdc 100755
--- a/source/items/Weapon.cpp
+++ b/source/items/Weapon.cpp
@@ -7,7 +7,7 @@
 
 #include "Weapon.h"
 
-#include <thor/Vectors.hpp>
+#include <Thor/Vectors.hpp>
 
 #include "../World.h"
 #include "../effects/Bullet.h"