From 9abd365415f5080b03d21b33daf07d8611d0a993 Mon Sep 17 00:00:00 2001 From: burniouf Date: Mon, 1 Jan 2024 12:25:12 +0100 Subject: [PATCH] LIBTUI: DLG fixes --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes INC/LIBTUI.I.txt | 2 +- LIB/LIBTUI.S.DLG.txt | 6 ++++-- LIB/LIBTUI.S.OBJ.txt | 1 - LIB/LIBTUI.S.txt | 5 +++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 375d85be9013aa16fe268c75d00348ae8617305f..bbc519b141923ac3377c872123d72f4f0cfdbfed 100644 GIT binary patch delta 8379 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 delta 8432 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 gH^5EsIrsv63BCefgInMm@GbZbe6MSYSCALL2 GetMemPtr >STYA ZPPtr2 - ldy #S.OBJ.W + ldy #S.CTX.W lda (ZPPtr2),y sec + ldy #S.OBJ.W sbc (ZPObjPtr),y lsr ldy #S.OBJ.X1 sta (ZPObjPtr),y - ldy #S.OBJ.H + ldy #S.CTX.H lda (ZPPtr2),y sec + ldy #S.OBJ.H sbc (ZPObjPtr),y lsr ldy #S.OBJ.Y1 diff --git a/LIB/LIBTUI.S.OBJ.txt b/LIB/LIBTUI.S.OBJ.txt index ce98cfcf..46d75807 100644 --- a/LIB/LIBTUI.S.OBJ.txt +++ b/LIB/LIBTUI.S.OBJ.txt @@ -182,7 +182,6 @@ OBJ.SetX2Y2 ldy #S.OBJ.X1 *-------------------------------------- OBJ.Exec >PUSHA hOBJ jsr LIB.GetOBJ - jsr LIB.GetCTX .1 jsr IO.GetC diff --git a/LIB/LIBTUI.S.txt b/LIB/LIBTUI.S.txt index cda85d65..6329ea06 100644 --- a/LIB/LIBTUI.S.txt +++ b/LIB/LIBTUI.S.txt @@ -297,10 +297,11 @@ LIB.GetCTX >LDYA ZPObjPtr >STYA ZPCtxPtr .1 lda (ZPCtxPtr) -* cmp #S.OBJ.T.SCRN - beq .8 + cmp #S.OBJ.T.DLG+1 + bcc .8 jsr .8 + bra .1 .8 ldy #S.OBJ.hParent