move MenuElements into a base ScreenWithMenuElements so that metrics can be overridden using the Fallback mechanism
This commit is contained in:
@@ -9,18 +9,17 @@
|
||||
-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include "Screen.h"
|
||||
#include "ScreenWithMenuElements.h"
|
||||
#include "Sprite.h"
|
||||
#include "RandomSample.h"
|
||||
#include "GameConstantsAndTypes.h"
|
||||
#include "MenuElements.h"
|
||||
#include "OptionIcon.h"
|
||||
#include "Banner.h"
|
||||
|
||||
|
||||
#define MAX_CHAR_ICONS_TO_SHOW 11
|
||||
|
||||
class ScreenSelectCharacter : public Screen
|
||||
class ScreenSelectCharacter : public ScreenWithMenuElements
|
||||
{
|
||||
public:
|
||||
ScreenSelectCharacter( CString sName );
|
||||
@@ -58,8 +57,6 @@ private:
|
||||
} m_SelectionRow[NUM_PLAYERS];
|
||||
PlayerNumber GetAffectedPlayerNumber( PlayerNumber pn ); // returns the number of the player that pn is selecting for
|
||||
|
||||
MenuElements m_Menu;
|
||||
|
||||
Sprite m_sprTitle[NUM_PLAYERS];
|
||||
|
||||
Banner m_sprIcons[NUM_PLAYERS][MAX_CHAR_ICONS_TO_SHOW];
|
||||
|
||||
Reference in New Issue
Block a user