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

Reduce scope of variable in startup

Browse Source
This commit is contained in:
Celtic Minstrel
2016-08-21 16:26:52 -04:00
parent e9bf63afc7
commit dbb58a6f10
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/boe.startup.cpp
View File

@@ -38,7 +38,6 @@ rectangle startup_button[6];
bool handle_startup_press(location the_point) {
using kb = sf::Keyboard;
std::string scen_name;
short scen;
bool force_party = false;
the_point.x -= ul.x;
@@ -78,19 +77,16 @@ bool handle_startup_press(location the_point) {
break;
}
}
scen = pick_prefab_scen();
if(scen < 0) {
if(force_party)
party_in_memory = false;
break;
}
switch(scen) {
switch(pick_prefab_scen()) {
case 0: scen_name = "valleydy.exs"; break;
// if not reg, rub out
case 1: scen_name = "stealth.exs"; break;
case 2: scen_name = "zakhazi.exs"; break;
//case 3: sprintf(univ.party.scen_name,"busywork.exs"); break;
default:
if(force_party) party_in_memory = false;
break;
}
put_party_in_scen(scen_name);
if(force_party && scen_name != univ.party.scen_name)
@@ -108,7 +104,7 @@ bool handle_startup_press(location the_point) {
}
}
scen = pick_a_scen();
int scen = pick_a_scen();
if(scen < 0) {
if(force_party)
party_in_memory = false;