From 28fb09b79d11d2ca3e3cd9860ba3e74e7cad1315 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Fri, 16 Jul 2010 12:20:16 +0000 Subject: [PATCH] snake: some bugfixes git-svn-id: svn://kolibrios.org@1520 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/games/snake/trunk/snake.asm | 18 ++++++++++++++---- programs/games/snake/trunk/snake.ini | 19 ++++++++++++------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/games/snake/trunk/snake.asm b/programs/games/snake/trunk/snake.asm index 58e28df7c2..825288472c 100644 --- a/programs/games/snake/trunk/snake.asm +++ b/programs/games/snake/trunk/snake.asm @@ -12,6 +12,7 @@ include '../../../macros.inc' include '../../../system/launch/trunk/mem.inc' include '../../../develop/libraries/libs-dev/.test/dll.inc' include '../../../develop/libraries/box_lib/trunk/box_lib.mac' +;include '../../../system/board/trunk/debug.inc' ;;===Define_chapter============================================================================================================ @@ -55,10 +56,10 @@ align 4 @@: mov dword[eax], '.ini' - invoke ini.get_int, cur_dir_path, aPreferences, aSpeed, 70 + invoke ini.get_int, cur_dir_path, aPreferences, aSpeed, 80 neg eax add [time_wait_limit], eax - invoke ini.get_int, cur_dir_path, aPreferences, aDecorations, 1 + invoke ini.get_int, cur_dir_path, aPreferences, aDecorations, 2 mov [decorations], al invoke ini.get_color, cur_dir_path, aColors, aBackground_color, 0x000000 @@ -98,6 +99,15 @@ align 4 or [hiscore_number_color], eax invoke ini.get_color, cur_dir_path, aColors, aChampion_name_color, 0x80ffffff or [champion_name_color], eax + invoke ini.get_color, cur_dir_path, aColors, aEdit_box_selection_color, 0x00aa00 + or [edit1+0x10], eax + + mov eax, [background_color] + mov [edit1+0x0C], eax + mov [edit1+0x14], eax + mov [edit1+0x18], eax + mov eax, [game_over_hiscore_color] + mov [edit1+0x1C], eax include 'first_menu.asm' ; First menu body and functions include 'level.asm' ; Level body and functions (game process) @@ -684,13 +694,13 @@ aGame_over_hiscore_color db 'Game_over_hiscore_color',0 aScore_number_color db 'Score_number_color',0 aHiscore_number_color db 'Hiscore_number_color',0 aChampion_name_color db 'Champion_name_color',0 +aEdit_box_selection_color db 'Edit_box_selection_color',0 -edit1 edit_box 100,397,278,0x000000,0x00aa00,0x000000,0x000000,0x80ffdd44,15,hed,mouse_dd,ed_focus,hed_end-hed-1,hed_end-hed-1 +edit1 edit_box 100,397,278,0x000000,0x000000,0x000000,0x000000,0x80000000,15,hed,mouse_dd,ed_focus,hed_end-hed-1,hed_end-hed-1 hed db '',0 hed_end: rb 256 -ed_buffer rb 100 mouse_dd rd 1 diff --git a/programs/games/snake/trunk/snake.ini b/programs/games/snake/trunk/snake.ini index 32a3ac02d2..2845d25fdd 100644 --- a/programs/games/snake/trunk/snake.ini +++ b/programs/games/snake/trunk/snake.ini @@ -36,6 +36,7 @@ Hiscore_number_color = 255,255,255 Hiscore_string_color = 255,255,255 Champion_string_color = 255,255,255 Champion_name_color = 255,255,255 +Edit_box_selection_color= 0,176,0 ; Light scheme ;Background_color = 245,245,245 @@ -47,8 +48,8 @@ Champion_name_color = 255,255,255 ;Pause_picture_color = 75,255,75 ;Game_over_picture_color = 225,125,105 ;Navigation_string_color = 205,105,105 -;Game_over_string_color = 255,255,255 -;Game_over_hiscore_color = 255,255,255 +;Game_over_string_color = 205,105,105 +;Game_over_hiscore_color = 205,85,85 ;Eat_color = 255,255,55 ;Score_number_color = 100,100,255 ;Score_string_color = 100,100,255 @@ -56,9 +57,11 @@ Champion_name_color = 255,255,255 ;Hiscore_string_color = 100,100,255 ;Champion_string_color = 100,100,255 ;Champion_name_color = 100,100,255 +;Edit_box_selection_color= 0,176,0 ; Ultra white scheme -;Background_color = 0,0,0 +;Background_color = 255,255,255 +;Decorations_color = 0,0,0 ;Snake_color = 30,30,30 ;Snake_head_color = 30,30,30 ;Snake_picture_color = 30,30,30 @@ -66,8 +69,8 @@ Champion_name_color = 255,255,255 ;Pause_picture_color = 30,30,30 ;Game_over_picture_color = 30,30,30 ;Navigation_string_color = 255,255,255 -;Game_over_string_color = 255,255,255 -;Game_over_hiscore_color = 255,255,255 +;Game_over_string_color = 30,30,30 +;Game_over_hiscore_color = 0,0,0 ;Eat_color = 0,255,0 ;Score_number_color = 0,0,0 ;Score_string_color = 255,255,255 @@ -75,6 +78,7 @@ Champion_name_color = 255,255,255 ;Hiscore_string_color = 255,255,255 ;Champion_string_color = 255,255,255 ;Champion_name_color = 255,255,255 +;Edit_box_selection_color= 176,176,176 ; Ultra black scheme ;Background_color = 0,0,0 @@ -86,8 +90,8 @@ Champion_name_color = 255,255,255 ;Pause_picture_color = 225,225,225 ;Game_over_picture_color = 225,225,225 ;Navigation_string_color = 0,0,0 -;Game_over_string_color = 0,0,0 -;Game_over_hiscore_color = 0,0,0 +;Game_over_string_color = 225,225,225 +;Game_over_hiscore_color = 225,225,225 ;Eat_color = 255,0,0 ;Score_number_color = 255,255,255 ;Score_string_color = 255,255,255 @@ -95,6 +99,7 @@ Champion_name_color = 255,255,255 ;Hiscore_string_color = 255,255,255 ;Champion_string_color = 0,0,0 ;Champion_name_color = 0,0,0 +;Edit_box_selection_color= 100,100,100 [Score] Hiscore=777