X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FScenarioMenu.cpp;h=18fa55a984291177f65ada647b8bbbfa8686fbaf;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=a2aca87875b899aa1333062d612c8b67026ad06d;hpb=350055a7ff27c74882aff8a4d6af2014782f830b;p=l2e.git

diff --git a/src/menu/ScenarioMenu.cpp b/src/menu/ScenarioMenu.cpp
index a2aca87..18fa55a 100644
--- a/src/menu/ScenarioMenu.cpp
+++ b/src/menu/ScenarioMenu.cpp
@@ -1,14 +1,8 @@
-/*
- * ScenarioMenu.cpp
- *
- *  Created on: Nov 30, 2012
- *      Author: holy
- */
-
 #include "ScenarioMenu.h"
 
 #include "PartyMenu.h"
 #include "Resources.h"
+#include "../app/Application.h"
 #include "../app/Input.h"
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
@@ -16,11 +10,12 @@
 #include "../common/Item.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::Inventory;
 using common::Item;
-using geometry::Vector;
+using math::Vector;
 using graphics::Font;
 using graphics::Frame;
 
@@ -81,7 +76,7 @@ void ScenarioMenu::HandleEvents(const Input &input) {
 	}
 }
 
-void ScenarioMenu::UpdateWorld(float deltaT) {
+void ScenarioMenu::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -106,7 +101,7 @@ int ScenarioMenu::Height() const {
 	return parent->Height();
 }
 
-void ScenarioMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void ScenarioMenu::RenderHeadline(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	const Font &font(*parent->Res().normalFont);
 	const Frame &frame(*parent->Res().statusFrame);
 	const Vector<int> textOffset(2 * font.CharWidth(), font.CharHeight());
@@ -116,7 +111,7 @@ void ScenarioMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector<in
 	font.DrawString(parent->Res().scenarioMenuHeadline, screen, offset + textOffset);
 }
 
-void ScenarioMenu::RenderItems(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void ScenarioMenu::RenderItems(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	const Font &font(*parent->Res().normalFont);
 	const Frame &frame(*parent->Res().statusFrame);
 	const Vector<int> menuOffset(3 * font.CharWidth(), font.CharHeight() + font.CharHeight() / 4);