From 601a366b8c665f760463259552fedd7be43e5754 Mon Sep 17 00:00:00 2001 From: oroborus Date: Sat, 2 Feb 2008 20:37:46 +0000 Subject: - zvuky v hre - hudba/zvuky sa daju zapnut/vypnut - tuxovia nemozu ist v arene do nekonecna - oprava chyby, ak bol zaskrknuty iba samopal, hra sa zasekla - do widgetu textfiled sa neda pisat donekonecna - tux ovladany pomocou keyboard_left stiriela a meni zbran - tuxovia nemozu prechadzat cez seba git-svn-id: http://opensvn.csie.org/tuxanci_ng@2 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/screen_setting.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'src/screen_setting.c') diff --git a/src/screen_setting.c b/src/screen_setting.c index ffcc8d1..26f28f7 100644 --- a/src/screen_setting.c +++ b/src/screen_setting.c @@ -7,6 +7,7 @@ #include "screen.h" #include "image.h" #include "music.h" +#include "sound.h" #include "screen_mainMenu.h" #include "list.h" #include "screen_setting.h" @@ -25,8 +26,12 @@ static widget_button_t *button_back; static widget_label_t *label_count_round; static widget_label_t *label_name_player1; static widget_label_t *label_name_player2; +static widget_label_t *label_music; +static widget_label_t *label_sound; static widget_check_t *check[ITEM_COUNT]; +static widget_check_t *check_music; +static widget_check_t *check_sound; static widget_image_t *image_gun_dual_revolver; static widget_image_t *image_gun_scatter; @@ -60,6 +65,8 @@ void drawScreenSetting() drawWidgetLabel(label_count_round); drawWidgetLabel(label_name_player1); drawWidgetLabel(label_name_player2); + drawWidgetLabel(label_music); + drawWidgetLabel(label_sound); drawWidgetTextfield(textfield_count_cound); drawWidgetTextfield(textfield_name_player1); @@ -79,6 +86,9 @@ void drawScreenSetting() drawWidgetImage(image_bonus_4x); drawWidgetImage(image_bonus_hidden); + drawWidgetCheck(check_music); + drawWidgetCheck(check_sound); + for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ ) { drawWidgetCheck(check[i]); @@ -100,6 +110,9 @@ void eventScreenSetting() eventWidgetTextfield(textfield_name_player1); eventWidgetTextfield(textfield_name_player2); + eventWidgetCheck(check_music); + eventWidgetCheck(check_sound); + for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ ) { eventWidgetCheck(check[i]); @@ -120,13 +133,25 @@ void stopScreenSetting() static void eventWidget(void *p) { widget_button_t *button; + widget_check_t *check; button = (widget_button_t *)(p); + check = (widget_check_t *)(p); if( button == button_back ) { setScreen("mainMenu"); } + + if( check == check_music ) + { + setMusicActive( check_music->status ); + } + + if( check == check_sound ) + { + setSoundActive( check_sound->status ); + } } void initScreenSetting() @@ -147,6 +172,14 @@ void initScreenSetting() textfield_name_player1 = newWidgetTextfield("name1", 110+label_name_player1->w, WINDOW_SIZE_Y-160); textfield_name_player2 = newWidgetTextfield("name2", 110+label_name_player2->w, WINDOW_SIZE_Y-120); + label_music = newWidgetLabel("Music :", 100, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT); + check_music = newWidgetCheck(label_music->x + label_music->w + 10, + WINDOW_SIZE_Y-80, TRUE, eventWidget); + label_sound = newWidgetLabel("Sound :", check_music->x + WIDGET_CHECK_WIDTH + 10, + WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT); + check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10, + WINDOW_SIZE_Y-80, TRUE, eventWidget); + for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ ) { int x; @@ -257,6 +290,8 @@ void quitScreenSetting() destroyWidgetLabel(label_count_round); destroyWidgetLabel(label_name_player1); destroyWidgetLabel(label_name_player2); + destroyWidgetLabel(label_music); + destroyWidgetLabel(label_sound); destroyWidgetTextfield(textfield_count_cound); destroyWidgetTextfield(textfield_name_player1); @@ -276,6 +311,9 @@ void quitScreenSetting() destroyWidgetImage(image_bonus_4x); destroyWidgetImage(image_bonus_hidden); + destroyWidgetCheck(check_music); + destroyWidgetCheck(check_sound); + for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ ) { destroyWidgetCheck(check[i]); -- cgit v1.2.3