Skip to content

Commit

Permalink
Better variable name for selected option
Browse files Browse the repository at this point in the history
  • Loading branch information
kazzmir committed Aug 22, 2006
1 parent 5a8ff86 commit d11a9da
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/raptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,24 +402,24 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){
RMenu * temp = current;
current->init();

int g = -1;
while ( g != INIT_QUIT && g != INIT_CONTINUE && g != INIT_PLAY ) {
int option = -1;
while ( option != INIT_QUIT && option != INIT_CONTINUE && option != INIT_PLAY ) {
Util::YIELD();
// al_poll_duh( dumb_player );
/*
dumb_player->play();
*/

temp = current;
g = current->procMenu( &current );
if ( !temp->Selected() ) g = -1;
option = current->procMenu( &current );
if ( !temp->Selected() ) option = -1;

bool changed_frames = false;
bool changed_sound = false;
bool changed_music = false;

if ( g > INIT_LOAD && g <= INIT_LOAD+6 ){
int load = g - INIT_LOAD;
if ( option > INIT_LOAD && option <= INIT_LOAD+6 ){
int load = option - INIT_LOAD;

// printf("Loading %d\n", load );
*player = loadPlayer( load );
Expand All @@ -430,10 +430,10 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){
snprintf( tmp, 64, "Error loading slot %d", load );
popUp( tmp );

} else g = INIT_CONTINUE;
} else option = INIT_CONTINUE;
}

switch ( g ) {
switch ( option ) {
case INC_RATE : {
frames++;
changed_frames = true;
Expand Down Expand Up @@ -578,7 +578,7 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){

}

if ( g == INIT_PLAY ) {
if ( option == INIT_PLAY ) {

if ( *player != NULL )
delete *player;
Expand Down Expand Up @@ -633,7 +633,7 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){

Configuration::saveConfiguration();

return g;
return option;
}

void usage(){
Expand Down

0 comments on commit d11a9da

Please sign in to comment.