Commit Graph
3264 Commits
Author SHA1 Message Date
Johannes Schickel f78e12cd5c SCUMM: Dynamically allocate hw channels for SFX in AD player. 2014-06-04 01:49:31 +02:00
Johannes Schickel 02f47dd497 SCUMM: Allow multiple SFX to be played at once with AD.
Actually, even before this change it was possible. However, since we formerly
used the original channel specification it was not possible when two sfx were
started on the same channel. Now we can play such sounds simultaneously again.
This is a first step towards a AdLib support level we had when we tried to
convert SFX to MIDI to play it through iMuse. However, now we still play the
sound effects properly, i.e. they still sound like in the original.
2014-06-04 01:49:31 +02:00
Johannes Schickel b5ca6b01f9 SCUMM: Clean up how SFX are stopped in the AD player. 2014-06-04 01:49:31 +02:00
Johannes Schickel ecabacaddd SCUMM: Properly unlock sound resources when reusing sfx slots in AD code. 2014-06-04 01:49:31 +02:00
Johannes Schickel 99f9756992 SCUMM: Further cleanup in AD SFX code. 2014-06-04 01:49:30 +02:00
Johannes Schickel 7ad0e135e6 SCUMM: Further refactor AD SFX code. 2014-06-04 01:49:30 +02:00
Johannes Schickel c50f6af8f7 SCUMM: Always work directly on Channel data in AD code. 2014-06-04 01:49:30 +02:00
Johannes Schickel fa6779c7a7 SCUMM: Store hardware channel number explicitly in Channel structure in AD code. 2014-06-04 01:49:30 +02:00
Johannes Schickel f95d28b74e SCUMM: Replace some more constants with named enum values in AD code. 2014-06-04 01:49:30 +02:00
Johannes Schickel 7b96217c11 SCUMM: Fix sfx resource unlocking in AD player. 2014-06-04 01:49:30 +02:00
Johannes Schickel a1d36da506 SCUMM: Move notes into SFX channel structure in AD player. 2014-06-04 01:49:30 +02:00
Johannes Schickel 70789f3964 SCUMM: Further SFX note related cleanup in AD player. 2014-06-04 01:49:30 +02:00
Johannes Schickel ffbd6a8432 SCUMM: Only keep music data variable for music around in AD code. 2014-06-04 01:49:30 +02:00
Johannes Schickel 13af131775 SCUMM: Introduce symbolic names for channel/note states in AD code. 2014-06-04 01:49:30 +02:00
Johannes Schickel 703f1eef48 SCUMM: Slight cleanup in SFX register code in AD player. 2014-06-04 01:49:29 +02:00
Johannes Schickel e71c841ca0 SCUMM: Small cleanup in SFX note setup in AD code. 2014-06-04 01:49:29 +02:00
Johannes Schickel 8b7672b64c ALL: Introduce typesafe Debugger::registerVar functions.
This also adds a FIXME to SCI which registered an enum type as int...
2014-05-27 02:04:08 +02:00
Johannes Schickel 30d64edac4 ALL: Make Debugger command function names conform to our guidelines. 2014-05-27 02:04:08 +02:00
Johannes Schickel ae4ffe01f0 ALL: Rename Debugger::DCmd_Register to Debugger::registerCmd. 2014-05-27 02:04:08 +02:00
Johannes Schickel 0adca2c579 ALL: Rename Debugger::DVar_Register to Debugger::registerVar. 2014-05-27 02:04:07 +02:00
Johannes Schickel daa8d57a86 ALL: Rename Debugger::DebugPrintf to Debugger::debugPrintf. 2014-05-27 02:04:07 +02:00
D G Turner e065b24d56 SCUMM: Remove "level" command from debugger. Replaced by "debuglevel".
This required a small amount of extra code changes to ensure that
_debugMode is kept in sync when the debugger is used to change the
level.
2014-05-13 15:14:54 +01:00
Max Horn 8638b29b89 SCUMM: Avoid potential issues casting invalid values to enum
A compiler could in principle decide that a ResType enum can
never equal 0xFF or 0xFFFF, and thus incorrectly optimize
the ScummEngine::saveOrLoad code. So check the value
*before* casting it.
2014-03-30 19:48:08 +02:00
Max Horn 4d02f67bd1 ALL: Resolve multiple clang warnings 2014-03-30 14:38:02 +02:00
D G Turner f4e7b593dc SCUMM: Fix bug #6009 "DC: FT/Dig - Sound disappears when VMU save fails"
This was introduced by fd3970aa52:
Apply patch #2984508 - "GSoC: SCUMM stopped audio from playing while
saving"

