Fix all the compile warnings that occur on Mac.
(Except the OpenGL deprecation warning and some warnings coming from Boost.Process.)
This commit is contained in:
@@ -1793,7 +1793,7 @@ void handle_keystroke(sf::Event event) {
|
||||
mouse_button_held = false;
|
||||
}
|
||||
|
||||
bool handle_outdoor_sec_shift(int dx, int dy){
|
||||
static bool handle_outdoor_sec_shift(int dx, int dy){
|
||||
if(editing_town) return false;
|
||||
int new_x = cur_out.x + dx;
|
||||
int new_y = cur_out.y + dy;
|
||||
|
@@ -257,13 +257,6 @@ bool pick_string(std::string from_file, cDialog& parent, std::string result_fld,
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool show_help(std::string from_file, cDialog& parent, pic_num_t pic){
|
||||
StringList strings = *ResMgr::strings.get(from_file);
|
||||
cThreeChoice help(strings,basic_buttons[1],pic,PIC_DLOG,&parent);
|
||||
help.show();
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool pick_ter_flag(cDialog& me, std::string id, eKeyMod) {
|
||||
if(id == "editspec") {
|
||||
int which_type = me["flag2"].getTextAsNum();
|
||||
|
@@ -1310,6 +1310,7 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
|
||||
case eSpecPicker::EVENT: store = choose_text_editable(scenario.evt_names, val, &me, "Select an event:"); break;
|
||||
case eSpecPicker::ITEM_CLASS: store = choose_text_editable(scenario.ic_names, val, &me, "Select item class:"); break;
|
||||
case eSpecPicker::JOB_BOARD: store = choose_text_editable(scenario.qb_names, val, &me, "Select a job board:"); break;
|
||||
case eSpecPicker::POINTER: store = val; break; // TODO: Not implemented...
|
||||
case eSpecPicker::NONE: return false;
|
||||
}
|
||||
me[field].setTextToNum(store);
|
||||
@@ -1376,7 +1377,7 @@ bool edit_spec_enc(short which_node,short mode,cDialog* parent) {
|
||||
"sdf1", "sdf2",
|
||||
});
|
||||
special["cancel"].attachClickHandler(std::bind(discard_spec_enc, _1, std::ref(edit_stack)));
|
||||
special["node-help"].attachClickHandler([&edit_stack](cDialog& me, std::string item_hit, eKeyMod mods) {
|
||||
special["node-help"].attachClickHandler([&edit_stack](cDialog& me, std::string, eKeyMod) {
|
||||
eSpecType type = edit_stack.top().node.type;
|
||||
const std::string& str = (*type).descr();
|
||||
// TODO: This is the same dialog as give_help(), the only difference being that we don't have a string number!
|
||||
|
@@ -430,7 +430,7 @@ void redraw_everything() {
|
||||
restore_cursor();
|
||||
}
|
||||
|
||||
void show_outdated_warning() {
|
||||
static void show_outdated_warning() {
|
||||
std::string outdated_help1 = "The information in the following help window is extremely outdated! The most up-to-date documentation for OpenBoE is here:";
|
||||
std::string outdated_help2 = "https://openboe.com/docs";
|
||||
|
||||
|
Reference in New Issue
Block a user