Skip to content

Commit 1522d82

Browse files
committed
Fix for file manager and more
- Changed sounds used by the sound command and error sound of TrashVIm to depper sounds. - Fixed VgaGotoPos not behaving correctly. - Updated READMEs images. - Fixed file manager writing error string outside of the screen.
1 parent 5672ce5 commit 1522d82

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

Kernel/Screen/VGA.asm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,11 @@ VgaGotoPos:
351351
; (bh * VgaColumns + bl) * 2
352352
xor ax, ax
353353
xchg al, bh
354-
mov dx, VgaColumns * 2
354+
mov dx, VgaColumns
355355
mul dx
356356
add ax, bx
357+
mov cl, 1
358+
shl ax, cl
357359

358360
mov word [cs:CursorPos], ax
359361
call VgaSetCursor

Kernel/ShellCommands.asm

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,8 @@ TimeCmd:
258258

259259

260260
SoundCmd:
261-
mov bx, word 500
262-
call PlaySound
263-
264-
mov cx, 0x1
265-
mov dx, 0x3000
266-
mov ah, 0x86
267-
int 0x15
261+
lea si, SoundPlayTrack
262+
call PlayTrack
268263

269264
jmp GetCommand.AddNewLine
270265

@@ -416,6 +411,8 @@ HelpText: db " clear = clears the terminal", NewLine, " ls = list all files",
416411
" standby = put system in standby", NewLine, " fetch = show system info", NewLine, " colour = change screen colours", NewLine, " sound = test the pc speaker playing a sound", NewLine, " himom = ???", 0
417412
HimomText: db "Mom: No one cares about you, honey", NewLine, "Thanks mom :(", 0
418413

414+
SoundPlayTrack: dw 6000, 6800, 6300, 5900, 5000, 0
415+
419416
TimeString: times 16 db 32
420417
db 0
421418

@@ -426,8 +423,8 @@ FetchLabel1: db "os ", 0
426423
FetchLabel2: db "ver ", 0
427424
FetchLabel3: db "ram ", 0
428425
FetchText1: db "MascOS", 0
429-
FetchText2: db "0.2.1", 0
430-
FetchText3: db "21.86KB / " ; I'm a genious, I removed the 0 here so it prints FetchTextRam too
426+
FetchText2: db "0.2.2", 0
427+
FetchText3: db "19.41KB / " ; I'm a genious, I removed the 0 here so it prints FetchTextRam too
431428
FetchTextRam: times 6 db 0
432429
FetchLogo0: db " _ ,/| ", 0
433430
FetchLogo1: db " '\`o.O' _", 0

Programs/FileManager.asm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Start:
122122

123123

124124
.CheckFile:
125+
jmp .UnknownFile
125126
lea di, TextFileExtension
126127
; cl already set
127128
call CheckFileExtension
@@ -153,8 +154,10 @@ Start:
153154

154155
.UnknownFile:
155156
push bx
157+
mov ah, 9
156158
mov bx, word 0x1808
157159
int 0x23
160+
158161
xor ah, ah
159162
mov al, byte [AccentColour]
160163
and al, 0xfc ; Red

Programs/TrashVim.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ ModeSelector:
144144
int 0x23
145145

146146
xor ah, ah
147-
mov bx, 600
147+
mov bx, 3000
148148
int 0x24
149149

150150
mov ah, byte 3

Showcase/MascOSShell.jpeg

3.81 KB
Loading

0 commit comments

Comments
 (0)