Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 5263 → Rev 5264

/programs/games/rstearth/build_en.bat
4,6 → 4,7
@fasm -m 16384 rstearth.asm rstearth_eng_bin\rstearth.kex
@erase lang.inc
@kpack rstearth_eng_bin\rstearth.kex
@copy resources\font_russo_1bpp.png rstearth_eng_bin\font_russo_1bpp.png
@copy resources\base_8bpp.png rstearth_eng_bin\base_8bpp.png
@copy resources\red_brick_8bpp.png rstearth_eng_bin\red_brick_8bpp.png
@copy resources\white_brick_8bpp.png rstearth_eng_bin\white_brick_8bpp.png
/programs/games/rstearth/build_ru.bat
4,6 → 4,7
@fasm -m 16384 rstearth.asm rstearth_rus_bin\rstearth.kex
@erase lang.inc
@kpack rstearth_rus_bin\rstearth.kex
@copy resources\font_russo_1bpp.png rstearth_rus_bin\font_russo_1bpp.png
@copy resources\base_8bpp.png rstearth_rus_bin\base_8bpp.png
@copy resources\red_brick_8bpp.png rstearth_rus_bin\red_brick_8bpp.png
@copy resources\white_brick_8bpp.png rstearth_rus_bin\white_brick_8bpp.png
/programs/games/rstearth/font.inc
0,0 → 1,34
;---------------------------------------------------------------------
draw_font:
pusha
xor ebp,ebp
mov esi,edx
mov edx,ebx
cld
;--------------------------------------
@@:
lodsb
test al,al
jz .exit
 
movzx ebx,al
imul ebx, FONT_SIZE_X * FONT_SIZE_Y /8
mov eax,[font_icons]
add ebx,[eax+28]
add ebx,eax
mov ecx,FONT_SIZE_X shl 16 + FONT_SIZE_Y
mov edi,[eax+20] ; palette
add edi,eax
 
push esi
mov esi,1
mcall 65
pop esi
 
add edx,FONT_REAL_SIZE_X shl 16 ; font size x
jmp @b
;--------------------------------------
.exit:
popa
ret
;---------------------------------------------------------------------
/programs/games/rstearth/i_data.inc
243,6 → 243,7
error_fs_text_10: db '10 - Access denied',0
error_fs_text_11: db '11 - Device error',0
;---------------------------------------------------------------------
font_icons_file_name db 'font_russo_1bpp.png',0
base_icons_file_name db 'base_8bpp.png',0
red_brick_icons_file_name db 'red_brick_8bpp.png',0
white_brick_icons_file_name db 'white_brick_8bpp.png',0
/programs/games/rstearth/load.inc
65,14 → 65,7
mov eax,[raw_pointer]
ret
;---------------------------------------------------------------------
load_and_convert_all_icons:
; load and convert base icons
mov ebx,base_icons_file_name
call load_and_convert_current_icon_set
mov [base_icons],eax
; DEBUGF 1, "base_icons: %x\n",eax
 
; load and convert base icons
; load and convert icons
; mov ebx,npc_miku_kick_icons_file_name
; call load_and_convert_current_icon_set
; mov [npc_miku_kick_icons],eax
88,7 → 81,20
; DEBUGF 1, "data size: %x\n",[eax+32]
; DEBUGF 1, "transparency offset: %x\n",[eax+36]
; DEBUGF 1, "transparency size: %x\n",[eax+40]
;---------------------------------------------------------------------
load_and_convert_all_icons:
; load and convert font icons
mov ebx,font_icons_file_name
call load_and_convert_current_icon_set
mov [font_icons],eax
; DEBUGF 1, "font_icons: %x\n",eax
 
; load and convert base icons
mov ebx,base_icons_file_name
call load_and_convert_current_icon_set
mov [base_icons],eax
; DEBUGF 1, "base_icons: %x\n",eax
 
