record and replay mods on startup buttons. fix #394
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <SFML/Window/Event.hpp>
|
||||
#include "location.hpp"
|
||||
#include "dialogxml/keycodes.hpp"
|
||||
|
||||
void init_screen_locs();
|
||||
bool prime_time();
|
||||
@@ -36,7 +37,7 @@ short count_walls(location loc);
|
||||
bool is_sign(ter_num_t ter);
|
||||
bool check_for_interrupt();
|
||||
|
||||
void handle_startup_button_click(eStartButton btn);
|
||||
void handle_startup_button_click(eStartButton btn, eKeyMod mods);
|
||||
void handle_switch_pc(short which_pc, bool& need_redraw, bool& need_reprint);
|
||||
void handle_switch_pc_items(short which_pc, bool& need_redraw);
|
||||
void handle_equip_item(short item_hit, bool& need_redraw);
|
||||
|
@@ -264,8 +264,10 @@ void replay_next_action() {
|
||||
std::string t = next_action.Value();
|
||||
|
||||
if(overall_mode == MODE_STARTUP && t == "startup_button_click"){
|
||||
eStartButton btn = static_cast<eStartButton>(std::stoi(next_action.GetText()));
|
||||
handle_startup_button_click(btn);
|
||||
auto info = info_from_action(next_action);
|
||||
eStartButton btn = static_cast<eStartButton>(std::stoi(info["btn"]));
|
||||
eKeyMod mods = static_cast<eKeyMod>(std::stoi(info["mods"]));
|
||||
handle_startup_button_click(btn, mods);
|
||||
}else if(t == "load_party"){
|
||||
decode_file(next_action.GetText(), tempDir / "temp.exg");
|
||||
load_party(tempDir / "temp.exg", univ);
|
||||
|
@@ -9,6 +9,7 @@ int main(int argc, char* argv[]);
|
||||
void update_everything();
|
||||
void redraw_everything();
|
||||
void Mouse_Pressed(const sf::Event&);
|
||||
eKeyMod current_key_mod();
|
||||
void close_program();
|
||||
void change_cursor(location where_curs);
|
||||
void set_up_apple_events();
|
||||
|
@@ -40,11 +40,19 @@ extern sf::View mainView;
|
||||
|
||||
enum_map(eStartButton, rectangle) startup_button;
|
||||
|
||||
void handle_startup_button_click(eStartButton btn) {
|
||||
void handle_startup_button_click(eStartButton btn, eKeyMod mods) {
|
||||
if(recording){
|
||||
std::map<std::string, std::string> info;
|
||||
|
||||
std::ostringstream sstr;
|
||||
sstr << btn;
|
||||
record_action("startup_button_click", sstr.str());
|
||||
info["btn"] = sstr.str();
|
||||
|
||||
sstr.str("");
|
||||
sstr << mods;
|
||||
info["mods"] = sstr.str();
|
||||
|
||||
record_action("startup_button_click", info);
|
||||
}
|
||||
|
||||
std::string scen_name;
|
||||
@@ -78,7 +86,7 @@ void handle_startup_button_click(eStartButton btn) {
|
||||
|
||||
case STARTBTN_JOIN:
|
||||
if(!party_in_memory) {
|
||||
if(kb.isAltPressed()) {
|
||||
if(mod_contains(mods, mod_alt)) {
|
||||
force_party = true;
|
||||
start_new_game(true);
|
||||
} else {
|
||||
@@ -114,7 +122,7 @@ bool handle_startup_press(location the_point) {
|
||||
for(auto btn : startup_button.keys()) {
|
||||
if(btn == eStartButton::STARTBTN_SCROLL) continue;
|
||||
if(the_point.in(startup_button[btn])) {
|
||||
handle_startup_button_click(btn);
|
||||
handle_startup_button_click(btn, current_key_mod());
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user