WebSVN – Kolibri OS – Diff – /programs/games/tetris/trunk/tetris.asm

 UP_KEY equ 130+48
 DOWN_KEY equ 129+48
 LEFT_KEY equ 128+48
 RIGHT_KEY equ 131+48
-BACKGROUND equ 03000080h
+;BACKGROUND equ 03000080h
     cmp  ah,3                   ; button id=3 ? ///Wildwest's  'Pause' button
     jz  pause_program
     jmp still
 end_program:
-    mov  eax,0xffffffff         ; close this program
+    mov  eax,-1                ; close this program
     int  0x40
 go_new_game:
 ;   *******  WINDOW DEFINITIONS AND DRAW ********
 ;   *********************************************
 draw_window:
+    mov  eax,48
+    mov  ebx,3
+    mov  ecx,sc
+    mov  edx,sizeof.system_colors
     int  0x40
     mov  eax,12                    ; function 12:tell os about windowdraw
     mov  ebx,1                     ; 1, start of draw
     int  0x40
                                  ; DRAW WINDOW
-  mov  eax,0                     ; function 0 : define and draw window
+  xor  eax,eax                   ; function 0 : define and draw window
   mov  ebx,320*65536+(LEN_X-BORDER_LEFT-BORDER_RIGHT)*ADOBE_SIZE+X_LOCATION*2
   mov  ecx,25*65536+ (LEN_Y-BORDER_TOP-BORDER_BOTTOM)*ADOBE_SIZE+Y_LOCATION+30
-  mov  edx,BACKGROUND            ; color of work area RRGGBB
+  mov  edx,[sc.work]             ; color of work area RRGGBB
-  mov  esi,0x006688ee;99bbff            ; color of grab bar  RRGGBB,8->col
-  mov  edi,0x007799ff;99bbee            ; color of frames    RRGGBB
-  int  0x40
-                                    ; WINDOW LABEL
-    mov  eax,4                      ; function 4 : write text to window
-    mov  ebx,8*65536+8              ; [x start] *65536 + [y start]
-    mov  ecx,0x10ffffff             ; color of text RRGGBB
-    mov  edx,labelt                 ; pointer to text beginning
-    mov  esi,labellen-labelt        ; text length
-    int  0x40
-                                   ; CLOSE BUTTON
-;    mov  eax,8                     ; function 8 : define and draw button
-;    mov  ebx,243*65536+12          ; [x start] *65536 + [x size]
-;    mov  ecx,5*65536+12            ; [y start] *65536 + [y size]
+  or   edx,0x13000000
-;    mov  edx,1                     ; button id
+  mov  edi,header                ; WINDOW LABEL
-;    mov  esi,0x5580cc;22aacc              ; button color RRGGBB
+  int  0x40
 ;    int  0x40
     mov eax,8
-    mov ebx,30*65536+102
+    mov ebx,30*65536+100
     mov ecx,378*65536+18
     mov edx,2
-    mov esi,0xA24466;5580cc;22aacc
+    mov esi,[sc.work_button]
     int 0x40
 ;/////////////////////////////////////////////// Wildwest's  'Pause' button
-    mov eax,8
+    ;mov eax,8
     mov ebx,132*65536+102
     mov ecx,378*65536+18
     mov edx,3
-    mov esi,0x0FA0F0;
+    mov esi,[sc.work_button];
     int 0x40
     mov  eax,4                      ; function 4 : write text to window
-    mov  ebx,164*65536+384             ; [x start] *65536 + [y start]
+    mov  ebx,164*65536+384          ; [x start] *65536 + [y start]
-    mov  ecx,0x10ffffff             ; color of text RRGGBB
+    mov  ecx,[sc.work_button_text]  ; color of text RRGGBB
-    mov  edx,labe                ; pointer to text beginning
-    mov  esi,labelen-labe       ; text length
-    int  0x40
+    or   ecx,0x90000000
-;///////////////////////////////////////////////
-    mov eax,4
+    mov  edx,labe                   ; pointer to text
-    mov ebx,49*65536+384
-    xor ecx,ecx
+    int  0x40
-    mov ecx,0x10ffffff
+;///////////////////////////////////////////////
-    mov edx,game_finished
+    ;mov eax,4
-    mov esi,size_of_game_finished-game_finished
+    mov ebx,49*65536+384
-    int 0x40
+    mov edx,game_finished
+    int 0x40
+    call draw_table
     call draw_table
     movzx edx,byte [current_block_color]
     call draw_block
               ;  pusha
               ;  mov eax,5
               ;  mov ebx,10
               ;  int 0x40
               ;  popa
-                mov ax,13
+                mov eax,13
                 movzx edx,byte [esi]
                 mov edx,[color_table+edx*4]
                 int 0x40
                 call draw_frames
                 inc esi
 ;--------------------------------------------------------------
 write_score:
     mov  eax,[score]
     call number_to_str
-    mov  ebx,100*65536+100         ;clear box to write new score
+    mov  ebx,90*65536+35          ; draw info text with function 4
-    mov  ecx,35*65536+15
+    mov  ecx,[sc.work_text]        ; color
-    mov  edx,BACKGROUND
-    mov  eax,13
-    int  40h
-    mov  ebx,100*65536+35          ; draw info text with function 4
-    mov  ecx,0xffff00              ; color
+    or   ecx,0x50000000
     mov  edx,number_str
+    mov  esi,[size_of_number_str]
-    mov  esi,[size_of_number_str]
+    mov  edi,[sc.work]
     mov  eax,4
     int  0x40
     ret
     dd k_block_0
     dd k_block_1
-if lang eq ru
+if lang eq ru
-  labelt:
-         db ' 1.6 -   '
-  labellen:
-  labe:
-         db ''
+  header         db ' 1.61 -   ',0
-  labelen:
+  labe           db '',0
-  text:                 db 'çª¨:  '
-  game_finished:        db ' '
+  text           db 'çª¨:',0
-  size_of_game_finished:
+  game_finished: db '',0
-else
-  labelt:
-         db 'TETRIS 1.6 - ARROWS & SPACE'
-  labellen:
+else
-  labe:
-         db 'PAUSE'
-  labelen:
+  header         db 'TETRIS 1.61 - ARROWS & SPACE',0
-  text:                 db 'Score: '
+  labe           db 'PAUSE',0
-  game_finished:        db 'NEW GAME'
+  text           db 'Score:',0
 current_block_color:    db 0
 number_str:             db 0,0,0,0,0,0,0,0,0
 end_number_str:
 size_of_number_str      dd 9
 delay:                  db 40
+sc     system_colors
 table_tetris:
+I_END:

Subversion Repositories Kolibri OS

(root)/programs/games/tetris/trunk/tetris.asm – Rev 131 → 180