Skip to content

Update cnc-ddraw.yml #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update cnc-ddraw.yml #290

wants to merge 4 commits into from

Conversation

MikaMika
Copy link

New repo FunkyFr3sh/cnc-ddraw: previous from CnCNet/cnc-ddraw no longer exists. Updated from v4.4.8.0 to v7.0.0.0

Fixes #289

Type of change

  • New dependency
  • Manifest fix
  • Other

Was this tested using a local repository?

  • Yes
  • No

New repo FunkyFr3sh/cnc-ddraw: previous from CnCNet/cnc-ddraw no longer exists.
Updated from v4.4.8.0 to v7.0.0.0
@MikaMika
Copy link
Author

I chose v7.0 in favor of v7.1 as I encountered a black screen issue in StarCraft Classic with the most recent one. I'm filing an Issue there to get it fixed, then this dependency could be updated when v7.2 or v7.3 releases.

Copy link
Contributor

@jntesteves jntesteves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR. It's looking good, except the shaders. I've looked into the new zip file, and there are new shaders that won't be matched by the glob *.glsl because they are named .glsl.pass1 for a couple multi-pass shaders. I think all the globs should be changed to something like *.* or maybe even just * if that works because we really want to copy all files in these folders no matter what they are called.

Also, a couple shaders were removed in this release. The cubic and windowed folders don't exist anymore.

MikaMika added 2 commits May 10, 2025 21:01
archive_extract returns an error code 2 with most zip provided by FunkyFr3sh/cnc-ddraw. Seems to be related to 'cnc-ddraw config.exe' being extracted as a directory and crashing 7z. A solution would be to append an argument to extract only a selection of files and avoid the one crashing, but I cannot figure out this action. As an alternative, cnc-ddraw-experimental-debuglog.zip does not contain the problematic exe and the extraction is successful, although without Shaders. The priority is still to provide a working dll for software requiring it, while Shaders are not necessary.
@MikaMika
Copy link
Author

Sorry for not testing using a local repo earlier: I thought it would be a simple url fix.
I have done the testing now and found out this:
archive_extract returns an error code 2 with most zip provided by FunkyFr3sh/cnc-ddraw. Seems to be related to 'cnc-ddraw config.exe' being extracted as a directory and crashing 7z. A solution would be to append an argument to extract only a selection of files and avoid the one crashing, but I cannot figure out this action. As an alternative, cnc-ddraw-experimental-debuglog.zip does not contain the problematic exe and the extraction is successful, although without Shaders. The priority is still to provide a working dll for software requiring it, while Shaders are not necessary.

@MikaMika MikaMika requested a review from jntesteves May 10, 2025 21:36
@MikaMika
Copy link
Author

Sorry for more changes, I realized I made some mistakes:

  • The cnc-ddraw-experimental-debuglog includes a FPS counter at the top-left corner, which should not be for user.
  • Reverting to v7.0.0.0, as the 7z bug is due to the version 17.05 included in the Flatpak and should be reported there instead. I have reported to FunkyFr3sh the black screen bug in v7.1.0.0 and waiting for a fix.
  • Copying all files with *.* instead of each file types. * will try copying directories and error.
  • Copying only win32/Shaders/interpolation/catmull-rom-bilinear.glsl as this is the default one in ddraw.ini, all other shaders are available in win32/Shaders/shader-package.zip.

I'm preparing to file an issue for https://github.com/flathub/com.usebottles.bottles/blob/master/com.usebottles.bottles.yml to use another version of 7-zip, and the extract bug should be resolved.

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.

[Report] cnc-ddraw
2 participants