From 3be1aed1f6596f56fa14e5e7ababfee838fcdf6b Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Fri, 25 May 2012 07:20:15 +0000
Subject: [PATCH] pong3: correct window title

git-svn-id: svn://kolibrios.org@2674 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/games/pong3/trunk/ascl.inc  | 32 ----------------------------
 programs/games/pong3/trunk/pong3.asm | 15 +++++++++----
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/programs/games/pong3/trunk/ascl.inc b/programs/games/pong3/trunk/ascl.inc
index d9e8fe98f1..1d954b9224 100644
--- a/programs/games/pong3/trunk/ascl.inc
+++ b/programs/games/pong3/trunk/ascl.inc
@@ -386,19 +386,6 @@ macro delay arg1
     mcall
 }
 
-; WINDOW - Draw window
-; (SYNTAX)  WINDOW Xstart,Ystart,'Text',Color
-; (SAMPLE)  WINDOW 10,10,640+8,480+24,window_Skinned
-
-macro window arg1,arg2,arg3,arg4,arg5
-{
-    mov ebx,arg1*65536+arg3
-    mov ecx,arg2*65536+arg4
-    mov edx,arg5
-    mov eax,0
-    mcall
-}
-
 macro colorwindow arg1,arg2,arg3,arg4,arg5,arg6,arg7
 {
     mov ebx,arg1*65536+arg3
@@ -410,25 +397,6 @@ macro colorwindow arg1,arg2,arg3,arg4,arg5,arg6,arg7
     mcall
 }
 
-
-; STARTWD - Start of window draw
-
-macro startwd
-{
-    mov eax,12
-    mov ebx,1
-    mcall
-}
-
-; ENDWD - End window draw
-
-macro endwd
-{
-    mov eax,12
-    mov ebx,2
-    mcall
-}
-
 ; LABEL - Put text to frame
 ; (SYNTAX)  LABEL Xstart,Ystart,'Text',Color
 ; (SAMPLE)  LABEL 10,12,'Hello World!',cl_Green+font_Big
diff --git a/programs/games/pong3/trunk/pong3.asm b/programs/games/pong3/trunk/pong3.asm
index fee2ce4eb1..389e7ad0e5 100644
--- a/programs/games/pong3/trunk/pong3.asm
+++ b/programs/games/pong3/trunk/pong3.asm
@@ -42,6 +42,11 @@ still:
 
     scevent red,key,button
 
+	;mcall 48, 4 ;get skin width
+	;sub [skin_h], 16
+	;div eax, 2
+	;mov [skin_h], eax
+	
     outcount dword [scoreb],300,8,cl_Blue,5*65536
     outcount dword [scorea],350,8,cl_Red,5*65536
 
@@ -292,14 +297,16 @@ no_sp:
 
 
 draw_window:
-    startwd
-    window 0,0,640+8,480+24,window_Skinned
-    label 12,8,'PONG: USE ARROW KEYS              SCORE',cl_White+font_Big
-    endwd
+    mcall 12,1 ;start window redraw
+	mcall 0, <10, 640+8>, <10, 480+24>, 0x14000000,, wtitle 
+    mcall 12,2 ;end window redraw
     ret
 
 
 ; DATA AREA
+wtitle db 'PONG: USE ARROW KEYS                     SCORE:',0
+;skin_h dd 25
+
 xt dd 100
 yt dd 100