consistent naming of graphics drawing functions

[l2e.git] / src / menu / PartyMenu.cpp

diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp
index 20a2a8ee567dd74b37734699f1577a71d42ca6d9..8e627ee312ba1902ffe02d5a59427e9b90d948de 100644 (file)
--- a/src/menu/PartyMenu.cpp
+++ b/src/menu/PartyMenu.cpp
@@ -1,5 +1,6 @@
 #include "PartyMenu.h"
 
+#include "CapsuleMenu.h"
 #include "ChangeHero.h"
 #include "ConfigMenu.h"
 #include "EquipMenu.h"
@@ -13,14 +14,14 @@
 #include "../app/Input.h"
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Texture.h"
 
 using app::Input;
 using common::GameConfig;
-using geometry::Vector;
+using math::Vector;
 
 namespace menu {
 
@@ -40,7 +41,7 @@ PartyMenu::PartyMenu(GameConfig *game)
        mainMenu.Add(Res().mainMenuStatusText, 4);
        mainMenu.Add(Res().mainMenuSpellText, 1);
        mainMenu.Add(Res().mainMenuChangeText, 5);
-       mainMenu.Add(Res().mainMenuCapsuleText, 2);
+       mainMenu.Add(Res().mainMenuCapsuleText, 2, game->state->capsule);
        mainMenu.Add(Res().mainMenuConfigText, 6);
        mainMenu.Add(Res().mainMenuEquipmentText, 3);
        mainMenu.Add(Res().mainMenuScenarioText, 7);
@@ -52,7 +53,7 @@ PartyMenu::~PartyMenu() {
 
 
 void PartyMenu::OnEnterState(SDL_Surface *) {
-
+       mainMenu.StartAnimation(Ctrl());
 }
 
 void PartyMenu::OnExitState(SDL_Surface *) {
@@ -98,6 +99,11 @@ void PartyMenu::HandleEvents(const Input &input) {
                                Ctrl().PushState(new SelectHero(this, this, this, OnSpellSelect));
                                break;
                        case MENU_ITEM_CAPSULE:
+                               if (game->state->capsule) {
+                                       Ctrl().PushState(new CapsuleMenu(this));
+                               } else {
+                                       // noise and blur
+                               }
                                break;
                        case MENU_ITEM_EQUIP:
                                Ctrl().PushState(new SelectHero(this, this, this, OnEquipSelect));
@@ -120,7 +126,7 @@ void PartyMenu::HandleEvents(const Input &input) {
        }
 }
 
-void PartyMenu::UpdateWorld(float deltaT) {
+void PartyMenu::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -147,7 +153,7 @@ int PartyMenu::Height() const {
 }
 
 void PartyMenu::RenderBackground(SDL_Surface *screen) const {
-       Res().menubg->Render(screen, Vector<int>(), Vector<int>(screen->w, screen->h));
+       Res().menubg->Draw(screen, Vector<int>(), Vector<int>(screen->w, screen->h));
 }
 
 void PartyMenu::RenderHeros(SDL_Surface *screen, const Vector<int> &offset) const {