This was not quite correct as if the save fails, the function exits
without unpausing the engine, which resulted in sound and music
remaining muted. This corrects the logic to unpause in all cases.
2014-03-18 22:49:36 +00:00
Johannes Schickel c64ba32678 SCUMM: Define symbols before actually using them in proc3ARM.s. 2014-03-09 16:08:50 +01:00
Johannes Schickel fa2297f6b7 SCUMM: Manually specify function alignment in ARM assembly. 2014-03-06 20:21:47 +01:00
Strangerke a675ac09c2 SCUMM: Some British to American english 2014-02-19 21:45:23 +01:00
Johannes Schickel 3847465163 SCUMM: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Strangerke 85b3526860 SCUMM: Janitorial - Remove trailing spaces 2014-02-16 18:39:02 +01:00
Johannes Schickel 4349ee8b3b SCUMM: Fix some GCC warnings. 2014-01-18 03:27:23 +01:00
clone2727 9d9ced0734 Merge pull request #366 from clone2727/he-saves-target-name
RFC: Make HE games use the target name in all save files
2014-01-17 15:59:44 -08:00
Johannes Schickel 10def6a435 SCUMM: Small formatting fix. 2013-11-27 19:32:08 +01:00
Johannes Schickel fdcb6a6b1a SCUMM: Cleanup querySaveMetaInfos implementation.
This results in less code and also less I/O operations (including seeking).
2013-11-27 19:29:21 +01:00
Johannes Schickel 3318c4e4ac SCUMM: Slight cleanup in detection.cpp. 2013-11-27 19:03:23 +01:00
Johannes Schickel d8d6faff01 SCUMM: Slight cleanup in savegame code. 2013-11-27 19:01:30 +01:00
Johannes Schickel f4cb2d35d4 SCUMM: Remove unsued method loadThumbnailFromSlot(int slot). 2013-11-27 18:26:16 +01:00
D G Turner ef85456859 BUILD: Remove need for engine.mk in each engine directory.
Each engine now only has to provide a single configure.engine file
adding the engine into the configure script, which then produces the
required other files automatically.
2013-11-24 00:48:01 +00:00
D G Turner 1ac01d2333 BUILD: Remove need for engine-plugin.h in engines.
This is now generated automatically by the configure script from the
engine directory names.
2013-11-24 00:48:01 +00:00
D G Turner 00c27a28f9 BUILD: Split engines/plugins_table header down to a file per engine.
This is the third and final commit enabling fully pluggable engines.

Now providing an engine folder contains a configure.engine, engine.mk
and engine-plugin.h file, it will be picked up automatically by the
configure script.
2013-11-24 00:48:01 +00:00
D G Turner d77cf95a18 BUILD: Split engines.mk down to a single file per engine.
This is the second part of allowing engines to be added dynamically.
Each folder in engines/ which must contain a file named "engine.mk"
containing the make definitions for that engine.
2013-11-24 00:48:01 +00:00
D G Turner aa947c9474 BUILD: Split configure.engines down to a single file per engine.
This is the first part of allowing engines to be added dynamically.
They are placed into a folder in engines/ which must contain a file
named "configure.engine" to add the engine, which is pulled into the
top level configure script automatically.
2013-11-24 00:45:38 +00:00
Eugene Sandulenko 2362498d54 SCUMM: Fix potential memory leak. CID 1003586 2013-11-03 01:28:03 +02:00
Filippos Karapetis 4f807ee53e SCUMM: More renaming for players
Rename "player" directory to "players", and reintroduce the "player_"
file prefix. This has been done after sev's request.
"players/player_foo.*" is more descriptive, and avoids potential name
clashes in libraries
2013-11-01 19:26:51 +02:00
Filippos Karapetis 651bf89939 SCUMM: Move all players to a separate "player" directory
There are 34 player .cpp/.h player files, so they have been placed in
their own directory, to logically separate them from the rest of the
engine
2013-11-01 06:57:53 +02:00
Matthew Hoops 3bfd422205 SCUMM: Make all HE saves prepend the target name
This makes HE follow the ScummVM convention of using the target name everywhere. It also fixes having more than one team in both soccer and football.

Loading old saves will still work and they will be tried if the newer save names are not found.
2013-10-05 15:45:36 -04:00
Rodrigo Rebello be2f292457 SCUMM: Fix unused variable warnings 2013-10-03 01:47:02 -03:00
Kirben 987bb6d454 SCUMM: Add US Windows preview of Humongous Catalog. 2013-09-27 15:50:36 +10:00
Johannes Schickel 01dea8bd67 Merge pull request #378 from lordhoto/pluggable-engines-translations
RFC: Pluggable Engines: I18N: Move specification of engine specific files to enginedir/POTFILES
2013-09-12 15:38:13 -07:00
Eugene Sandulenko c2161b9564 Merge pull request #360 from lordhoto/scumm-ad
SCUMM: Implement original AD AdLib output.
2013-09-12 10:58:08 -07:00