X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FConfigMenu.cpp;h=fa51f7732c5d5932e15e11b339b30beb6e1bd590;hb=ec824200aec12d6870b70304bcd2e2aeadba767b;hp=b5a2b7d4e9d73e038303ad473ed507cc3bcc483c;hpb=a115853500fdaf2715ce3dceef568fed3884d163;p=l2e.git

diff --git a/src/menu/ConfigMenu.cpp b/src/menu/ConfigMenu.cpp
index b5a2b7d..fa51f77 100644
--- a/src/menu/ConfigMenu.cpp
+++ b/src/menu/ConfigMenu.cpp
@@ -1,22 +1,18 @@
-/*
- * ConfigMenu.cpp
- *
- *  Created on: Nov 29, 2012
- *      Author: holy
- */
-
 #include "ConfigMenu.h"
 
 #include "PartyMenu.h"
 #include "Resources.h"
+#include "../app/Application.h"
+#include "../app/Input.h"
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
+#include "../math/Vector.h"
 
 using app::Input;
 using common::GameState;
-using geometry::Vector;
+using math::Vector;
 using graphics::Font;
 using graphics::Frame;
 
@@ -33,7 +29,7 @@ ConfigMenu::ConfigMenu(PartyMenu *parent)
 
 
 void ConfigMenu::OnEnterState(SDL_Surface *) {
-
+	configMenu.StartAnimation(Ctrl());
 }
 
 void ConfigMenu::OnExitState(SDL_Surface *) {
@@ -103,7 +99,7 @@ void ConfigMenu::HandleEvents(const Input &input) {
 	}
 }
 
-void ConfigMenu::UpdateWorld(float deltaT) {
+void ConfigMenu::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -120,7 +116,7 @@ void ConfigMenu::Render(SDL_Surface *screen) {
 	RenderMenu(screen, offset + menuOffset);
 }
 
-void ConfigMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void ConfigMenu::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(
@@ -130,7 +126,7 @@ void ConfigMenu::RenderHeadline(SDL_Surface *screen, const geometry::Vector<int>
 	font.DrawString(parent->Res().mainMenuConfigText, screen, offset + textOffset, 6);
 }
 
-void ConfigMenu::RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+void ConfigMenu::RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const {
 	const Resources &res(parent->Res());
 	const Font &font(*res.normalFont);
 	const Font &inactiveFont(*res.inactiveFont);