zv0n/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TETRIS: Code cleanup

Browse Source
This commit is contained in:
zvon
2020-09-13 14:14:39 +02:00
parent 896b5d131f
commit 96c54454f7
6 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tetris/scenes.cpp
+22 -14
View File
@@ -269,7 +269,6 @@ std::shared_ptr<SDLPP::Scene> prepareOptionsScene(std::shared_ptr<SDLPP::Rendere
void handleKeyDownMain( SDL_Keycode key, SDLPP::Scene &scene ) {
switch ( key ) {
case SDLK_ESCAPE:
g_pause = PAUSE_PAUSE;
g_menu_scene->updateSizeAndPosition();
g_active_scenes.push_back( g_menu_scene );
g_input_functions.push_back(menuSceneInput);
@@ -281,7 +280,8 @@ void handleKeyDownMain( SDL_Keycode key, SDLPP::Scene &scene ) {
g_cur_object->movePiece(-BLOCK_SIZE, 0);
if(!validPos(scene, g_cur_object))
g_cur_object->movePiece(BLOCK_SIZE, 0);
updateShadow(scene);
else
updateShadow(scene);
g_ticks_till_movement = 2*TICKS_TILL_MOVE;
g_cur_object->startMovement();
@@ -294,7 +294,8 @@ void handleKeyDownMain( SDL_Keycode key, SDLPP::Scene &scene ) {
g_cur_object->movePiece(BLOCK_SIZE, 0);
if(!validPos(scene, g_cur_object))
g_cur_object->movePiece(-BLOCK_SIZE, 0);
updateShadow(scene);
else
updateShadow(scene);
g_ticks_till_movement = 2*TICKS_TILL_MOVE;
g_cur_object->startMovement();
@@ -304,6 +305,7 @@ void handleKeyDownMain( SDL_Keycode key, SDLPP::Scene &scene ) {
case SDLK_s:
if(!g_cur_object)
break;
g_ticks_till_descend = 0;
g_cur_object->startDescend();
g_cur_object->addMovement(0,1);
break;
@@ -321,9 +323,11 @@ void handleKeyDownMain( SDL_Keycode key, SDLPP::Scene &scene ) {
break;
g_cur_object->setPos(g_cur_shadow->getPos());
break;
#ifdef DEBUG
case SDLK_r:
scene.getRenderer().setRenderColiders(
!scene.getRenderer().getRenderColiders() );
#endif
default:
break;
}
@@ -338,7 +342,6 @@ void handleKeyUpMain( SDL_Keycode key ) {
if(g_cur_object->isDescending()) {
g_cur_object->stopDescend();
g_cur_object->addMovement(0,-1);
g_ticks_till_descend = TICKS_TILL_DESCEND;
}
break;
case SDLK_LEFT:
@@ -348,8 +351,6 @@ void handleKeyUpMain( SDL_Keycode key ) {
if(g_cur_object->isMoving()) {
g_cur_object->stopMovement();
g_cur_object->addMovement(1,0);
if(g_cur_object->isMoving())
g_ticks_till_movement = TICKS_TILL_MOVE;
}
break;
case SDLK_RIGHT:
@@ -359,8 +360,6 @@ void handleKeyUpMain( SDL_Keycode key ) {
if(g_cur_object->isMoving()) {
g_cur_object->stopDescend();
g_cur_object->addMovement(-1,0);
if(g_cur_object->isMoving())
g_ticks_till_movement = TICKS_TILL_MOVE;
}
default:
break;
@@ -429,15 +428,16 @@ void mainSceneInput( std::shared_ptr< SDLPP::Scene > scene, int base, std::vecto
void handleKeyDownMenu( SDL_Keycode key ) {
switch ( key ) {
case SDLK_ESCAPE: {
g_pause = 0;
g_main_scene->setPrevTicks( SDL_GetTicks() );
g_active_scenes.pop_back();
g_input_functions.pop_back();
} break;
#ifdef DEBUG
case SDLK_r:
g_main_scene->getRenderer().setRenderColiders(
!g_main_scene->getRenderer().getRenderColiders() );
break;
#endif
case SDLK_s:
case SDLK_DOWN:
g_menu_options[g_menu_select]->unsetColor();
@@ -455,15 +455,14 @@ void handleKeyDownMenu( SDL_Keycode key ) {
g_menu_options[g_menu_select]->setColor( colors["menu_item_background"] );
break;
case SDLK_RETURN:
// TODO maybe define macros for these
switch ( g_menu_select ) {
case 0: {
g_pause = 0;
g_main_scene->setPrevTicks( SDL_GetTicks() );
g_active_scenes.pop_back();
g_input_functions.pop_back();
} break;
case 1:
g_pause = PAUSE_PAUSE;
g_options_scene->updateSizeAndPosition();
g_active_scenes.push_back(g_options_scene);
g_input_functions.push_back(optionsSceneInput);
@@ -509,10 +508,12 @@ void menuSceneInput( std::shared_ptr< SDLPP::Scene > /*UNUSED*/, int /*UNUSED*/,
void handleKeyDownGameOver( SDL_Keycode key ) {
switch ( key ) {
#ifdef DEBUG
case SDLK_r:
g_main_scene->getRenderer().setRenderColiders(
!g_main_scene->getRenderer().getRenderColiders() );
break;
#endif
case SDLK_s:
case SDLK_DOWN:
g_game_over_options[g_game_over_select]->unsetColor();
@@ -530,6 +531,7 @@ void handleKeyDownGameOver( SDL_Keycode key ) {
g_game_over_options[g_game_over_select]->setColor( colors["menu_item_background"] );
break;
case SDLK_RETURN:
//TODO maybe define macros for these
switch ( g_game_over_select ) {
case 0:
resetGame();
@@ -574,18 +576,17 @@ void saveOptions() {
g_update_colors = true;
if(g_cur_shadow)
g_cur_shadow->setHidden(!g_show_shadow);
g_pause = 0;
g_main_scene->setPrevTicks( SDL_GetTicks() );
g_active_scenes.pop_back();
g_input_functions.pop_back();
}
void handleKeyDownOptions( SDL_Keycode key ) {
switch ( key ) {
#ifdef DEBUG
case SDLK_r:
g_main_scene->getRenderer().setRenderColiders(
!g_main_scene->getRenderer().getRenderColiders() );
break;
#endif
case SDLK_s:
case SDLK_DOWN:
g_options_options[g_options_select]->unsetColor();
@@ -604,6 +605,7 @@ void handleKeyDownOptions( SDL_Keycode key ) {
break;
case SDLK_RIGHT:
case SDLK_d:
//TODO define macros
switch( g_options_select ) {
case 0:
selected_color_scheme++;
@@ -622,6 +624,7 @@ void handleKeyDownOptions( SDL_Keycode key ) {
break;
case SDLK_LEFT:
case SDLK_a:
//TODO define macros
switch( g_options_select ) {
case 0:
if(selected_color_scheme == 0)
@@ -639,9 +642,12 @@ void handleKeyDownOptions( SDL_Keycode key ) {
}
break;
case SDLK_RETURN:
//TODO define macros
switch ( g_options_select ) {
case 2:
saveOptions();
g_active_scenes.pop_back();
g_input_functions.pop_back();
break;
default:
break;
@@ -649,6 +655,8 @@ void handleKeyDownOptions( SDL_Keycode key ) {
break;
case SDLK_ESCAPE:
saveOptions();
g_active_scenes.pop_back();
g_input_functions.pop_back();
default:
break;
}