Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Rusty Earth - small fixes.

Browse Source 
git-svn-id: svn://kolibrios.org@5319 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2014-12-31 08:17:36 +00:00
parent 99d55c030e
commit f89947dea2
6 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/games/rstearth/actions_protagonist.inc
View File

@ -25,8 +25,8 @@ protagonist_route_up:
test ah,ah test ah,ah
jnz action_stop jnz action_stop
cmp al,BASE_WATER ; cmp al,BASE_WATER
jz action_stop ; jz action_stop
; DEBUGF 1, "protagonist good route up\n" ; DEBUGF 1, "protagonist good route up\n"
dec [protagonist_position.y] dec [protagonist_position.y]
@ -45,8 +45,8 @@ protagonist_route_down:
test ah,ah test ah,ah
jnz action_stop jnz action_stop
cmp al,BASE_WATER ; cmp al,BASE_WATER
jz action_stop ; jz action_stop
; DEBUGF 1, "protagonist good route down\n" ; DEBUGF 1, "protagonist good route down\n"
inc [protagonist_position.y] inc [protagonist_position.y]
@ -65,8 +65,8 @@ protagonist_route_left:
test ah,ah test ah,ah
jnz action_stop jnz action_stop
cmp al,BASE_WATER ; cmp al,BASE_WATER
jz action_stop ; jz action_stop
; DEBUGF 1, "protagonist good route left\n" ; DEBUGF 1, "protagonist good route left\n"
dec [protagonist_position.x] dec [protagonist_position.x]
@ -85,8 +85,8 @@ protagonist_route_right:
test ah,ah test ah,ah
jnz action_stop jnz action_stop
cmp al,BASE_WATER ; cmp al,BASE_WATER
jz action_stop ; jz action_stop
; DEBUGF 1, "protagonist good route righ\n" ; DEBUGF 1, "protagonist good route righ\n"
inc [protagonist_position.x] inc [protagonist_position.x]

3
programs/games/rstearth/i_data.inc
View File

@ -288,6 +288,8 @@ menu_credits_text_pointers:
dd menu_credits_text.13 dd menu_credits_text.13
dd menu_credits_text.14 dd menu_credits_text.14
dd menu_credits_text.15 dd menu_credits_text.15
dd menu_credits_text.16
dd menu_credits_text.17
dd 0 dd 0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
align 4 align 4
@ -307,6 +309,7 @@ settings_menu_text_pointers:
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
align 4 align 4
map_level_pointer: map_level_pointer:
dd map_level_10
dd map_level_0 dd map_level_0
dd map_level_1 dd map_level_1
dd map_level_2 dd map_level_2

16
programs/games/rstearth/key.inc
View File

@ -147,8 +147,8 @@ key:
add eax,plan_level add eax,plan_level
mov ebx,[eax] mov ebx,[eax]
cmp bh,OBJECT_FINAL_MONSTER ;OBJECT_PROTAGONIST ; cmp bh,OBJECT_FINAL_MONSTER ;OBJECT_PROTAGONIST
jbe .kill ; jbe .kill
cmp bh,OBJECT_WHITE_BRICK cmp bh,OBJECT_WHITE_BRICK
je .white_brick je .white_brick
@ -181,12 +181,12 @@ key:
; call show_tiles_one_iteration ; call show_tiles_one_iteration
jmp calculate_action_for_all.2 ;still jmp calculate_action_for_all.2 ;still
;-------------------------------------- ;--------------------------------------
.kill: ;.kill:
and ebx,0x000000ff ; and ebx,0x000000ff
add ebx,0x01000000 ; add ebx,0x01000000
mov [eax],ebx ; mov [eax],ebx
; call show_tiles_one_iteration ;; call show_tiles_one_iteration
jmp calculate_action_for_all.2 ; jmp calculate_action_for_all.2
;-------------------------------------- ;--------------------------------------
.white_brick: .white_brick:
ror ebx,16 ror ebx,16

2
programs/games/rstearth/localization_eng.inc
View File

@ -58,6 +58,8 @@ menu_credits_text:
.13: db 0 .13: db 0
.14: db 'Glyphs of Russo free font by',0 .14: db 'Glyphs of Russo free font by',0
.15: db ' http://www.jovanny.ru',0 .15: db ' http://www.jovanny.ru',0
.16: db 0
.17: db 'Game author - Marat Zakyanov aka Mario79',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
menu_help_text: menu_help_text:
.1: db 'Game control',0 .1: db 'Game control',0

2
programs/games/rstearth/localization_rus.inc
View File

@ -60,6 +60,8 @@ menu_credits_text:
.13: db 0 .13: db 0
.14: db 'ƒ«¨äë ᢮¡®¤­®£® èà¨äâ  Russo ®â',0 .14: db 'ƒ«¨äë ᢮¡®¤­®£® èà¨äâ  Russo ®â',0
.15: db ' http://www.jovanny.ru',0 .15: db ' http://www.jovanny.ru',0
.16: db 0
.17: db '€¢â®à ¨£àë - Œ à â ‡ ª¨ï­®¢ aka Mario79',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
menu_help_text: menu_help_text:
.1: db '“¯à ¢«¥­¨¥ ¨£à®©',0 .1: db '“¯à ¢«¥­¨¥ ¨£à®©',0

8
programs/games/rstearth/menu.inc
View File

@ -240,6 +240,9 @@ menu_help:
cmp ah,28 ; enter cmp ah,28 ; enter
je main_menu_start.red je main_menu_start.red
cmp ah,1 ; esc
je main_menu_start.red
jmp .still jmp .still
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
.extended_key: .extended_key:
@ -317,6 +320,9 @@ settings_menu_start:
cmp ah,28 ; enter cmp ah,28 ; enter
je .enter_to_point je .enter_to_point
cmp ah,1 ; esc
je .exit
jmp .still jmp .still
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
.extended_key: .extended_key:
@ -369,6 +375,8 @@ settings_menu_start:
cmp [main_menu_pointer],2 ; exit cmp [main_menu_pointer],2 ; exit
jne .still jne .still
;--------------------------------------
.exit:
call snd_kick_action call snd_kick_action
mov al,[settings_menu_pointer] mov al,[settings_menu_pointer]
mov [main_menu_pointer],al mov [main_menu_pointer],al