openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Now you can hold Alt while starting a scenario to skip party creation

Browse Source 
(Only if party not loaded)
This commit is contained in:
Celtic Minstrel
2015-06-30 12:49:01 -04:00
parent cea602ce6d
commit 5a3637c370
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/boe.startup.cpp
View File

@@ -34,8 +34,10 @@ rectangle startup_button[6];
// TODO: Always returns false, so make it void
bool handle_startup_press(location the_point) {
using kb = sf::Keyboard;
std::string scen_name;
short i,scen;
bool force_party = false;
the_point.x -= ul.x;
the_point.y -= ul.y;
@@ -68,12 +70,20 @@ bool handle_startup_press(location the_point) {
case STARTBTN_JOIN: // regular scen
if(!party_in_memory) {
cChoiceDlog("need-party").show();
break;
if(kb::isKeyPressed(kb::LAlt) || kb::isKeyPressed(kb::RAlt)) {
force_party = true;
start_new_game(true);
} else {
cChoiceDlog("need-party").show();
break;
}
}
scen = pick_prefab_scen();
if(scen < 0)
if(scen < 0) {
if(force_party)
party_in_memory = false;
break;
}
switch(scen) {
case 0: scen_name = "valleydy.exs"; break;
@@ -83,22 +93,37 @@ bool handle_startup_press(location the_point) {
//case 3: sprintf(univ.party.scen_name,"busywork.exs"); break;
}
put_party_in_scen(scen_name);
if(force_party && scen_name != univ.party.scen_name)
party_in_memory = false;
break;
case STARTBTN_CUSTOM: // custom
if(!party_in_memory) {
cChoiceDlog("need-party").show();
break;
if(kb::isKeyPressed(kb::LAlt) || kb::isKeyPressed(kb::RAlt)) {
force_party = true;
start_new_game(true);
} else {
cChoiceDlog("need-party").show();
break;
}
}
scen = pick_a_scen();
if(scen < 0) break;
if(scen < 0) {
if(force_party)
party_in_memory = false;
break;
}
if(scen_headers[scen].prog_make_ver[0] > 2 || scen_headers[scen].prog_make_ver[1] > 0) {
if(force_party)
party_in_memory = false;
cChoiceDlog("scen-version-mismatch").show();
break;
}
scen_name = scen_headers[scen].file;
put_party_in_scen(scen_name);
if(force_party && scen_name != univ.party.scen_name)
party_in_memory = false;
break;
}
}