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

Revert "Throw a Lua exception when creating a negative-HP unit in a Lua context"

Browse source 
This reverts commit 258a0e4689.

(cherry-picked from commit 58dca3a884)
This commit is contained in:
Jyrki Vesterinen 2018-05-28 22:12:08 +03:00
parent 7566d1c35c
commit c0a5519a88
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_events/pump.cpp
View file

@ -647,11 +647,6 @@ std::size_t wml_event_pump::wml_tracking()
return impl_->internal_wml_tracking;
}
bool wml_event_pump::running() const
{
return impl_->instance_count > 0u;
}
wml_event_pump::wml_event_pump(manager& man)
: impl_(new pump_impl(man))
{

3
src/game_events/pump.hpp
View file

@ -144,9 +144,6 @@ public:
/** This function can be used to detect when no WML/Lua has been executed. */
std::size_t wml_tracking();
/** Returns true if we're currently executing an event handler. */
bool running() const;
private:
bool filter_event(const event_handler& handler, const queued_event& ev);

14
src/units/unit.cpp
View file

@ -22,15 +22,13 @@
#include "color.hpp"
#include "deprecation.hpp"
#include "display.hpp"
#include "filter_context.hpp"
#include "formatter.hpp"
#include "formula/string_utils.hpp" // for VGETTEXT
#include "game_board.hpp" // for game_board
#include "game_config.hpp" // for add_color_info, etc
#include "game_data.hpp"
#include "game_errors.hpp" // for game_error
#include "game_events/manager.hpp" // for add_events, pump
#include "game_events/pump.hpp" // for running
#include "game_events/manager.hpp" // for add_events
#include "preferences/game.hpp" // for encountered_units
#include "gettext.hpp" // for N_
#include "lexical_cast.hpp"
@ -57,7 +55,6 @@
#include "utils/functional.hpp"
#include <boost/dynamic_bitset.hpp>
#include <boost/function_output_iterator.hpp>
#include "lua/lauxlib.h"
#ifdef _MSC_VER
#pragma warning (push)
@ -635,13 +632,8 @@ void unit::init(const config& cfg, bool use_traits, const vconfig* vcfg)
}
if(const config::attribute_value* v = cfg.get("hitpoints")) {
if(!(*v > 0 || loc_ == dying_unit_loc)) {
if(resources::game_events->pump().running()) {
// This function throws an exception, it doesn't return
luaL_error(resources::filter_con->get_lua_kernel()->get_state(), "Attempted to create a unit with negative HP");
} else {
VALIDATE(false, _("Unit with negative HP found"));
}
if(loc_ != dying_unit_loc) {
VALIDATE(*v > 0, _("Unit with negative HP found"));
}
hit_points_ = *v;
} else {