Skip to content

Cleanup and modernization#13

Merged
Tennessene merged 3 commits intomainfrom
cleanup-and-modernization
Dec 29, 2023
Merged

Cleanup and modernization#13
Tennessene merged 3 commits intomainfrom
cleanup-and-modernization

Conversation

@Tennessene
Copy link
Copy Markdown
Owner

I had to redo #12 because of conflicts

We should merge this, but the SHA codes are different because I wanted to change the date of a couple of commits to be more accurate. Also, some things need to be fixed. I had to change things temporarily just to get jDOSBox to run

If you let this method have memory.pages like it used to, it will throw an error saying pages is null. Normally it's 4096, so I added it just to get it working. The original problem must be fixed though. It was caused by the Java optimization

Also, the config parsers are now messed up for some reason. I tried fixing them and I think it's working, but it wasn't an issue before

if (Dosbox.control.ParseConfigFile(".dosbox" + File.separator + "dosbox-0.74.conf")) parsed_anyconfigfile = true;

Tennessene and others added 3 commits December 28, 2023 17:56
This was most likely for debugging, but I don't see a need for it. It doesn't seem good to throw deliberate exceptions anyway
A lot was done to update and optimize the code
Added the -noconsole option to mute console output
@Tennessene Tennessene merged commit 9554cdf into main Dec 29, 2023
@Tennessene Tennessene deleted the cleanup-and-modernization branch December 29, 2023 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant