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

fixed segfault

Browse source
This commit is contained in:
Dave White 2004-06-14 21:52:33 +00:00
parent b85b19c55f
commit 49ebaf8886
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dialogs.cpp
View file

@ -17,6 +17,7 @@
#include "game_config.hpp"
#include "language.hpp"
#include "log.hpp"
#include "playturn.hpp"
#include "preferences.hpp"
#include "replay.hpp"
#include "show_dialog.hpp"
@ -81,6 +82,8 @@ void advance_unit(const game_data& info,
bool animate_unit_advancement(const game_data& info,unit_map& units, gamemap::location loc, display& gui, size_t choice)
{
const command_disabler cmd_disabler(&gui);
std::map<gamemap::location,unit>::iterator u = units.find(loc);
if(u == units.end() || u->second.advances() == false) {
return false;

2
src/widgets/menu.cpp
View file

@ -769,7 +769,7 @@ void menu::process_help_string(int mousex, int mousey)
if(size_t(loc.first) < help_.size()) {
const std::vector<std::string>& row = help_[loc.first];
if(size_t(loc.second) < help_.size()) {
if(size_t(loc.second) < row.size()) {
const std::string& help = row[loc.second];
if(help.empty() == false) {
std::cerr << "setting help string from menu to '" << help << "'\n";