mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-10 23:36:24 +00:00
g++ 4.0 warning fixes
This commit is contained in:
parent
ee31b48755
commit
9a2db20534
@ -1288,6 +1288,10 @@ namespace events{
|
|||||||
gui_->add_chat_message(speaker,side,message,type);
|
gui_->add_chat_message(speaker,side,message,type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
chat_handler::~chat_handler()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void chat_handler::do_speak(const std::string& message, bool allies_only)
|
void chat_handler::do_speak(const std::string& message, bool allies_only)
|
||||||
{
|
{
|
||||||
if(message == "") {
|
if(message == "") {
|
||||||
|
@ -31,6 +31,7 @@ namespace events{
|
|||||||
class chat_handler {
|
class chat_handler {
|
||||||
public:
|
public:
|
||||||
chat_handler() {}
|
chat_handler() {}
|
||||||
|
virtual ~chat_handler();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void do_speak(const std::string& message, bool allies_only=false);
|
void do_speak(const std::string& message, bool allies_only=false);
|
||||||
@ -38,7 +39,7 @@ protected:
|
|||||||
//called from do_speak
|
//called from do_speak
|
||||||
virtual void add_chat_message(const std::string& speaker, int side, const std::string& message, display::MESSAGE_TYPE type=display::MESSAGE_PRIVATE)=0;
|
virtual void add_chat_message(const std::string& speaker, int side, const std::string& message, display::MESSAGE_TYPE type=display::MESSAGE_PRIVATE)=0;
|
||||||
virtual void send_chat_message(const std::string& message, bool allies_only=false)=0;
|
virtual void send_chat_message(const std::string& message, bool allies_only=false)=0;
|
||||||
virtual void send_chat_query(const std::string& args) {}
|
virtual void send_chat_query(const std::string& /*args*/) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
class menu_handler : private chat_handler {
|
class menu_handler : private chat_handler {
|
||||||
@ -47,6 +48,7 @@ public:
|
|||||||
const config& level, const game_data& gameinfo, const gamemap& map,
|
const config& level, const game_data& gameinfo, const gamemap& map,
|
||||||
const config& game_config, const gamestatus& status, game_state& gamestate,
|
const config& game_config, const gamestatus& status, game_state& gamestate,
|
||||||
undo_list& undo_stack, undo_list& redo_stack);
|
undo_list& undo_stack, undo_list& redo_stack);
|
||||||
|
virtual ~menu_handler();
|
||||||
|
|
||||||
const undo_list& get_undo_list() const;
|
const undo_list& get_undo_list() const;
|
||||||
gui::floating_textbox& get_textbox();
|
gui::floating_textbox& get_textbox();
|
||||||
|
@ -189,4 +189,4 @@ private:
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif(
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user