From d107fd9750db55dd8f4e6ac501cff4e3bcc522d0 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Mon, 26 Jan 2015 12:13:03 -0500 Subject: [PATCH] Fix indentation --- src/boe.actions.cpp | 39 +++++++++++--------- src/boe.dlgutil.cpp | 88 ++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 61 deletions(-) diff --git a/src/boe.actions.cpp b/src/boe.actions.cpp index 310ef23c8..994e49609 100644 --- a/src/boe.actions.cpp +++ b/src/boe.actions.cpp @@ -2081,24 +2081,26 @@ bool handle_keystroke(sf::Event& event){ case 'P': spell_forced = true; j = 1; break; case 'p': j = 1; break; case 'l': j = 2; break; - case 'r': if(overall_mode != MODE_OUTDOORS) return false; + case 'r': + if(overall_mode != MODE_OUTDOORS) return false; j = 3; break; - case 't': if(overall_mode == MODE_TOWN) - j = 3; + case 't': + if(overall_mode == MODE_TOWN) + j = 3; else return false; break; - case 'A':if(overall_mode == MODE_TOWN) { - pass_point.x = 1000 + ul.x; - pass_event.mouseButton.x = pass_point.x; - pass_event.mouseButton.y = pass_point.y; - are_done = handle_action(pass_event); - } - else { - add_string_to_buf("Alchemy: In town only."); - print_buf(); - return false; - } + case 'A': + if(overall_mode == MODE_TOWN) { + pass_point.x = 1000 + ul.x; + pass_event.mouseButton.x = pass_point.x; + pass_event.mouseButton.y = pass_point.y; + are_done = handle_action(pass_event); + } else { + add_string_to_buf("Alchemy: In town only."); + print_buf(); + return false; + } break; case 'w': if(overall_mode == MODE_COMBAT) @@ -2115,13 +2117,16 @@ bool handle_keystroke(sf::Event& event){ return false; } break; - case 'd': if(overall_mode != MODE_COMBAT) return false; + case 'd': + if(overall_mode != MODE_COMBAT) return false; j = 3; break; - case 'g': if(overall_mode == MODE_OUTDOORS) return false; + case 'g': + if(overall_mode == MODE_OUTDOORS) return false; j = 4; break; - case 'f': if(overall_mode != MODE_TOWN) return false; + case 'f': + if(overall_mode != MODE_TOWN) return false; j = 6; break; } diff --git a/src/boe.dlgutil.cpp b/src/boe.dlgutil.cpp index 054cc0b98..742713bb5 100644 --- a/src/boe.dlgutil.cpp +++ b/src/boe.dlgutil.cpp @@ -1007,51 +1007,51 @@ static bool prefs_event_filter (cDialog& me, std::string id, eKeyMod) { did_cancel = true; } - if(!did_cancel) { - std::string cur_display_mode = dynamic_cast(me["display"]).getSelected(); - // TODO: Make an enum for the display mode - if(cur_display_mode == "mid") display_mode = 0; - else if(cur_display_mode == "tl") display_mode = 1; - else if(cur_display_mode == "tr") display_mode = 2; - else if(cur_display_mode == "bl") display_mode = 3; - else if(cur_display_mode == "br") display_mode = 4; - else if(cur_display_mode == "win") display_mode = 5; - PSD[SDF_NO_MAPS] = dynamic_cast(me["nomaps"]).getState() != led_off; - PSD[SDF_NO_SOUNDS] = dynamic_cast(me["nosound"]).getState() != led_off; - play_sounds = !PSD[SDF_NO_SOUNDS]; - PSD[SDF_NO_FRILLS] = dynamic_cast(me["nofrills"]).getState() != led_off; - PSD[SDF_ROOM_DESCS_AGAIN] = dynamic_cast(me["repeatdesc"]).getState() != led_off; - PSD[SDF_NO_INSTANT_HELP] = dynamic_cast(me["nohelp"]).getState() != led_off; - PSD[SDF_EASY_MODE] = dynamic_cast(me["easier"]).getState() != led_off; - PSD[SDF_LESS_WANDER_ENC] = dynamic_cast(me["lesswm"]).getState() != led_off; - PSD[SDF_NO_TER_ANIM] = dynamic_cast(me["noanim"]).getState() != led_off; - PSD[SDF_NO_SHORE_FRILLS] = dynamic_cast(me["noshore"]).getState() != led_off; - show_startup_splash = dynamic_cast(me["skipsplash"]).getState() == led_off; - std::string speed = dynamic_cast(me["speed"]).getSelected(); - /* TODO: Should I add these additional preferences from Windows? - party.stuff_done[SDF_NO_TARGET_LINE] = cd_get_led(1099,50); - party.stuff_done[SDF_LESS_SOUND] = cd_get_led(1099,52); - party.stuff_done[SDF_FASTER_BOOM_SPACES] = cd_get_led(1099,56); - party.stuff_done[SDF_ASK_ABOUT_TEXT_BOX] = cd_get_led(1099,60); - */ - // TODO: NO_SOUNDS and NO_MAPS preferences are stored in two different places - if(speed == "fast") - PSD[SDF_GAME_SPEED] = 0; - else if(speed == "med") - PSD[SDF_GAME_SPEED] = 1; - else if(speed == "slow") - PSD[SDF_GAME_SPEED] = 2; - else if(speed == "snail") - PSD[SDF_GAME_SPEED] = 3; - if(dynamic_cast(me["resethelp"]).getState() == led_red) { - for(i = 0; i < 120; i++) - univ.party.help_received[i] = 0; - reset_help = true; - } + if(!did_cancel) { + std::string cur_display_mode = dynamic_cast(me["display"]).getSelected(); + // TODO: Make an enum for the display mode + if(cur_display_mode == "mid") display_mode = 0; + else if(cur_display_mode == "tl") display_mode = 1; + else if(cur_display_mode == "tr") display_mode = 2; + else if(cur_display_mode == "bl") display_mode = 3; + else if(cur_display_mode == "br") display_mode = 4; + else if(cur_display_mode == "win") display_mode = 5; + PSD[SDF_NO_MAPS] = dynamic_cast(me["nomaps"]).getState() != led_off; + PSD[SDF_NO_SOUNDS] = dynamic_cast(me["nosound"]).getState() != led_off; + play_sounds = !PSD[SDF_NO_SOUNDS]; + PSD[SDF_NO_FRILLS] = dynamic_cast(me["nofrills"]).getState() != led_off; + PSD[SDF_ROOM_DESCS_AGAIN] = dynamic_cast(me["repeatdesc"]).getState() != led_off; + PSD[SDF_NO_INSTANT_HELP] = dynamic_cast(me["nohelp"]).getState() != led_off; + PSD[SDF_EASY_MODE] = dynamic_cast(me["easier"]).getState() != led_off; + PSD[SDF_LESS_WANDER_ENC] = dynamic_cast(me["lesswm"]).getState() != led_off; + PSD[SDF_NO_TER_ANIM] = dynamic_cast(me["noanim"]).getState() != led_off; + PSD[SDF_NO_SHORE_FRILLS] = dynamic_cast(me["noshore"]).getState() != led_off; + show_startup_splash = dynamic_cast(me["skipsplash"]).getState() == led_off; + std::string speed = dynamic_cast(me["speed"]).getSelected(); + /* TODO: Should I add these additional preferences from Windows? + party.stuff_done[SDF_NO_TARGET_LINE] = cd_get_led(1099,50); + party.stuff_done[SDF_LESS_SOUND] = cd_get_led(1099,52); + party.stuff_done[SDF_FASTER_BOOM_SPACES] = cd_get_led(1099,56); + party.stuff_done[SDF_ASK_ABOUT_TEXT_BOX] = cd_get_led(1099,60); + */ + // TODO: NO_SOUNDS and NO_MAPS preferences are stored in two different places + if(speed == "fast") + PSD[SDF_GAME_SPEED] = 0; + else if(speed == "med") + PSD[SDF_GAME_SPEED] = 1; + else if(speed == "slow") + PSD[SDF_GAME_SPEED] = 2; + else if(speed == "snail") + PSD[SDF_GAME_SPEED] = 3; + if(dynamic_cast(me["resethelp"]).getState() == led_red) { + for(i = 0; i < 120; i++) + univ.party.help_received[i] = 0; + reset_help = true; } - save_maps = 1 - PSD[SDF_NO_MAPS]; - give_delays = PSD[SDF_NO_FRILLS]; - save_prefs(reset_help); + } + save_maps = 1 - PSD[SDF_NO_MAPS]; + give_delays = PSD[SDF_NO_FRILLS]; + save_prefs(reset_help); return true; }