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

bugfix for #22285

Browse source 
I haven't decided what the ideal solution is for this yet, might
want to rearrange the play_controller init sequence. But for now,
if the game display is null and we need to make an animation, we
use the game state as a filter context rather than the display,
which for all intents and purposes in current code with be the
same. This looks to fix the bug.
This commit is contained in:
Chris Beck 2014-07-06 19:32:03 -04:00
parent 7475769627
commit 0ebaae5acf
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/unit_animation.cpp
View file

@ -16,6 +16,7 @@
#include "unit_animation.hpp"
#include "filter_context.hpp"
#include "game_display.hpp"
#include "halo.hpp"
#include "map.hpp"
@ -327,12 +328,18 @@ unit_animation::unit_animation(const config& cfg,const std::string& frame_string
const map_location::DIRECTION d = map_location::parse_direction(*i);
directions_.push_back(d);
}
const filter_context * fc = game_display::get_singleton();
if (!fc) {
fc = resources::filter_con; //!< This is a pointer to the gamestate. Would prefer to tie unit animations only to the display, but for now this is an acceptable fallback. It seems to be relevant because when a second game is created, it seems that the game_display is null at the time that units are being constructed, and hence at the time that this code is running. A different solution might be to delay the team_builder stage 2 call until after the gui is initialized. Note that the current set up could concievably cause problems with the editor, iirc it doesn't initailize a filter context.
assert(fc);
}
BOOST_FOREACH(const config &filter, cfg.child_range("filter")) {
unit_filter_.push_back(unit_filter(vconfig(filter), game_display::get_singleton()));
unit_filter_.push_back(unit_filter(vconfig(filter), fc));
}
BOOST_FOREACH(const config &filter, cfg.child_range("filter_second")) {
secondary_unit_filter_.push_back(unit_filter(vconfig(filter), game_display::get_singleton()));
secondary_unit_filter_.push_back(unit_filter(vconfig(filter), fc));
}
std::vector<std::string> value_str = utils::split(cfg["value"]);