Commit 158408fe authored by Dennis Payne's avatar Dennis Payne

Add an option to use text instead of images on the pause screen....

Add an option to use text instead of images on the pause screen. AlchemistQuest has been modified to use this.
parent 0796396f
......@@ -71,11 +71,89 @@
<image file="misc/font.png">
<grid pos="119,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="289,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="298,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="307,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="316,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="325,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="334,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="343,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="352,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="361,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="370,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="379,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="388,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="397,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="406,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="415,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="424,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="433,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="442,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="451,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="460,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="469,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="478,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="487,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="496,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="505,0" size="8,16" />
</image>
<image file="misc/font.png">
<grid pos="514,0" size="8,16" />
</image>
</sprite>
<!-- Main font description -->
<font name="font">
<bitmap glyphs="font_glyph" letters="0123456789." spacelen="8" />
<bitmap glyphs="font_glyph" letters="0123456789.ABCDEFGHIJKLMNOPQRSTUVWXYZ" spacelen="8" />
</font>
</resources>
......@@ -15,121 +15,80 @@
<!-- Sprite for the background -->
<sprite name="background">
<image file="dialogs/pause/pause.png">
<grid pos="0,0" size="463,454" />
<grid pos="0,0" size="134,144" />
</image>
</sprite>
<!-- Resume item -->
<section name="resume">
<sprite name="selected">
<image file="dialogs/pause/resume-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/resume-unselected.png" />
</sprite>
<integer name="top" value="100" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="RESUME" />
<integer name="top" value="16" />
<integer name="left" value="17" />
</section>
<!-- Undo item -->
<section name="undo">
<sprite name="selected">
<image file="dialogs/pause/undo-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/undo-unselected.png" />
</sprite>
<sprite name="unavailable">
<image file="dialogs/pause/undo-unavailable.png" />
</sprite>
<integer name="top" value="150" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="UNDO" />
<boolean name="locked" value="true" />
<integer name="top" value="32" />
<integer name="left" value="17" />
</section>
<!-- Retry Item -->
<section name="retry">
<sprite name="selected">
<image file="dialogs/pause/retry-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/retry-unselected.png" />
</sprite>
<integer name="top" value="200" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="RETRY" />
<integer name="top" value="48" />
<integer name="left" value="17" />
</section>
<!-- Go to option menu item -->
<section name="options">
<sprite name="selected">
<image file="dialogs/pause/options-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/options-unselected.png" />
</sprite>
<integer name="top" value="250" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="OPTIONS" />
<integer name="top" value="64" />
<integer name="left" value="17" />
</section>
<!-- Change skin-->
<section name="changeskin">
<sprite name="selected">
<image file="dialogs/pause/changeskin-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/changeskin-unselected.png" />
</sprite>
<integer name="top" value="300" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="CHANGE SKIN" />
<integer name="top" value="80" />
<integer name="left" value="17" />
</section>
<!-- Back to main menu item-->
<section name="giveup">
<sprite name="selected">
<image file="dialogs/pause/giveup-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/giveup-unselected.png" />
</sprite>
<sprite name="unavailable">
<image file="dialogs/pause/giveup-unavailable.png" />
</sprite>
<integer name="top" value="350" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="GIVE UP" />
<boolean name="locked" value="true" />
<integer name="top" value="96" />
<integer name="left" value="17" />
</section>
<!-- Quit game item -->
<section name="quit">
<sprite name="selected">
<image file="dialogs/pause/quit-selected.png" />
</sprite>
<sprite name="unselected">
<image file="dialogs/pause/quit-unselected.png" />
</sprite>
<integer name="top" value="400" />
<integer name="left" value="100" />
<integer name="width" value="100" />
<integer name="height" value="16" />
<string name="text" value="QUIT" />
<integer name="top" value="112" />
<integer name="left" value="17" />
</section>
......
bin_PROGRAMS = openalchemist
openalchemist_SOURCES = ../src/Application.cpp ../src/AudioManager.cpp ../src/Board.cpp ../src/CombosPainter.cpp ../src/CommonResources.cpp ../src/DemoPlayer.cpp ../src/FrameRateCounter.cpp ../src/FrontLayer.cpp ../src/GameEngine.cpp ../src/HumanPlayer.cpp ../src/IniFile.cpp ../src/Keys.cpp ../src/LoadingScreen.cpp ../src/Player.cpp ../src/Preferences.cpp ../src/ProgressBar.cpp ../src/Skin.cpp ../src/SkinsManager.cpp ../src/Window.cpp ../src/main.cpp ../src/memory.cpp ../src/misc.cpp ../src/states/CommonState.cpp ../src/states/GameOverState.cpp ../src/states/GameState.cpp ../src/states/InGameState.cpp ../src/states/MenuState.cpp ../src/states/MenuState/BasicItem.cpp ../src/states/MenuState/DualChoiceItem.cpp ../src/states/MenuState/MenuItem.cpp ../src/states/MenuState/MultipleChoicesItem.cpp ../src/states/MenuState/TableChoicesItem.cpp ../src/states/OptionsMenuState.cpp ../src/states/PauseMenuState.cpp ../src/states/QuitMenuState.cpp ../src/states/SkinsMenuState.cpp ../src/states/TitleState.cpp
openalchemist_SOURCES = ../src/Application.cpp ../src/AudioManager.cpp ../src/Board.cpp ../src/CombosPainter.cpp ../src/CommonResources.cpp ../src/DemoPlayer.cpp ../src/FrameRateCounter.cpp ../src/FrontLayer.cpp ../src/GameEngine.cpp ../src/HumanPlayer.cpp ../src/IniFile.cpp ../src/Keys.cpp ../src/LoadingScreen.cpp ../src/Player.cpp ../src/Preferences.cpp ../src/ProgressBar.cpp ../src/Skin.cpp ../src/SkinsManager.cpp ../src/Window.cpp ../src/main.cpp ../src/memory.cpp ../src/misc.cpp ../src/states/CommonState.cpp ../src/states/GameOverState.cpp ../src/states/GameState.cpp ../src/states/InGameState.cpp ../src/states/MenuState.cpp ../src/states/MenuState/BasicItem.cpp ../src/states/MenuState/BasicTextItem.cpp ../src/states/MenuState/DualChoiceItem.cpp ../src/states/MenuState/MenuItem.cpp ../src/states/MenuState/MultipleChoicesItem.cpp ../src/states/MenuState/TableChoicesItem.cpp ../src/states/OptionsMenuState.cpp ../src/states/PauseMenuState.cpp ../src/states/QuitMenuState.cpp ../src/states/SkinsMenuState.cpp ../src/states/TitleState.cpp
AM_CXXFLAGS = `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL1-2.3 clanGL-2.3 clanSWRender-2.3` -DDATA_DIR="\"$(datadir)/\""
......
......@@ -117,6 +117,7 @@ am_openalchemist_OBJECTS = ../src/Application.$(OBJEXT) \
../src/states/InGameState.$(OBJEXT) \
../src/states/MenuState.$(OBJEXT) \
../src/states/MenuState/BasicItem.$(OBJEXT) \
../src/states/MenuState/BasicTextItem.$(OBJEXT) \
../src/states/MenuState/DualChoiceItem.$(OBJEXT) \
../src/states/MenuState/MenuItem.$(OBJEXT) \
../src/states/MenuState/MultipleChoicesItem.$(OBJEXT) \
......@@ -168,6 +169,7 @@ am__depfiles_remade = ../src/$(DEPDIR)/Application.Po \
../src/states/$(DEPDIR)/SkinsMenuState.Po \
../src/states/$(DEPDIR)/TitleState.Po \
../src/states/MenuState/$(DEPDIR)/BasicItem.Po \
../src/states/MenuState/$(DEPDIR)/BasicTextItem.Po \
../src/states/MenuState/$(DEPDIR)/DualChoiceItem.Po \
../src/states/MenuState/$(DEPDIR)/MenuItem.Po \
../src/states/MenuState/$(DEPDIR)/MultipleChoicesItem.Po \
......@@ -304,7 +306,28 @@ target_alias = @[email protected]
top_build_prefix = @[email protected]
top_builddir = @[email protected]
top_srcdir = @[email protected]
openalchemist_SOURCES = ../src/Application.cpp ../src/AudioManager.cpp ../src/Board.cpp ../src/CombosPainter.cpp ../src/CommonResources.cpp ../src/DemoPlayer.cpp ../src/FrameRateCounter.cpp ../src/FrontLayer.cpp ../src/GameEngine.cpp ../src/HumanPlayer.cpp ../src/IniFile.cpp ../src/Keys.cpp ../src/LoadingScreen.cpp ../src/Player.cpp ../src/Preferences.cpp ../src/ProgressBar.cpp ../src/Skin.cpp ../src/SkinsManager.cpp ../src/Window.cpp ../src/main.cpp ../src/memory.cpp ../src/misc.cpp ../src/states/CommonState.cpp ../src/states/GameOverState.cpp ../src/states/GameState.cpp ../src/states/InGameState.cpp ../src/states/MenuState.cpp ../src/states/MenuState/BasicItem.cpp ../src/states/MenuState/DualChoiceItem.cpp ../src/states/MenuState/MenuItem.cpp ../src/states/MenuState/MultipleChoicesItem.cpp ../src/states/MenuState/TableChoicesItem.cpp ../src/states/OptionsMenuState.cpp ../src/states/PauseMenuState.cpp ../src/states/QuitMenuState.cpp ../src/states/SkinsMenuState.cpp ../src/states/TitleState.cpp
openalchemist_SOURCES = ../src/Application.cpp ../src/AudioManager.cpp \
../src/Board.cpp ../src/CombosPainter.cpp \
../src/CommonResources.cpp ../src/DemoPlayer.cpp \
../src/FrameRateCounter.cpp ../src/FrontLayer.cpp \
../src/GameEngine.cpp ../src/HumanPlayer.cpp \
../src/IniFile.cpp ../src/Keys.cpp ../src/LoadingScreen.cpp \
../src/Player.cpp ../src/Preferences.cpp \
../src/ProgressBar.cpp ../src/Skin.cpp ../src/SkinsManager.cpp \
../src/Window.cpp ../src/main.cpp ../src/memory.cpp \
../src/misc.cpp ../src/states/CommonState.cpp \
../src/states/GameOverState.cpp ../src/states/GameState.cpp \
../src/states/InGameState.cpp ../src/states/MenuState.cpp \
../src/states/MenuState/BasicItem.cpp \
../src/states/MenuState/BasicTextItem.cpp \
../src/states/MenuState/DualChoiceItem.cpp \
../src/states/MenuState/MenuItem.cpp \
../src/states/MenuState/MultipleChoicesItem.cpp \
../src/states/MenuState/TableChoicesItem.cpp \
../src/states/OptionsMenuState.cpp \
../src/states/PauseMenuState.cpp \
../src/states/QuitMenuState.cpp \
../src/states/SkinsMenuState.cpp ../src/states/TitleState.cpp
AM_CXXFLAGS = `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL1-2.3 clanGL-2.3 clanSWRender-2.3` -DDATA_DIR="\"$(datadir)/\""
AM_LDFLAGS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL1-2.3 clanGL-2.3 clanSWRender-2.3 clanSound-2.3 clanVorbis-2.3`
all: all-am
......@@ -457,6 +480,9 @@ clean-binPROGRAMS:
../src/states/MenuState/BasicItem.$(OBJEXT): \
../src/states/MenuState/$(am__dirstamp) \
../src/states/MenuState/$(DEPDIR)/$(am__dirstamp)
../src/states/MenuState/BasicTextItem.$(OBJEXT): \
../src/states/MenuState/$(am__dirstamp) \
../src/states/MenuState/$(DEPDIR)/$(am__dirstamp)
../src/states/MenuState/DualChoiceItem.$(OBJEXT): \
../src/states/MenuState/$(am__dirstamp) \
../src/states/MenuState/$(DEPDIR)/$(am__dirstamp)
......@@ -527,6 +553,7 @@ distclean-compile:
@[email protected]@[email protected] @[email protected]/src/states/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/MenuState/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/MenuState/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/MenuState/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/MenuState/$(DEPDIR)/[email protected][email protected] # am--include-marker
@[email protected]@[email protected] @[email protected]/src/states/MenuState/$(DEPDIR)/[email protected][email protected] # am--include-marker
......@@ -720,6 +747,7 @@ distclean: distclean-am
-rm -f ../src/states/$(DEPDIR)/SkinsMenuState.Po
-rm -f ../src/states/$(DEPDIR)/TitleState.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/BasicItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/BasicTextItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/DualChoiceItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/MenuItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/MultipleChoicesItem.Po
......@@ -802,6 +830,7 @@ maintainer-clean: maintainer-clean-am
-rm -f ../src/states/$(DEPDIR)/SkinsMenuState.Po
-rm -f ../src/states/$(DEPDIR)/TitleState.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/BasicItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/BasicTextItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/DualChoiceItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/MenuItem.Po
-rm -f ../src/states/MenuState/$(DEPDIR)/MultipleChoicesItem.Po
......
......@@ -14,6 +14,7 @@
#include "../CommonResources.h"
#include "../GameEngine.h"
#include "../Window.h"
#include "../misc.h"
/************************************************************************/
/* State */
......@@ -62,8 +63,12 @@ void MenuState::_set_background_sprite (CL_Sprite& background)
void MenuState::draw (CL_GraphicContext& gc)
{
// Displaying background
int x = 400 - _background.get_width () / 2;
int y = 300 - _background.get_height () / 2;
int x = ((alchemyQuest ? ALCHEMYQUEST_WIDTH : GAME_WIDTH) / 2) - _background.get_width () / 2;
int y = ((alchemyQuest ? ALCHEMYQUEST_HEIGHT : GAME_HEIGHT) / 2) - _background.get_height () / 2;
if (x < 0)
x = 0;
if (y < 0)
y = 0;
_background.draw (gc, x, y);
// Displaying items
......@@ -354,4 +359,40 @@ void MenuState::_disappear ()
void MenuState::_start_disappear ()
{
_state = STATE_DISAPPEARING;
}
\ No newline at end of file
}
MenuItem *MenuState::load_basic_menu_item(CL_GraphicContext& gc, CL_ResourceManager &gfx, const std::string &basename, int x, int y)
{
MenuItem *item;
if (gfx.resource_exists(basename + "text"))
{
BasicTextItem *text_item = new BasicTextItem;
text_item->set_w(CL_Integer_to_int (basename + "width", &gfx));
text_item->set_h(CL_Integer_to_int (basename + "height", &gfx));
text_item->set_locked(CL_Boolean_to_bool (basename + "locked", &gfx));
text_item->set_text(gfx.get_string_resource(basename + "text", ""));
item = text_item;
}
else
{
BasicItem *basic_item = new BasicItem;
if (gfx.resource_exists(basename + "unavailable"))
{
basic_item->set_gfx (gc, gfx,
basename + "unselected",
basename + "selected",
basename + "unavailable");
}
else
{
basic_item->set_gfx (gc, gfx,
basename + "unselected",
basename + "selected");
}
item = basic_item;
}
item->set_x (x + CL_Integer_to_int (basename + "left", &gfx));
item->set_y (y + CL_Integer_to_int (basename + "top", &gfx));
_items.insert (_items.end (), item);
return item;
}
......@@ -66,6 +66,8 @@ public:
/** Set if user can quit the menu or not */
inline void set_quit_enable(bool enable){ _quit_enabled = enable; }
MenuItem *load_basic_menu_item(CL_GraphicContext& gc, CL_ResourceManager &gfx, const std::string &basename, int x, int y);
protected:
......
......@@ -57,9 +57,6 @@ protected:
/** Sprite when the item is locked */
CL_Sprite _locked_sprite;
/** Is the item locked */
bool _is_locked;
};
#endif
\ No newline at end of file
#endif
// **********************************************************************
// OpenAlchemist
// ---------------------
//
// File : BasicTextItem.cpp
// Description :
// Author : Guillaume Delhumeau <[email protected]>
// License : GNU General Public License 2 or higher
//
// **********************************************************************
#include "../../memory.h"
#include "../../CommonResources.h"
#include <iostream>
#include "BasicTextItem.h"
/************************************************************************/
/* Constructor */
/************************************************************************/
BasicTextItem::BasicTextItem()
{
}
/************************************************************************/
/* Destructor */
/************************************************************************/
BasicTextItem::~BasicTextItem()
{
unload_gfx();
}
/************************************************************************/
/* Unload GFX */
/************************************************************************/
void BasicTextItem::unload_gfx()
{
}
/************************************************************************/
/* Draw */
/************************************************************************/
void BasicTextItem::draw(CL_GraphicContext& gc)
{
// Getting resources
static CommonResources* p_resources = common_resources_get_instance();
if (_is_selected)
{
p_resources -> main_font.draw_text(gc, _x, _y + _h, _text, CL_Colorf(250, 151, 55));
}
else if (is_locked())
{
// std::cout << "Locked" << _text << std::endl;
p_resources -> main_font.draw_text(gc, _x, _y + _h, _text, CL_Colorf(115, 115, 115));
}
else
{
p_resources -> main_font.draw_text(gc, _x, _y + _h, _text, CL_Colorf(255, 255, 255));
}
}
/************************************************************************/
/* Action performed */
/************************************************************************/
void BasicTextItem::action_performed(ActionType action_type)
{
}
/************************************************************************/
/* Is inside */
/************************************************************************/
bool BasicTextItem::is_inside(int x, int y)
{
return x >= _x && x <= _x + _w &&
y >= _y && y <= _y + _h;
}
/************************************************************************/
/* Mouse moved */
/************************************************************************/
void BasicTextItem::mouse_moved(int mouse_x, int mouse_y)
{
}
void BasicTextItem::set_w(int w)
{
_w = w;
}
void BasicTextItem::set_h(int h)
{
_h = h;
}
void BasicTextItem::set_text(std::string text)
{
_text = text;
}
// **********************************************************************
// OpenAlchemist
// ---------------------
//
// File : BasicTextItem.h
// Description :
// Author : Guillaume Delhumeau <[email protected]>
// License : GNU General Public License 2 or higher
//
// **********************************************************************
#ifndef _BASIC_TEXT_ITEM_H_
#define _BASIC_TEXT_ITEM_H_
#include <ClanLib/display.h>
#include "MenuItem.h"
/**
* Basic Text Item class
*/
class BasicTextItem : public MenuItem{
public:
/** Constructor */
BasicTextItem();
/** Destructor */
~BasicTextItem();
/** Unload GFX */
void unload_gfx();
virtual void draw(CL_GraphicContext& gc);
virtual void action_performed(ActionType action_type);
virtual void mouse_moved(int mouse_x, int mouse_y);
virtual bool quit_menu_on_action(){ return true; }
virtual bool is_inside(int x, int y);
/** Set width */
void set_w(int w);
/** Set height */
void set_h(int h);
/** Set text */
void set_text(std::string text);
protected:
/** Default sprite */
std::string _text;
/** Item size */
int _w, _h;
};
#endif
......@@ -13,8 +13,8 @@
#include "MenuItem.h"
#include "../../memory.h"
/************************************************************************/
/* Constructor */
/************************************************************************/
/* Constructor */
/************************************************************************/
MenuItem::MenuItem()
{
......@@ -23,6 +23,13 @@ MenuItem::MenuItem()
_alpha = 1.0f;
}
/************************************************************************/
/* Destructor */
/************************************************************************/
MenuItem::~MenuItem()
{
}
/************************************************************************/
/* Set X */
/************************************************************************/
......@@ -61,4 +68,4 @@ void MenuItem::set_selected(bool selected)
void MenuItem::set_locked(bool locked)
{
_is_locked = locked;
}
\ No newline at end of file
}
......@@ -26,6 +26,9 @@ public:
/** Constructor */
MenuItem();
/** Destructor */
virtual ~MenuItem();
/** Draw item */
virtual void draw(CL_GraphicContext& gc) = 0;
......
......@@ -110,8 +110,12 @@ void OptionsMenuState::load_gfx(CL_GraphicContext& gc, std::string skin)
_background = CL_Sprite(gc, "menu_options/dialog_background", &gfx);
int x = 400 - _background.get_width () / 2;
int y = 300 - _background.get_height () / 2;
int x = ((alchemyQuest ? ALCHEMYQUEST_WIDTH : GAME_WIDTH) / 2) - _background.get_width () / 2;
int y = ((alchemyQuest ? ALCHEMYQUEST_HEIGHT : GAME_HEIGHT) / 2) - _background.get_height () / 2;
if (x < 0)
x = 0;
if (y < 0)
y = 0;
_render_item.set_description_sprites(gc, gfx,
"menu_options/render/unselected",
......@@ -422,4 +426,4 @@ void OptionsMenuState::toggle_screen()
{
_fullscreen_item.set_current_choice(ITEM_NO);
}
}
\ No newline at end of file
}
......@@ -51,14 +51,6 @@ PauseMenuState::~PauseMenuState ()
/************************************************************************/
void PauseMenuState::init ()
{
_items.clear();
_items.insert (_items.end (), &_resume_item);
_items.insert (_items.end (), &_undo_item);
_items.insert (_items.end (), &_retry_item);
_items.insert (_items.end (), &_options_item);
_items.insert (_items.end (), &_changeskin_item);
_items.insert (_items.end (), &_giveup_item);
_items.insert (_items.end (), &_quit_item);
}