Permalink
Browse files

MAIN_OPTIONS_STATUS -> PARTY + Moved a trivial function to header.

  • Loading branch information...
Yohann Ferreira
Yohann Ferreira committed Dec 17, 2012
1 parent 0dcce26 commit 631df18adea67ce08ad187cf8b633b4f4e6977fc
Showing with 6 additions and 11 deletions.
  1. +2 −2 src/modes/menu/menu.cpp
  2. +1 −1 src/modes/menu/menu.h
  3. +0 −7 src/modes/menu/menu_views.cpp
  4. +3 −1 src/modes/menu/menu_views.h
View
@@ -227,7 +227,7 @@ AbstractMenuState* MainMenuState::GetTransitionState(uint32 selection)
case MAIN_OPTIONS_SKILLS:
return &(_menu_mode->_skills_state);
break;
- case MAIN_OPTIONS_STATUS:
+ case MAIN_OPTIONS_PARTY:
return &(_menu_mode->_party_state);
break;
default:
@@ -253,7 +253,7 @@ void MainMenuState::_OnDraw()
_menu_mode->_skills_window.Draw();
break;
- case MAIN_OPTIONS_STATUS:
+ case MAIN_OPTIONS_PARTY:
default:
_menu_mode->_party_window.Draw();
break;
View
@@ -141,7 +141,7 @@ class MainMenuState : virtual public AbstractMenuState {
enum MAIN_CATEGORY {
MAIN_OPTIONS_INVENTORY,
MAIN_OPTIONS_SKILLS,
- MAIN_OPTIONS_STATUS,
+ MAIN_OPTIONS_PARTY,
MAIN_OPTIONS_SIZE
};
@@ -476,13 +476,6 @@ PartyWindow::PartyWindow() :
_InitCharSelect();
} // PartyWindow::PartyWindow()
-
-
-PartyWindow::~PartyWindow()
-{
-
-}
-
// Activate/deactivate window
void PartyWindow::Activate(bool new_value)
{
@@ -267,7 +267,9 @@ class PartyWindow : public hoa_gui::MenuWindow
public:
PartyWindow();
- ~PartyWindow();
+
+ ~PartyWindow()
+ {}
/*!
* \brief render this window to the screen

0 comments on commit 631df18

Please sign in to comment.