; load and convert red brick
mov ebx,red_brick_icons_file_name
call load_and_convert_current_icon_set
/programs/games/rstearth/localization_eng.inc
1,6 → 1,6
;---------------------------------------------------------------------
title:
db 'Rusty Earth (Prototype 1.6) 24.12.2014',0
db 'Rusty Earth (Prototype 1.7) 26.12.2014',0
;---------------------------------------------------------------------
menu_game_label:
db 'GAME',0
/programs/games/rstearth/localization_rus.inc
2,7 → 2,7
; Code page - Cyrillic OEM866
;---------------------------------------------------------------------
title:
db '¦ ¢ ï ‡¥¬«ï (à®â®â¨¯ 1.6) 24.12.2014',0
db '¦ ¢ ï ‡¥¬«ï (à®â®â¨¯ 1.7) 26.12.2014',0
;---------------------------------------------------------------------
menu_game_label:
db 'ˆƒ€',0
11,7 → 11,7
db '€‘’Ž‰Šˆ',0
;--------------------------------------
menu_credits_label:
db '‹€ƒŽ„€Ž‘’œ',0
db 'ˆ‚…’›',0
;--------------------------------------
menu_help_label:
db 'ŽŒŽ™œ',0
36,8 → 36,8
;---------------------------------------------------------------------
menu_credits_text:
.1: db 'à¨¢¥â ãç áâ­¨ª ¬ ª®¬ ­¤ë KolibriOS Team!',0
.2: db '‚ ¨£à¥ ¨á¯®«ì§®¢ ­ë £à ä¨ç¥áª¨¥ ¨ §¢ãª®¢ë¥ ¬ â¥à¨ «ë',0
.3: db '¯®¤ ᢮¡®¤­ë¬¨ «¨æ¥­§¨ï¬¨, ¯®§ ¨¬á⢮¢ ­­ë¥ á ᠩ⮢:',0
.2: db 'ƒà ä¨ç¥áª¨¥ ¨ §¢ãª®¢ë¥ ¬ â¥à¨ «ë ¯®¤',0
.3: db '᢮¡®¤­ë¬¨ «¨æ¥­§¨ï¬¨, ¢§ïâë á ᠩ⮢:',0
.4: db 'http://untamed.wild-refuge.net/',0
.5: db 'http://opengameart.org',0
.6: db 'https://wiki.themanaworld.org',0
/programs/games/rstearth/menu.inc
5,6 → 5,7
.red:
mov [menu_text_pointers],main_menu_text_pointers
mov [text_step_Y],SPRITE_SIZE_Y
mov [use_separate_draw_text],1
call draw_menu_window
call draw_new_pointer
;---------------------------------------------------------------------
116,7 → 117,7
clear_old_pointer:
movzx ecx,byte [main_menu_pointer]
imul ecx,SPRITE_SIZE_Y
add ecx,SPRITE_SIZE_Y*2 + 32
add ecx,SPRITE_SIZE_Y*3 - 16
shl ecx,16
mov cx,SPRITE_SIZE_Y
mcall 13,<SPRITE_SIZE_X*2,SPRITE_SIZE_X>,,0
132,7 → 133,7
 
movzx edx,byte [main_menu_pointer]
imul edx,SPRITE_SIZE_Y
add edx,SPRITE_SIZE_Y*2 + 32
add edx,SPRITE_SIZE_Y*3 - 16
add edx,SPRITE_SIZE_X*2 shl 16
mov eax,[npc_miku_icons]
162,7 → 163,16
test edx,edx
jz .end
 
cmp [use_separate_draw_text],1
je .use_separate_draw_text
 
mcall
jmp .continue
;--------------------------------------
.use_separate_draw_text:
call draw_font
;--------------------------------------
.continue:
add ebx,[text_step_Y]
add esi,4
jmp @b
190,6 → 200,7
mov [text_step_Y],20
;--------------------------------------
.red:
mov [use_separate_draw_text],0
call draw_menu_window
;---------------------------------------------------------------------
.still:
253,6 → 264,7
mov [menu_text_pointers],settings_menu_text_pointers
mov [text_step_Y],SPRITE_SIZE_Y
call prepare_settings_text
mov [use_separate_draw_text],1
call draw_menu_window
call draw_new_pointer
;---------------------------------------------------------------------
/programs/games/rstearth/resources/font_russo_1bpp.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/programs/games/rstearth/rstearth.asm
47,6 → 47,10
;include '../../develop/libraries/box_lib/trunk/box_lib.mac'
@use_library
;---------------------------------------------------------------------
FONT_SIZE_X = 32
FONT_REAL_SIZE_X = 32
FONT_SIZE_Y = 32
;---------------------------------------------------------------------
LEVEL_MAP_SIZE_X = 10
LEVEL_MAP_SIZE_Y = 10
SPRITE_SIZE_X = 64
207,6 → 211,7
include 'snd_api.inc'
include 'sound.inc'
include 'menu.inc'
include 'font.inc'
;---------------------------------------------------------------------
if lang eq ru
include 'localization_rus.inc'
/programs/games/rstearth/sound.inc
180,12 → 180,13
mov ebx,[eax]
add eax,4
mov ebp,eax
; DEBUGF 1, "src EAX: %x size EBX: %x\n",eax,ebx
add ebx,eax
; DEBUGF 1, "start EAX: %x\n",eax
;--------------------------------------
.loop:
cmp [music_flag],0
je snd_background_music_thread_start
; DEBUGF 1, "src EAX: %x size EBX: %x\n",eax,ebx
; DEBUGF 1, "src EBP: %x size EBX: %x\n",ebp,ebx
; stdcall _WaveOut@12,[hBuff],eax,ebx
stdcall _WaveOut@12,[hBuff1],ebp,8192
; DEBUGF 1, "return EAX: %x\n",eax
195,7 → 196,7
add ebp,8192*2
cmp ebx,ebp
jae .start
jbe .start
sub ebp,8192
jmp .loop
/programs/games/rstearth/u_data.inc
12,6 → 12,7
snd_kick_flag rb 1
main_menu_pointer rb 1
settings_menu_pointer rb 1
use_separate_draw_text rb 1
;---------------------------------------------------------------------
align 4
N_error rd 1
18,6 → 19,7
error_type rd 1
error_path rd 1
;---------------------------------------------------------------------
font_icons rd 1
base_icons rd 1
red_brick_icons rd 1
white_brick_icons rd 1