CINE: Add support for Operation Stealth. #2365
Conversation
Add support for Operation Stealth PC 16 and 256 color versions with AdLib and Roland MT-32 sound. Add support for 20 extended savegames (Thumbnails, playtime etc) for both Future Wars and Operation Stealth (20 because it fits on screen using the original save/load interface). Details: - Add versioning to Future Wars and Operation Stealth savegames. - Add fade in effect to both Future Wars and Operation Stealth. - Add mouse wheel support and keyboard support to moving in menus. - Map middle mouse button to pressing both left and right buttons. - Make interface more responsive (See manageEvents() and drawFrame()). - Amiga versions should be completable but sound may or may not work. - Atari ST versions completely untested. Game options currently supported: - Using original save/load interface - Using transparent dialog boxes in 16 color scenes (Also for PC) Console commands currently supported: - labyrinthCheat (For cheating in Operation Stealth's labyrinths) - disableLabyrinthCheat (Disabling labyrinth cheat) - disableHacks (Disabling hacks, useful for testing) - enableHacks (Enabling hacks, useful for testing. On by default)
|
👉 View analysis in DeepCode’s Dashboard | Configure the bot |
Change structure initialization from C++11 style to older style to fix clang compilation. Add null check to fix DeepCode warning about possible undefined behaviour.
|
Now I'm just waiting for somebody (e.g. @sev- or anybody) to review or merge this. Thank you very much! Kari Salminen |
engines/cine/anim.cpp
Outdated
| g_cine->getPlatform() == Common::kPlatformDOS && | ||
| g_sound->musicType() != MT_MT32 && | ||
| (strstr(resourceName, ".SPL") || strstr(resourceName, ".H32"))) | ||
| { |
There was a problem hiding this comment.
The code formatting is off. The parentheses must stick to the previous line.
There was a problem hiding this comment.
Taken into account.
engines/cine/anim.cpp
Outdated
|
|
||
| for (int i = 0; i < ARRAYSIZE(resNameMapping); i++) { | ||
| if (scumm_stricmp(base, resNameMapping[i].from) == 0) { | ||
| strncpy(base, resNameMapping[i].to, sizeof(base)); |
There was a problem hiding this comment.
This is incorrect. Either use sizeof(base) - 1 or better use Common::strlcpy()
There was a problem hiding this comment.
Taken into account (strlcpy).
engines/cine/anim.cpp
Outdated
| } | ||
| } | ||
|
|
||
| const char* ext = (g_sound->musicType() == MT_ADLIB) ? ".ADL" : ".HP"; |
There was a problem hiding this comment.
Incorrect code formatting. char *ext
There was a problem hiding this comment.
Taken into account.
engines/cine/anim.cpp
Outdated
| char base[20]; | ||
| removeExtention(base, resourceName); | ||
|
|
||
| for (int i = 0; i < ARRAYSIZE(resNameMapping); i++) { |
There was a problem hiding this comment.
Taken into account.
engines/cine/detection.cpp
Outdated
| delete out; | ||
|
|
||
| // Delete save file | ||
| char saveFileName[256]; | ||
| sprintf(saveFileName, "%s.%1d", target, slot); | ||
| const char * saveFileName = getSavegameFile(slot, target); |
There was a problem hiding this comment.
Taken into account.
| @@ -166,24 +175,39 @@ static void processEvent(Common::Event &event) { | |||
| case Common::KEYCODE_KP3: | |||
| moveUsingKeyboard(+1, -1); // Down & Right | |||
| break; | |||
| case Common::KEYCODE_LEFT: | |||
There was a problem hiding this comment.
Maybe it is too much to ask, but if you could take a look into the new keymapper code (see Wintermute engine), that would be awesome.
There was a problem hiding this comment.
Ah, here is how to do it: https://wiki.scummvm.org/index.php?title=Keymapper
There was a problem hiding this comment.
Yes, this is too much to ask at this point. So, not taken into account.
engines/cine/pal.cpp
Outdated
|
|
||
| const Color firstColor = _colors[firstIndex]; | ||
|
|
||
| for (int i = firstIndex; i < lastIndex; i++) |
There was a problem hiding this comment.
Taken into account.
Fix code formatting, string copying (strncpy -> strlcpy) and signedness (int -> uint).
Thanks!
I submitted a commit fixing all but the keymapper code.
I can fix the Coverity issues if any come up recently after merge. Kari Salminen |
|
Great! I am merging this and will announce the support in couple of days. |
|
@karisal Could you please make 3-4 interesting screenshots which I could put to the announcement on Facebook? One could be the game title. |
|
Hi @SEV,
sorry, I am busy for the next 8 days
at least and can't help. Maybe someone
else can do this in the meanwhile or
if it is not urgent then I might be able
to look into this later. My schedule is
quite unpredictable and/or busy
right now for the next couple of
weeks.
su 9. elok. 2020 klo 0.24 Eugene Sandulenko <notifications@github.com>
kirjoitti:
… @karisal <https://github.com/karisal> Could you please make 3-4
interesting screenshots which I could put to the announcement on Facebook?
One could be the game title.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#2365 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAFF55UZN7H3I4KP25VCQNTR7W7AJANCNFSM4OX7SVUQ>
.
|
In Future Wars the command line was not always updated and thus failed sometimes to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only when it should have read "EXAMINE scaffolding" because the mouse cursor was on the scaffolding). Now we just always update the command line for both Future Wars and Operation Stealth which seems to fix the command line updating. I think this probably was a regression caused by adding support for Operation Stealth (i.e. pull request scummvm#2365) and the efforts made in it to make the user interface responsive.
In Future Wars the command line was not always updated and thus failed sometimes to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only when it should have read "EXAMINE scaffolding" because the mouse cursor was on the scaffolding). Now we just always update the command line for both Future Wars and Operation Stealth which seems to fix the command line updating. I think this probably was a regression caused by adding support for Operation Stealth (i.e. pull request scummvm#2365) and the efforts made in it to make the user interface responsive.
In Future Wars the command line was not always updated and thus failed sometimes to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only when it should have read "EXAMINE scaffolding" because the mouse cursor was on the scaffolding). Now we just always update the command line for both Future Wars and Operation Stealth which seems to fix the command line updating. I think this probably was a regression caused by adding support for Operation Stealth (i.e. pull request #2365) and the efforts made in it to make the user interface responsive.
In Future Wars the command line was not always updated and thus failed sometimes to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only when it should have read "EXAMINE scaffolding" because the mouse cursor was on the scaffolding). Now we just always update the command line for both Future Wars and Operation Stealth which seems to fix the command line updating. I think this probably was a regression caused by adding support for Operation Stealth (i.e. pull request #2365) and the efforts made in it to make the user interface responsive.
Hello!
Here's support for Operation Stealth PC 16 and 256 color versions with AdLib and Roland MT-32 sound.
The support is based on disassembly of PC versions of Future Wars and Operation Stealth using Interactive Disassembler.
Unfortunately the support is just a single commit because I simply worked on it locally until it worked. I'm just now starting to learn using Git (Previously I used SVN) but already it looks like it's a lot more powerful than SVN.
I think with this Operation Stealth is ready for testing, at least the PC versions. Amiga versions may work (Not sure about their audio side). Atari ST versions are completely untested.
Kari Salminen