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

cleaned up delaying end_level_exception

Browse source 
Fixed replay to delay end_level also
This commit is contained in:
Pauli Nieminen 2008-01-12 14:21:58 +00:00
parent 2386b4c3ee
commit 4669787259
3 changed files with 37 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/actions.cpp
View file

@ -752,18 +752,9 @@ void attack::fire_event(const std::string& n)
std::pair<std::string,t_string> to_insert("weapon", d_weap);
tempcfg->values.insert(to_insert);
}
try {
game_events::fire(n,
DELAY_END_LEVEL(delayed_exception, game_events::fire(n,
game_events::entity_location(a_),
game_events::entity_location(d_), dat);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
game_events::entity_location(d_), dat));
a_ = units_.find(attacker_);
d_ = units_.find(defender_);
return;
@ -775,16 +766,8 @@ void attack::fire_event(const std::string& n)
dat.add_child("second");
(*(dat.child("first")))["weapon"]=a_stats_->weapon->id();
(*(dat.child("second")))["weapon"]=d_stats_->weapon != NULL ? d_stats_->weapon->id() : "none";
try {
game_events::fire(n,attacker_,defender_,dat);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
DELAY_END_LEVEL(delayed_exception, game_events::fire(n,attacker_,defender_,dat));
// The event could have killed either the attacker or
// defender, so we have to make sure they still exist
a_ = units_.find(attacker_);
@ -1070,16 +1053,7 @@ attack::attack(game_display& gui, const gamemap& map,
std::string undead_variation = d_->second.undead_variation();
const int defender_side = d_->second.side();
fire_event("attack_end");
try {
game_events::fire("last breath", death_loc, attacker_loc);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
DELAY_END_LEVEL(delayed_exception, game_events::fire("last breath", death_loc, attacker_loc));
d_ = units_.find(death_loc);
a_ = units_.find(attacker_loc);
@ -1104,16 +1078,7 @@ attack::attack(game_display& gui, const gamemap& map,
unit_display::unit_die(d_->first, d_->second,a_stats_->weapon,d_stats_->weapon, &(a_->second));
}
try {
game_events::fire("die",death_loc,attacker_loc);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
DELAY_END_LEVEL(delayed_exception, game_events::fire("die",death_loc,attacker_loc));
d_ = units_.find(death_loc);
a_ = units_.find(attacker_loc);
@ -1185,16 +1150,7 @@ attack::attack(game_display& gui, const gamemap& map,
d_->second.set_state("stoned","yes");
n_defends_ = 0;
n_attacks_ = 0;
try {
game_events::fire(stone_string,d_->first,a_->first);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
DELAY_END_LEVEL(delayed_exception, game_events::fire(stone_string,d_->first,a_->first));
}
}
@ -1349,16 +1305,7 @@ attack::attack(game_display& gui, const gamemap& map,
game_events::entity_location defender_loc(d_);
const int attacker_side = a_->second.side();
fire_event("attack_end");
try {
game_events::fire("die",death_loc,defender_loc);
}
catch(end_level_exception &e)
{
if(delayed_exception == 0)
{
delayed_exception = new end_level_exception(e);
}
}
DELAY_END_LEVEL(delayed_exception, game_events::fire("die",death_loc,defender_loc));
refresh_bc();
@ -1424,7 +1371,8 @@ attack::attack(game_display& gui, const gamemap& map,
a_->second.set_state("stoned","yes");
n_defends_ = 0;
n_attacks_ = 0;
game_events::fire(stone_string,a_->first,d_->first);
DELAY_END_LEVEL(delayed_exception, game_events::fire(stone_string,a_->first,d_->first));
}
}
@ -1466,11 +1414,8 @@ attack::attack(game_display& gui, const gamemap& map,
if(OOS_error_) {
replay::throw_error(errbuf_.str());
}
if (delayed_exception != 0)
{
throw end_level_exception(*delayed_exception);
}
THROW_END_LEVEL(delayed_exception);
}

18
src/menu_events.hpp
View file

@ -30,6 +30,24 @@ class gamestatus;
enum LEVEL_RESULT { VICTORY, DEFEAT, QUIT, LEVEL_CONTINUE, LEVEL_CONTINUE_NO_SAVE, OBSERVER_END, SKIP_TO_LINGER };
#define DELAY_END_LEVEL(end_ptr, code) try { \
code; \
} catch ( end_level_exception &e) { \
if (end_ptr == 0) { \
end_ptr = new end_level_exception(e); \
} \
}
#define THROW_END_LEVEL_DELETE(end_ptr) if (end_ptr) {\
end_level_exception temp_exception(*end_ptr);\
delete end_ptr; \
throw temp_exception; \
}
#define THROW_END_LEVEL(end_ptr) if (end_ptr) {\
throw end_level_exception(*end_ptr); \
}
struct end_level_exception {
end_level_exception(LEVEL_RESULT res, const int percentage = -1,
const bool add = false, const bool bonus=true) :

9
src/replay.cpp
View file

@ -24,6 +24,7 @@
#include "game_events.hpp"
#include "log.hpp"
#include "map_label.hpp"
#include "menu_events.hpp"
#include "pathfind.hpp"
#include "replay.hpp"
#include "show_dialog.hpp"
@ -726,6 +727,8 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
//a list of units that have promoted from the last attack
std::deque<gamemap::location> advancing_units;
end_level_exception* delayed_exception = 0;
team& current_team = teams[team_num-1];
for(;;) {
@ -777,6 +780,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
//if there is nothing more in the records
if(cfg == NULL) {
//replayer.set_skip(false);
THROW_END_LEVEL_DELETE(delayed_exception);
return false;
}
@ -785,6 +789,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
&& cfg->child(do_untill) != NULL)
{
get_replay_source().revert_action();
THROW_END_LEVEL_DELETE(delayed_exception);
return false;
}
@ -853,6 +858,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
verify_units(*child);
}
THROW_END_LEVEL_DELETE(delayed_exception);
return true;
}
@ -1115,9 +1121,8 @@ bool do_replay_handle(game_display& disp, const gamemap& map, const game_data& g
replay::throw_error("illegal defender weapon type in attack\n");
}
//! FIXME: TODO make this handle end_level_exception
attack(disp, map, teams, src, dst, weapon_num, def_weapon_num, units, state, gameinfo, !get_replay_source().is_skipping());
DELAY_END_LEVEL(delayed_exception, attack(disp, map, teams, src, dst, weapon_num, def_weapon_num, units, state, gameinfo, !get_replay_source().is_skipping()));
u = units.find(src);
tgt = units.find(dst);