0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert load_game_exception.

Browse source 
Changed from a sticky to a jailbreak exception.
This commit is contained in:
Mark de Wever 2011-03-27 20:55:26 +00:00
parent 2b2ab9d61e
commit 813621bb5a
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/exceptions.cpp
View file

@ -23,7 +23,6 @@ char const *game::exception::sticky;
void game::exception::rethrow()
{
if (!sticky) return;
if (strcmp(sticky, "load game") == 0) throw game::load_game_exception();
if (strcmp(sticky, "end level") == 0) throw end_level_exception(QUIT);
throw game::exception("Unknown exception", "unknown");
}

20
src/game_errors.hpp
View file

@ -17,6 +17,7 @@
#define GAME_ERRORS_HPP_INCLUDED
#include "exceptions.hpp"
#include "lua_jailbreak_exception.hpp"
namespace game {
@ -51,15 +52,21 @@ struct game_error : public error {
* Exception used to signal that the user has decided to abort a game,
* and to load another game instead.
*/
struct load_game_exception : exception
class load_game_exception
: public tlua_jailbreak_exception
{
public:
load_game_exception()
: exception("Abort the current game and load a new one", "load game")
: tlua_jailbreak_exception()
{
}
load_game_exception(const std::string &game_, bool show_replay_, bool cancel_orders_)
: exception("Abort the current game and load a new one", "load game")
load_game_exception(
const std::string& game_
, const bool show_replay_
, const bool cancel_orders_)
: tlua_jailbreak_exception()
{
game = game_;
show_replay = show_replay_;
@ -69,7 +76,12 @@ struct load_game_exception : exception
static std::string game;
static bool show_replay;
static bool cancel_orders;
private:
IMPLEMENT_LUA_JAILBREAK_EXCEPTION(load_game_exception)
};
}
#endif