Skip to content

[pull] master from diasurgical:master#261

Merged
pull[bot] merged 4 commits intoMu-L:masterfrom
diasurgical:master
Sep 1, 2025
Merged

[pull] master from diasurgical:master#261
pull[bot] merged 4 commits intoMu-L:masterfrom
diasurgical:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Sep 1, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.3)

Can you help keep this open source service alive? 💖 Please sponsor : )

Updated SDL has better keyboard handling, including arrow keys and text
input support.
1. Prevents warnings in `--verbose` mode from unimplemented `SDL_GetBase/PrefPath`.
   These were the first 4 "This operation is not supported" messages
   that were logged previously.

2. Removes Linux directories from MPQ search paths on DOS.

3. Uses backslash directory separator on DOS.
   DJGPP libc supports both but this is DOS, we should use backslash.

Now the `--verbose` SDL_LOG.txt looks much cleaner:

```
VERBOSE: Paths:
    base:
    pref:
  config:
  assets: assets\
VERBOSE: MPQ search paths:
     1. ''
VERBOSE:   Found: devx in
VERBOSE: Missing: fonts
DEBUG: DOS: Keyboard ISR code size is 48 bytes
DEBUG: Unknown pixel format
DEBUG: SVGA: Ignoring mode 0x102: Bad attributes
DEBUG: SVGA: Ignoring mode 0x104: Bad attributes
DEBUG: SVGA: Ignoring mode 0x106: Bad attributes
DEBUG: SVGA: Ignoring mode 0x107: No double-buffering
DEBUG: SVGA: Ignoring mode 0x112: No double-buffering
DEBUG: SVGA: Ignoring mode 0x115: No double-buffering
DEBUG: SVGA: Ignoring mode 0x116: No double-buffering
DEBUG: SVGA: Ignoring mode 0x117: No double-buffering
DEBUG: SVGA: Ignoring mode 0x209: No double-buffering
DEBUG: SVGA: Ignoring mode 0x20A: No double-buffering
DEBUG: SVGA: Ignoring mode 0x225: No double-buffering
DEBUG: SVGA: VBE lists 42 modes
VERBOSE: Removed file: Diablo1ReadOnlyTest.foo
VERBOSE: Paths:
    base:
    pref:
  config:
  assets: assets\
VERBOSE: MPQ search paths:
     1. ''
VERBOSE: Paths:
    base:
    pref:
  config:
  assets: assets\
VERBOSE: MPQ search paths:
     1. ''
VERBOSE:   Found: DIABDAT in
VERBOSE: Missing: hfbard
VERBOSE: Missing: hfbarb
DEBUG: That operation is not supported
VERBOSE: Control: device None -> KeyboardAndMouse, mode None -> KeyboardAndMouse
```
I tried the interrupt handler approach but couldn't get it to work,
so for now we're back to loading and updating the progress bar
synchronously on DOS.
There are still some glitches in screen transitions but that's probably
our fault. We can improve it later.
@pull pull bot locked and limited conversation to collaborators Sep 1, 2025
@pull pull bot added the ⤵️ pull label Sep 1, 2025
@pull pull bot merged commit 50ac397 into Mu-L:master Sep 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant