Tolik-Trek/Estex-DSS
1
0
Fork 0
mirror of https://github.com/Tolik-Trek/Estex-DSS.git synced 2026-06-15 09:21:47 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Anatoliy Belyanskiy 2023-08-12 05:21:13 +10:00
parent 361333af09
commit a99ed14bda
10 changed files with 74 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Console/build.txt
View File

@ -1 +1 @@
46 47

8
DSS/DOS5.ASM
View File

@ -81,9 +81,10 @@ CREATE:
CALL MASK CALL MASK
RET C RET C
CALL SEARCH CALL SEARCH
JR C,CREAT ;NO FILE, CREAT NEW. JR C,CREAT ;NO FILE, CREAT NEW.
CALL DELFILE ;FILE EXIST RECREAT CALL DELFILE ;FILE EXIST RECREAT
JR CREAT JP CREAT
; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00 ; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00
; OUTPUT: A - FM ; OUTPUT: A - FM
@ -99,7 +100,8 @@ CREAT_N:
CALL MASK CALL MASK
RET C RET C
CALL SEARCH CALL SEARCH
LD A,7
LD A,DSS_Error.sys.FILE_EXISTS
CCF CCF
RET C RET C
CREAT LD HL,MASKARE CREAT LD HL,MASKARE
@ -645,7 +647,7 @@ GETWORD:
JR Z,.DRV_NAME JR Z,.DRV_NAME
LD (DE),A LD (DE),A
INC DE INC DE
CP '!' CP ' '+1
CCF CCF
RET NC RET NC
DJNZ .loop DJNZ .loop

77
DSS/INTMOUSE.ASM
View File

@ -103,40 +103,40 @@ DMOUSE EQU #1A ; !FIXIT
; 5 - CURSOR IMAGE VERY BIG ; 5 - CURSOR IMAGE VERY BIG
INTMOUS BIT 7,C INTMOUS BIT 7,C
JP NZ,EMOUSE JR NZ,EMOUSE
INC C INC C
DEC C DEC C
JP Z,MS_INIT JR Z,MS_INIT ; 0
DEC C DEC C
JP Z,MS_SHOW JR Z,MS_SHOW ; 1
DEC C DEC C
JP Z,MS_HIDD JP Z,MS_HIDD ; 2
DEC C DEC C
JP Z,MS_READ JP Z,MS_READ ; 3
DEC C DEC C
JP Z,MS_GOTO JP Z,MS_GOTO ; 4
DEC C DEC C
JP Z,MS_RESR JR Z,MS_RESR ; 5
DEC C DEC C
JP Z,MS_RESR JR Z,MS_RESR ; 6
DEC C DEC C
JP Z,MS_VERT JP Z,MS_VERT ; 7
DEC C DEC C
JP Z,MS_HORZ JP Z,MS_HORZ ; 8
DEC C DEC C
JP Z,MS_CURS JP Z,MS_CURS ; 9
DEC C DEC C
JP Z,MS_MASK JP Z,MS_MASK ; 10
DEC C DEC C
JP Z,MS_BCUR JP Z,MS_BCUR ; 11
DEC C DEC C
JP Z,MS_RESR JR Z,MS_RESR ; 12
DEC C DEC C
JP Z,MS_RESR JR Z,MS_RESR ; 13
DEC C DEC C
JP Z,MS_GSEN JP Z,MS_GSEN ; 14
DEC C DEC C
JP Z,MS_SENT JP Z,MS_SENT ; 15
MS_RESR LD A,DSS_Error.mouse.INVALID_COMMAND MS_RESR LD A,DSS_Error.mouse.INVALID_COMMAND
SCF SCF
RET RET
@ -637,7 +637,7 @@ MS003 POP BC
XOR A XOR A
RET RET
READ_M IN A,(CMOUSE) READ_M: IN A,(CMOUSE)
RRCA RRCA
RET NC RET NC
IN A,(DMOUSE) IN A,(DMOUSE)
@ -645,18 +645,43 @@ READ_M IN A,(CMOUSE)
BIT 6,A BIT 6,A
CCF CCF
RET Z RET Z
TST_01 IN A,(CMOUSE)
;!TEST mouse freeeeezzzz
LD BC,#2000
;
TST_01: IN A,(CMOUSE)
RRCA RRCA
JP NC,TST_01 ;!TEST mouse freeeeezzzz
IN A,(DMOUSE) JR C,.NXT
DEC BC
LD A,B
OR C
JR NZ,TST_01
;JR NC,TST_01
RET
;
.NXT: IN A,(DMOUSE)
LD E,A LD E,A
BIT 6,A BIT 6,A
CCF CCF
RET NZ RET NZ
TST_02 IN A,(CMOUSE)
RRCA ;!TEST mouse freeeeezzzz
JR NC,TST_02 LD BC,#2000
IN A,(DMOUSE) ;
TST_02: IN A,(CMOUSE)
RRCA
;!TEST mouse freeeeezzzz
JR C,.NXT
DEC BC
LD A,B
OR C
JR NZ,TST_02
;JR NC,TST_02
RET
;
.NXT: IN A,(DMOUSE)
LD D,A LD D,A
BIT 6,A BIT 6,A
CCF CCF
@ -711,7 +736,7 @@ MCORECT LD HL,(PIX_X)
LD HL,(MAX_X) LD HL,(MAX_X)
AND A AND A
SBC HL,DE SBC HL,DE
JP NC,YCOO JR NC,YCOO
LD HL,(MAX_X) LD HL,(MAX_X)
LD (PIX_X),HL LD (PIX_X),HL
JP YCOO JP YCOO

4
DSS/VIDEO.ASM
View File

@ -428,9 +428,9 @@ GRAPH: CALL SAVETXT
AND #7F AND #7F
JR Z,G320_16 ; !TODO ? - ¯®ª  ®âà ¡ â뢠¥â ª ª ®è¨¡ª  JR Z,G320_16 ; !TODO ? - ¯®ª  ®âà ¡ â뢠¥â ª ª ®è¨¡ª 
DEC A DEC A
JP Z,G320_56 JR Z,G320_56
DEC A DEC A
JP Z,G640_16 JR Z,G640_16
; DEC A ; DEC A
; JP Z,G640_56 ; !TODO ? - ¯®ª  ®âà ¡ â뢠¥â ª ª ®è¨¡ª  ; JP Z,G640_56 ; !TODO ? - ¯®ª  ®âà ¡ â뢠¥â ª ª ®è¨¡ª 
G320_16: LD A,DSS_Error.sys.INVALID_VIDEO_MODE G320_16: LD A,DSS_Error.sys.INVALID_VIDEO_MODE

2
DSS/build.txt
View File

@ -1 +1 @@
187 218

2
SHELL/Commands/ECHO.ASM
View File

@ -35,7 +35,7 @@ A862E: ld a,(echo_mode) ; 䫠
ld de,7 ; ¨­¤¥ªá "on" ld de,7 ; ¨­¤¥ªá "on"
jr nz,$+5 ; false jr nz,$+5 ; false
ld de,8 ; ¨­¤¥ªá "off" ld de,8 ; ¨­¤¥ªá "off"
call A8BC6 ; ­ ©â¨ áâப㠯® ¨­¤¥ªáã call FMESAGE ; ­ ©â¨ áâப㠯® ¨­¤¥ªáã
ld de,PRM1 ; ªã¤  ( à£ã¬¥­â %1) ld de,PRM1 ; ªã¤  ( à£ã¬¥­â %1)
call ncopy_string ; ᪮¯¨à. áâபã (á ­ã«¥¬), ¬ ªá.15 ᨬ¢. call ncopy_string ; ᪮¯¨à. áâபã (á ­ã«¥¬), ¬ ªá.15 ᨬ¢.
ld de,6 ; ¨­¤¥ªá "Echo is %1" ld de,6 ; ¨­¤¥ªá "Echo is %1"

