From 8ed9813abf07a02bd63e47c1edb0378e65015541 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Wed, 31 Dec 2014 20:58:34 +0000 Subject: [PATCH] Rusty Earth - small fixes. git-svn-id: svn://kolibrios.org@5341 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/games/rstearth/i_data.inc | 12 +++--- programs/games/rstearth/localization_eng.inc | 42 +++++++++++--------- programs/games/rstearth/localization_rus.inc | 42 +++++++++++--------- programs/games/rstearth/menu.inc | 14 +++++-- 4 files changed, 64 insertions(+), 46 deletions(-) diff --git a/programs/games/rstearth/i_data.inc b/programs/games/rstearth/i_data.inc index 7f254160f..5505f2ed4 100644 --- a/programs/games/rstearth/i_data.inc +++ b/programs/games/rstearth/i_data.inc @@ -273,23 +273,24 @@ main_menu_text_pointers: ;--------------------------------------------------------------------- align 4 menu_credits_text_pointers: + dd space_line dd menu_credits_text.1 dd menu_credits_text.2 + dd space_line dd menu_credits_text.3 dd menu_credits_text.4 dd menu_credits_text.5 + dd space_line dd menu_credits_text.6 dd menu_credits_text.7 + dd space_line dd menu_credits_text.8 dd menu_credits_text.9 + dd space_line dd menu_credits_text.10 dd menu_credits_text.11 + dd space_line dd menu_credits_text.12 - 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 @@ -298,6 +299,7 @@ menu_help_text_pointers: dd menu_help_text.2 dd menu_help_text.3 dd menu_help_text.4 + dd menu_help_text.5 dd 0 ;--------------------------------------------------------------------- align 4 diff --git a/programs/games/rstearth/localization_eng.inc b/programs/games/rstearth/localization_eng.inc index 266b8c135..d9f3b0689 100644 --- a/programs/games/rstearth/localization_eng.inc +++ b/programs/games/rstearth/localization_eng.inc @@ -45,25 +45,29 @@ protagonist_death_text: menu_credits_text: .1: db 'Hello KolibriOS Team!',0 .2: db ' Hello Habrahabr!',0 -.3: db 0 -.4: db 'The game used graphics and sound material',0 -.5: db 'under a free license, borrowed from:',0 -.6: db ' http://opengameart.org',0 -.7: db 0 -.8: db 'NPC sprites by',0 -.9: db ' http://untamed.wild-refuge.net',0 -.10: db 0 -.11: db 'Hatsune Miku Sprites by',0 -.12: db ' http://nekorandomnessqueen.deviantart.com',0 -.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 + +.3: db 'The game used graphics and sound material',0 +.4: db 'under a free license, borrowed from:',0 +.5: db ' http://opengameart.org',0 + +.6: db 'NPC sprites by',0 +.7: db ' http://untamed.wild-refuge.net',0 + +.8: db 'Hatsune Miku Sprites by',0 +.9: db ' http://nekorandomnessqueen.deviantart.com',0 + +.10: db 'Glyphs of Russo free font by',0 +.11: db ' http://www.jovanny.ru',0 + +.12: db 'Game author - Marat Zakiyanov aka Mario79',0 ;--------------------------------------------------------------------- menu_help_text: -.1: db 'Game control',0 -.2: db 'Move the player:',0 -.3: db 'WASD, Arrows or Num8462',0 -.4: db 'Player kick : Space',0 +.1: db ' Control',0 +.2: db ' WASD',0 +.3: db ' Arrows',0 +.4: db ' Num8462',0 +.5: db 'Kick SPACE',0 +;--------------------------------------------------------------------- +space_line: + db 0 ;--------------------------------------------------------------------- diff --git a/programs/games/rstearth/localization_rus.inc b/programs/games/rstearth/localization_rus.inc index 65935a8a6..f351e2f3d 100644 --- a/programs/games/rstearth/localization_rus.inc +++ b/programs/games/rstearth/localization_rus.inc @@ -47,25 +47,29 @@ protagonist_death_text: menu_credits_text: .1: db 'Привет KolibriOS Team!',0 .2: db ' Привет Хабрахабр!',0 -.3: db 0 -.4: db 'Графические и звуковые материалы под',0 -.5: db 'свободными лицензиями, взяты с сайта',0 -.6: db ' http://opengameart.org',0 -.7: db 0 -.8: db 'Спрайты NPC взяты с сайта',0 -.9: db ' http://untamed.wild-refuge.net',0 -.10: db 0 -.11: db 'Cпрайты Мику Хацунэ от',0 -.12: db ' http://nekorandomnessqueen.deviantart.com',0 -.13: db 0 -.14: db 'Глифы свободного шрифта Russo от',0 -.15: db ' http://www.jovanny.ru',0 -.16: db 0 -.17: db 'Автор игры - Марат Закиянов aka Mario79',0 + +.3: db 'Графические и звуковые материалы под',0 +.4: db 'свободными лицензиями, взяты с сайта',0 +.5: db ' http://opengameart.org',0 + +.6: db 'Спрайты NPC взяты с сайта',0 +.7: db ' http://untamed.wild-refuge.net',0 + +.8: db 'Cпрайты Мику Хацунэ от',0 +.9: db ' http://nekorandomnessqueen.deviantart.com',0 + +.10: db 'Глифы свободного шрифта Russo от',0 +.11: db ' http://www.jovanny.ru',0 + +.12: db 'Автор игры - Марат Закиянов aka Mario79',0 ;--------------------------------------------------------------------- menu_help_text: -.1: db 'Управление игрой',0 -.2: db 'Перемещение игрока:',0 -.3: db 'WASD, стрелки или Num8462',0 -.4: db 'Удар игрока: "Пробел"',0 +.1: db 'Управление',0 +.2: db ' WASD',0 +.3: db ' стрелки',0 +.4: db 'или Num8462',0 +.5: db 'Удар SPACE',0 +;--------------------------------------------------------------------- +space_line: + db 0 ;--------------------------------------------------------------------- diff --git a/programs/games/rstearth/menu.inc b/programs/games/rstearth/menu.inc index 1fce8e5a0..347bf4cce 100644 --- a/programs/games/rstearth/menu.inc +++ b/programs/games/rstearth/menu.inc @@ -156,7 +156,13 @@ draw_menu_window: call clear_screen mov eax,4 - mov ebx,SPRITE_SIZE_X*3 shl 16 + SPRITE_SIZE_Y*3 + mov ebx,SPRITE_SIZE_X*3 shl 16 + SPRITE_SIZE_Y*2 + cmp [use_separate_draw_text],0 + je @f + + add ebx,SPRITE_SIZE_Y +;-------------------------------------- +@@: mov ecx,0x90ffffff mov esi,[menu_text_pointers] ;-------------------------------------- @@ -192,17 +198,19 @@ clear_screen: menu_credits: call snd_kick_action mov [menu_text_pointers],menu_credits_text_pointers + mov [use_separate_draw_text],0 + mov [text_step_Y],20 jmp menu_help.1 ;--------------------------------------------------------------------- menu_help: call snd_kick_action mov [menu_text_pointers],menu_help_text_pointers + mov [text_step_Y],SPRITE_SIZE_Y ;-------------------------------------- .1: - mov [text_step_Y],20 + ;-------------------------------------- .red: - mov [use_separate_draw_text],0 call draw_menu_window ;--------------------------------------------------------------------- .still: