CD audio quickfix for JonoF's port

[Arkion]

Hello all!
I wrote a quick'n'dirty CD audio support for windows version of JonoF's port. CD support is implemented using windows Multimedia Control Interface and Mixer APIs. This meant to be a temporary solution until JonoF gets next version of his port ready.

Download JFSW_CDA.zip from http://www.angelfire.com/alt/arkion . Sorry about the horrible quality of the web page, but angelfire makes it a real mess with those ads an all.

Aforementioned zip contains the pre-compiled Debug build executable (hence the 2+ MB size) and relevant source code files (cd.c is modified, cd_mx.c and cd_mx.h are new), so you can alternatively compile it yourself by merging these files with JFSW sources.

Unfortunately save games are still not functional - coming up with a portable solution seems to be very tricky and will take some time.

[Maren Gnawol]

Thank you, I'm about to give it a shot

[WarHammer]

Nice. Makes Shadow Warrior that much more playable. Saving would be nice but the shoddy mouse aim is my primary concern.

Frustrating though that I could only get it to play CD audio with the CD in my DVD±RW drive (E and not my otherwise worthless CD-ROM drive (F.

[djimd]

Yep - with many of the old cd audio games you can only have cd audio playing if the cd is in the cdrom with the highest letter - some games only accept letter D. ( So if you were to change the letters of your cd roms you could easily get the game to play from the one you like )
Nice fix tho - works a treat - Even better when ogg support comes in. - Don't suppose you can make a quick fix for this?

[tpz]

Thank you... It works like a charm.

I wonder however, why your build of sw.exe is so much smaller then JonoF's. Did you rip out a lot of code?

[Arkion]

You're welcome.

If I remember correctly, exe from my build was bigger than JonoF's. Main reason for this is that mine is a debug build and no optimizations are enabled. Also, I combined the engine and game codebases into single project and made it a Visual Studio Solution, instead of using the old makefile-only project. Thus, some settings could differ from the makefile ones.

MCI probably automatically picks the CD drive with lowest drive letter in case there are multiple drives installed, so that's the reason why only one of them works.

[JonoF]

On my machine with two physical drives (I:, J and a virtual one from Daemon Tools (K, the physical drive with the highest drive letter is the default CDA device. I haven't yet seen any way to change that in Windows, but you can instruct MCI to use a specific drive if you use the mciSendCommand() interface like so:

MCI_OPEN_PARMS mop;
CHAR drive[4] = "K:";

memset(&mop, 0, sizeof(mop));
mop.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO;
mop.lpstrElementName = drive;

if (mciSendCommand(0, MCI_OPEN,
    MCI_WAIT|MCI_OPEN_SHAREABLE|MCI_OPEN_TYPE|
    MCI_OPEN_TYPE_ID|MCI_OPEN_ELEMENT,
    (DWORD)&mop)) /* error */;

I would release more frequent versions of the ports for testing and bleeding-edge diehards to use if it weren't for the frustratingly long time it takes to prepare new source and binary packages and put them online. Hopefully I can streamline my processes more to make it less of a hassle.

PS. Savegames are the next item on my "to-tackle" list right after I sort out the input problem that I'm working on at the moment. After that's done, I'm pretty much in a position for the next release.

Jonathon

[Blade Nightflame]

I hope the Crash Bomb bug is fixed, it's kinda stupid to have a Sticky Bomb that crashes the game, not explodes. XD;;

[Viciarg]

JonoF said:
PS. Savegames are the next item on my "to-tackle" list right after I sort out the input problem that I'm working on at the moment. After that's done, I'm pretty much in a position for the next release.

mmh...savegames...working mouse...cd audio?

[Maren Gnawol]

Just reporting it's working flawlessy here.

[Arkion]

I haven't yet seen any way to change that in Windows, but you can instruct MCI to use a specific drive if you use the mciSendCommand() interface like so:

Thanks for the pointer, Jonathon. However, we need to add a new menu item to Sound Options menu or a .cfg file entry to pick the CD drive to be used. Personally, I prefer the former option.

I hope the Crash Bomb bug is fixed, it's kinda stupid to have a Sticky Bomb that crashes the game, not explodes. XD;;

That's weird - Sticky Bombs work flawlessly for me with my SW.EXE.

I'm going to tackle on the savegame problem as well and see what can be done. Having no savegame functionality is extremely frustrating, especially on higher skill levels. I must admit that it's really difficult stay alive for long in SW

[JonoF]

My solution to the savegame problem appears to hold water, so the next release definitely will have working savegame support.

Jonathon

[SamSwashbuckler]

Any idea when we can expect that? (Please don't let this be another WID!)
/me wants.... :P

[TerminX]

JonoF said:
My solution to the savegame problem appears to hold water, so the next release definitely will have working savegame support.

Jonathon

I see the commits to the tree for savegame support, but I can't test them out for a couple of days. Convenient time for the hard disk in my Windows machine to go FUBAR, no? Actually, hmm..

-- 1 minute later --

Well, with a few minor changes to the source (slightly misplaced #ifdef RENDERTYPEWIN in cd.c, missing include "baselayer.h" in rts.c) it builds and runs on Linux, but keyboard input seems to be messed up. No testing for me, I guess.

[Arkion]

My solution to the savegame problem appears to hold water, so the next release definitely will have working savegame support.

That's great news! I thought fixing this symbol table dilemma was near impossible without rewriting much of SW codebase and had to give up.

How'd you manage to store pointers in a file and make sure they are still valid when loaded from the file, possibly after restarting the application, is beyond me. Isn't that what the symbol table is all about? Oh well...

[JonoF]

The method I'm using is to bring the symbol table into the program itself by constructing tables of saveable code and data in each module of the game. The new symbol lookup code then searches the saveable code/data tables of each module for a match and converts that into a "module, ordinal" pair for code and a "module, ordinal, offset" triplet for data. The downside of this is the tables for each module need to be constructed and maintained by hand but thankfully that job is made easier with a text editor capable of regular expressions and only some bits of the game really need to be saved. Basically, wherever in the SaveGame function you see a SaveSymDataInfo or SaveSymCodeInfo call, the data it could potentially point to is what goes into the saveable tables. My tests so far have indicated saving is quite feasible which makes loading then similarly straightforward since it's just a reversal of the process.

Jonathon

[Ras]

Will the new version have a way to choose which CD drive to use from the menu? Thanks for getting the saves working. Can't wait.

[JonoF]

I've got three things in the works at the moment which when they're complete will signal the release being ready:

• save-games
• fixed input code
• start-up configuration window

Selection of a CD Audio drive will happen in the third item. If you've run the Build editor for JFSW you'll have seen an example of the startup config window in an early form.

Jonathon

[Ras]

Thanks! I really look forward to it.

[Another Duke Fan]

Just one question: "Failed setting buffering: DI_POLLEDEVICE", related to joystick misconfiguration, that led to disabled mouse & keyboard in game, is that now being fixed?
Thank you for all your great effort!! Really looking forward to the new JFSW!

[JonoF]

Yeah, that's taken care of. DI_POLLEDDEVICE isn't a failure code but my daft use of DirectInput forgot that.

Jonathon

[JonoF]

Saved games now work.

Jonathon

[TerminX]

JonoF said:
Saved games now work.

Jonathon

Yes, yes they do. I haven't had any save related failures at all in the test copies I've built. You're awesome, man.

[djimd]

TerminX said:

Yes, yes they do. I haven't had any save related failures at all in the test copies I've built. You're awesome, man.

GOOD stuff - look forward to trying a copy.

[Lt.Phobos]

I don't get how you can compile the files in the cd audio zip with the jwshadow warrior source code?

[TerminX]

Lt.Phobos said:
I don't get how you can compile the files in the cd audio zip with the jwshadow warrior source code?

You probably need to modify the Makefile to build and link cd.o and cd_mx.o.

[Mephisto]

Speaking of joystick, does joystick finally work on Linux now? And does it support all 8 buttons and 4 axes, like the config file claims? (cause i could never get more than 4 buttons and 2 axes to work on the dos version). It's kinda pointless using a joystick in a 3d shooter with only 2 axes, cause you need at least 4 to be able to turn around and look at the same time.

[edit:] and how about ignoring the setting for ControllerType and have it use everything at the same time, like all modern games? I don't know if it's possible within the code though, its just a suggestion, but modern games let you use joystick and mouse at the same time.

[edit2:] just curious though, whats that with music during games? i personally turn off *all* music in every game because it gets repetative quickly and distracts from the real game, and certainly doesnt belong in "reality games" (like those army shooters), cause you dont hear any music on a *real* battlefield. I know, shadow warrior has nothing to do with reality, but in SW its even worse: you have to put a CD in. I always use no-cd cracks because i dont want to put no CD in. Oh well, it seems to be getting more like a rant now though, so i'll just quit before i start on copy protections and the uselessness of that.

[JonoF]

Mephisto said:
Speaking of joystick, does joystick finally work on Linux now?

I've written some SDL joystick code for the next release and it was fine on Windows so I can see no reason why it wouldn't work on Linux.

and how about ignoring the setting for ControllerType and have it use everything at the same time, like all modern games?

I plan on doing that in the near future. The last time I tried it there were problems.

Jonathon

[Blade Nightflame]

By the way, how's the JFDuke3d port coming along? Or is that delayed until JFSW is working properly again?