12
SHELL/ERROR.ASM
View File

@ -8,7 +8,7 @@ print_err_message:
inc de inc de
ld hl,ERR0 ; ¬ áᨢ áâப ld hl,ERR0 ; ¬ áᨢ áâப
ld bc,ERR0.Size ; à §¬¥à ¬ áᨢ  ld bc,ERR0.Size ; à §¬¥à ¬ áᨢ 
call A8BCD ; ­ ©â¨ áâபã call LCPIR ; ­ ©â¨ áâபã
call PRINTZ ; ä®à¬ â. ¢ë¢®¤ áâப¨ call PRINTZ ; ä®à¬ â. ¢ë¢®¤ áâப¨
call newline call newline
jp newline jp newline
@ -28,7 +28,7 @@ invalid_param:
; ¢å®¤: de=¨­¤¥ªá áâப¨ ; ¢å®¤: de=¨­¤¥ªá áâப¨
;------------------------------------------------- ;-------------------------------------------------
MESSAGE: MESSAGE:
call A8BC6 ; ­ ©â¨ áâப㠯® ¨­¤¥ªáã call FMESAGE ; ­ ©â¨ áâப㠯® ¨­¤¥ªáã
jp PRINTZ ; ä®à¬ â. ¢ë¢®¤ áâப¨ jp PRINTZ ; ä®à¬ â. ¢ë¢®¤ áâப¨
;jp A82CC ; 㧭 âì ¨ ãáâ. ¯®«®¦. ªãàá®à  ;jp A82CC ; 㧭 âì ¨ ãáâ. ¯®«®¦. ªãàá®à 
@ -36,14 +36,14 @@ MESSAGE:
; <20> ©â¨ áâப㠯® ¨­¤¥ªáã ; <20> ©â¨ áâப㠯® ¨­¤¥ªáã
; ¢å®¤: de=¨­¤¥ªá áâப¨ ; ¢å®¤: de=¨­¤¥ªá áâப¨
; ¢ë室: hl=áâப  ; ¢ë室: hl=áâப 
A8BC6: inc de FMESAGE: inc de
ld hl,MSG0 ; ­ ç «® ¬ áᨢ  áâப ld hl,MSG0 ; ­ ç «® ¬ áᨢ  áâப
ld bc,MSG0.Size ; à §¬¥à ¬ áᨢ  ld bc,MSG0.Size ; à §¬¥à ¬ áᨢ 
A8BCD: xor a LCPIR: xor a
cpir cpir
ret po ret po
ret nz ret nz
;R11 ;R11
XOR A XOR A
CP (HL) CP (HL)
JR Z,.no_mess JR Z,.no_mess
@ -51,7 +51,7 @@ A8BCD: xor a
dec de dec de
ld a,d ld a,d
or e or e
jr nz,A8BCD jr nz,LCPIR
ret ret
.no_mess: INC HL .no_mess: INC HL
RET RET

7
SHELL/SHELL.ASM
View File

@ -450,13 +450,16 @@ D8996: ret z
Restore_Screen: Restore_Screen:
PUSH AF
LD C,Dss.GetVMod LD C,Dss.GetVMod
RST ToDSS RST ToDSS
AND #80 AND #80
RET Z JR Z,.exit
LD BC,1 * 256 + Dss.SetVMod LD BC,1 * 256 + Dss.SetVMod
LD A,Dss.SetVMod.txt80x32 LD A,Dss.SetVMod.txt80x32
JP ToDSS RST ToDSS
.exit: POP AF
RET

2
SHELL/build.txt
View File

@ -1 +1 @@
55 56

2
Shared_Includes

@ -1 +1 @@
Subproject commit 361bce691cf4130a703e57b8fc7b3b87d3b929de Subproject commit cc0bf0dfac766dd97e7a5441b523034921cf3830