From f89947dea213cf4e7c81fb698fd6d0648292b412 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Wed, 31 Dec 2014 08:17:36 +0000 Subject: [PATCH] Rusty Earth - small fixes. git-svn-id: svn://kolibrios.org@5319 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/games/rstearth/actions_protagonist.inc | 16 ++++++++-------- programs/games/rstearth/i_data.inc | 3 +++ programs/games/rstearth/key.inc | 16 ++++++++-------- programs/games/rstearth/localization_eng.inc | 2 ++ programs/games/rstearth/localization_rus.inc | 2 ++ programs/games/rstearth/menu.inc | 12 ++++++++++-- 6 files changed, 33 insertions(+), 18 deletions(-) diff --git a/programs/games/rstearth/actions_protagonist.inc b/programs/games/rstearth/actions_protagonist.inc index b2c969c60b..2394bca3df 100644 --- a/programs/games/rstearth/actions_protagonist.inc +++ b/programs/games/rstearth/actions_protagonist.inc @@ -25,8 +25,8 @@ protagonist_route_up: test ah,ah jnz action_stop - cmp al,BASE_WATER - jz action_stop +; cmp al,BASE_WATER +; jz action_stop ; DEBUGF 1, "protagonist good route up\n" dec [protagonist_position.y] @@ -45,8 +45,8 @@ protagonist_route_down: test ah,ah jnz action_stop - cmp al,BASE_WATER - jz action_stop +; cmp al,BASE_WATER +; jz action_stop ; DEBUGF 1, "protagonist good route down\n" inc [protagonist_position.y] @@ -65,8 +65,8 @@ protagonist_route_left: test ah,ah jnz action_stop - cmp al,BASE_WATER - jz action_stop +; cmp al,BASE_WATER +; jz action_stop ; DEBUGF 1, "protagonist good route left\n" dec [protagonist_position.x] @@ -85,8 +85,8 @@ protagonist_route_right: test ah,ah jnz action_stop - cmp al,BASE_WATER - jz action_stop +; cmp al,BASE_WATER +; jz action_stop ; DEBUGF 1, "protagonist good route righ\n" inc [protagonist_position.x] diff --git a/programs/games/rstearth/i_data.inc b/programs/games/rstearth/i_data.inc index cfd1291605..f42617c2a1 100644 --- a/programs/games/rstearth/i_data.inc +++ b/programs/games/rstearth/i_data.inc @@ -288,6 +288,8 @@ menu_credits_text_pointers: dd menu_credits_text.13 dd menu_credits_text.14 dd menu_credits_text.15 + dd menu_credits_text.16 + dd menu_credits_text.17 dd 0 ;--------------------------------------------------------------------- align 4 @@ -307,6 +309,7 @@ settings_menu_text_pointers: ;--------------------------------------------------------------------- align 4 map_level_pointer: + dd map_level_10 dd map_level_0 dd map_level_1 dd map_level_2 diff --git a/programs/games/rstearth/key.inc b/programs/games/rstearth/key.inc index cd61783360..af7ec24701 100644 --- a/programs/games/rstearth/key.inc +++ b/programs/games/rstearth/key.inc @@ -147,8 +147,8 @@ key: add eax,plan_level mov ebx,[eax] - cmp bh,OBJECT_FINAL_MONSTER ;OBJECT_PROTAGONIST - jbe .kill +; cmp bh,OBJECT_FINAL_MONSTER ;OBJECT_PROTAGONIST +; jbe .kill cmp bh,OBJECT_WHITE_BRICK je .white_brick @@ -181,12 +181,12 @@ key: ; call show_tiles_one_iteration jmp calculate_action_for_all.2 ;still ;-------------------------------------- -.kill: - and ebx,0x000000ff - add ebx,0x01000000 - mov [eax],ebx -; call show_tiles_one_iteration - jmp calculate_action_for_all.2 +;.kill: +; and ebx,0x000000ff +; add ebx,0x01000000 +; mov [eax],ebx +;; call show_tiles_one_iteration +; jmp calculate_action_for_all.2 ;-------------------------------------- .white_brick: ror ebx,16 diff --git a/programs/games/rstearth/localization_eng.inc b/programs/games/rstearth/localization_eng.inc index e6974df508..266b8c1354 100644 --- a/programs/games/rstearth/localization_eng.inc +++ b/programs/games/rstearth/localization_eng.inc @@ -58,6 +58,8 @@ menu_credits_text: .13: db 0 .14: db 'Glyphs of Russo free font by',0 .15: db ' http://www.jovanny.ru',0 +.16: db 0 +.17: db 'Game author - Marat Zakyanov aka Mario79',0 ;--------------------------------------------------------------------- menu_help_text: .1: db 'Game control',0 diff --git a/programs/games/rstearth/localization_rus.inc b/programs/games/rstearth/localization_rus.inc index ecd43d696a..65935a8a6e 100644 --- a/programs/games/rstearth/localization_rus.inc +++ b/programs/games/rstearth/localization_rus.inc @@ -60,6 +60,8 @@ menu_credits_text: .13: db 0 .14: db 'Глифы свободного шрифта Russo от',0 .15: db ' http://www.jovanny.ru',0 +.16: db 0 +.17: db 'Автор игры - Марат Закиянов aka Mario79',0 ;--------------------------------------------------------------------- menu_help_text: .1: db 'Управление игрой',0 diff --git a/programs/games/rstearth/menu.inc b/programs/games/rstearth/menu.inc index 0827bcf21c..1fce8e5a0c 100644 --- a/programs/games/rstearth/menu.inc +++ b/programs/games/rstearth/menu.inc @@ -236,10 +236,13 @@ menu_help: @@: cmp ah,57 ; space je main_menu_start.red - + cmp ah,28 ; enter je main_menu_start.red + cmp ah,1 ; esc + je main_menu_start.red + jmp .still ;--------------------------------------------------------------------- .extended_key: @@ -316,6 +319,9 @@ settings_menu_start: cmp ah,28 ; enter je .enter_to_point + + cmp ah,1 ; esc + je .exit jmp .still ;--------------------------------------------------------------------- @@ -368,7 +374,9 @@ settings_menu_start: @@: cmp [main_menu_pointer],2 ; exit jne .still - + +;-------------------------------------- +.exit: call snd_kick_action mov al,[settings_menu_pointer] mov [main_menu_pointer],al