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

Fixed some stuff causing compiler errors

Browse source
This commit is contained in:
Charles Dang 2018-03-26 17:55:24 +11:00
parent 28c35e71fa
commit 8fc49bdce1
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/editor/palette/empty_palette.hpp
View file

@ -27,9 +27,10 @@ class empty_palette : public common_palette {
public:
empty_palette(display& gui) :
common_palette(gui.video()),
gui_(gui) {}
empty_palette(display& gui)
: common_palette(gui.video())
//, gui_(gui)
{}
//event handling
virtual bool mouse_click() { return false;}
@ -78,7 +79,7 @@ public:
virtual void swap() override {}
private:
display& gui_;
//display& gui_;
};
}

3
src/font/marked-up_text.cpp
View file

@ -77,6 +77,8 @@ bool is_cjk_char(const ucs4::char_t ch)
(ch >= 0xff00 && ch < 0xffef);
}
// Re-enable if we find use for these
#if 0
namespace {
/*
@ -169,5 +171,6 @@ inline bool break_after(const ucs4::char_t ch)
}
} // end of anon namespace
#endif
} // end namespace font

4
src/help/help_topic_generators.hpp
View file

@ -39,12 +39,12 @@ public:
class unit_topic_generator: public topic_generator
{
const unit_type& type_;
//const unit_type& type_;
const std::string variation_;
typedef std::pair< std::string, unsigned > item;
void push_header(std::vector< item > &row, const std::string& name) const;
public:
unit_topic_generator(const unit_type &t, std::string variation="") : type_(t), variation_(variation) {}
unit_topic_generator(const unit_type &/*t*/, std::string variation="") : /*type_(t),*/ variation_(variation) {}
virtual std::string operator()() const;
};