fixed selectors

nikolauska · Dec 9, 2013 · 3e1a8be · 3e1a8be
1 parent f32fc1a
commit 3e1a8be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Laamapeli/Draw.h b/Laamapeli/Draw.h
@@ -163,13 +163,13 @@ inline void Draw::menu(int menu, int selection, int WIDTH, int HEIGHT, int FPS,
 			break;
 		}
 		case(2):{
-			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 + (al_get_text_width(font18,text1C)/2), this->HEIGHT/8*4 -14, 40, 50, NULL);
-			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 - (al_get_text_width(font18,text1C)/2) - (picWidth()/2.7), this->HEIGHT/8*4 -14, 40, 50, ALLEGRO_FLIP_HORIZONTAL);
+			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 + (al_get_text_width(font18,text2C)/2), this->HEIGHT/8*4 -14, 40, 50, NULL);
+			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 - (al_get_text_width(font18,text2C)/2) - (picWidth()/2.7), this->HEIGHT/8*4 -14, 40, 50, ALLEGRO_FLIP_HORIZONTAL);
 			break;
 		}
 		case(3):{
-			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 + (al_get_text_width(font18,text1C)/2), this->HEIGHT/8*5 -14, 40, 50, NULL);
-			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 - (al_get_text_width(font18,text1C)/2) - (picWidth()/2.7), this->HEIGHT/8*5 -14, 40, 50, ALLEGRO_FLIP_HORIZONTAL);
+			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 + (al_get_text_width(font18,text3C)/2), this->HEIGHT/8*5 -14, 40, 50, NULL);
+			al_draw_scaled_bitmap(msel, 0, 0, this->selectorW, this->selectorH, this->WIDTH/2 - (al_get_text_width(font18,text3C)/2) - (picWidth()/2.7), this->HEIGHT/8*5 -14, 40, 50, ALLEGRO_FLIP_HORIZONTAL);
 			break;
 		}
 	}

diff --git a/Laamapeli/Initialize_Destroy.cpp b/Laamapeli/Initialize_Destroy.cpp
@@ -111,6 +111,8 @@ int initialize(){
 	al_register_event_source(event_queue, al_get_timer_event_source(speedTimer));
 	al_register_event_source(event_queue, al_get_mouse_event_source());
 
+	al_destroy_font(fontLoading);
+	al_destroy_bitmap(loading);
 
 	// Start timer
 	al_start_timer(FPSTimer);