Commit Graph
4076 Commits
Author SHA1 Message Date
Max Horn 92c896d883 Patch #2973290: Semicolon cleanup
svn-id: r48359
2010-03-22 20:28:08 +00:00
Max Horn cac0ac66e2 COMMON: Get rid of Common::StringList
svn-id: r48287
2010-03-18 15:54:40 +00:00
Max Horn c934642bdb COMMON: Move typedef StringList from str.h to new header str-array.h
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.

svn-id: r48282
2010-03-18 15:09:24 +00:00
Max Horn 77592b5690 Fix warning
svn-id: r48222
2010-03-10 11:26:27 +00:00
Torbjörn Andersson 65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return.
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
2010-03-10 06:39:23 +00:00
Max Horn 38bf3d0d3c SCI: Make EngineState parameter to INV_SEL explicit
svn-id: r48202
2010-03-08 21:54:07 +00:00
Max Horn 5e8743d0d6 SCI: Made some stuff static
svn-id: r48199
2010-03-08 20:12:17 +00:00
Max Horn 2e68de1e5a SCI: Turn kernel_sleep() into SciEvent::sleep()
svn-id: r48119
2010-02-23 22:47:53 +00:00
Max Horn 02201e937a SCI: Move SciGui::wait to EngineState::wait
svn-id: r48118
2010-02-23 22:44:46 +00:00
Max Horn da95a98203 SCI: Stop storing EngineState in SciGui32
svn-id: r48117
2010-02-23 22:41:20 +00:00
Filippos Karapetis cebb052e2c Added comments on the SCI0-SCI1.1 kernel function table differences
svn-id: r48100
2010-02-21 01:25:10 +00:00
Filippos Karapetis 24b0622e6f Removed dead code
svn-id: r48097
2010-02-20 23:30:59 +00:00
Max Horn ee1110a114 SCI: Reduce header interdependencies
svn-id: r48086
2010-02-17 23:38:43 +00:00
Max Horn 903b694574 SCI: Cleanup resource.h
svn-id: r48084
2010-02-17 23:37:32 +00:00
Max Horn 26b7f0bbb9 SCI: Remove hack in convertSierraGameId which caused a memory leak
svn-id: r48083
2010-02-17 23:36:50 +00:00
Matthew Hoops cf005b6238 SCI32 reorders the REF* subops in kMessage; fixes GK1 conversations.
svn-id: r48066
2010-02-15 17:10:40 +00:00
Max Horn b246c867df SCI: No need to set _executionStackPosChanged in kDisposeScript, as the callk opcode handler does that already
svn-id: r48064
2010-02-15 10:01:09 +00:00
Max Horn 975dbef0e5 SCI: Remove sound/audio.h include from engine/state.h
svn-id: r48063
2010-02-15 00:20:53 +00:00
Filippos Karapetis 07e405588d Moved the reference to AudioPlayer inside SciEngine (as it doesn't have a state, per se, and is static)
svn-id: r48059
2010-02-14 12:23:22 +00:00
Max Horn b9a11ddb0b SCI: Move language related code from EngineState to SciEngine
svn-id: r48052
2010-02-13 17:46:44 +00:00
Max Horn 06021f79ac SCI: Fix compiling with USE_OLD_MUSIC_FUNCTIONS enabled
svn-id: r48051
2010-02-13 17:46:05 +00:00
Max Horn e45f0f309a SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead
svn-id: r48050
2010-02-13 17:45:40 +00:00
Max Horn 9575cc08a2 SCI: Move GameFeatures from EngineState to SciEngine
svn-id: r48049
2010-02-13 17:44:58 +00:00
Max Horn a82939c9be SCI: Get rid of EngineState::resMan
svn-id: r48048
2010-02-13 17:44:19 +00:00
Max Horn 721a57a661 SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine
svn-id: r48047
2010-02-13 17:43:31 +00:00
Max Horn ac4d325e0d SCI: Add global g_sci pointer to the active SciEngine instance
svn-id: r48046
2010-02-13 17:42:49 +00:00
Max Horn e17a2bd37d SCI: Change getSciVersionDesc() to return 'const char *' instead of 'Common::String'
svn-id: r48044
2010-02-13 11:58:15 +00:00
Walter van Niftrik a3a07f19fc SCI: Revert r47929 (bad idea, as we may run out of offsets). Instead, adapt SCI32 list iteration code to store node successor before invoking.
svn-id: r48036
2010-02-12 02:23:28 +00:00
Matthew Hoops 7147f8577e Search through arrays for outgoing references to fix possible garbage collector problems; minor cleanup.
svn-id: r47989
2010-02-08 15:51:00 +00:00
Max Horn 024e762bdb SCI: Move bulk of op_callk code to new func callKernelFunc()
svn-id: r47979
2010-02-07 17:57:51 +00:00
Max Horn 95b90fc40d SCI: cleanup; try to unify var names when reading PMachine instructions a bit
svn-id: r47978
2010-02-07 17:57:25 +00:00
Max Horn 2cc301e449 SCI: Simplify yet another case of weird 'unsigned to signed' conversion
svn-id: r47977
2010-02-07 17:56:57 +00:00
Matthew Hoops 7731ded5af Update comments in autoDetectSci21KernelType() explaining what we're checking for.
svn-id: r47973
2010-02-07 17:18:14 +00:00
Walter van Niftrik 635c7d970c SCI: Fix VM crash when NULL_REG is passed to AvoidPath (SCI32).
svn-id: r47964
2010-02-07 14:32:49 +00:00
Max Horn 57f9f4cc09 SCI: Some cleanup
svn-id: r47963
2010-02-07 12:16:45 +00:00
Max Horn ae0c9b48cd Split GameFeatures::autoDetectFeature into several methods, one for each feature
svn-id: r47962
2010-02-07 12:16:23 +00:00
Max Horn 0a0875efb8 SCI: Add GameFeatures::getDetectionAddr auxillary method
svn-id: r47961
2010-02-07 12:15:59 +00:00
Max Horn 7c05a24ade SCI: Refactor GameFeatures::autoDetectFeature
svn-id: r47960
2010-02-07 12:15:35 +00:00
Max Horn f3ef11cdc5 SCI: Switch GameFeatures::autoDetectFeature to using readPMachineInstruction
svn-id: r47959
2010-02-07 12:15:12 +00:00
Max Horn 4cfcf57546 SCI: Convert disassemble to use readPMachineInstruction.
This change is untested, please check it. Also, the opparams
array is not used but could be used to simplify the reading code.

svn-id: r47958
2010-02-07 12:14:49 +00:00
Max Horn e0218d1ba3 SCI: Get rid of GET_OP_ macros
svn-id: r47957
2010-02-07 12:14:26 +00:00
Max Horn 3b4c54f0e5 SCI: Add function readPMachineInstruction()
svn-id: r47956
2010-02-07 12:13:59 +00:00
Martin Kiewitz 749b0ea237 SCI: added dummy assertpalette to GfxPalette, setting destination palette immediately on kPalVary(start) call
svn-id: r47953
2010-02-07 12:00:06 +00:00
Filippos Karapetis 3c8ab42eea With the new detection for setCursor, the game object and game ID are no longer required, which makes some ugly code obsolete. Yay! :)
svn-id: r47951
2010-02-07 09:33:53 +00:00
Matthew Hoops 9183ab57a3 SCI1 Mac games can call kGetFarText with a NULL destination, so we need to allocate the memory. King's Quest V Mac is now playable.
svn-id: r47950
2010-02-07 04:25:05 +00:00
Matthew Hoops 71c222e340 Oops, correct a comment.
svn-id: r47949
2010-02-07 03:00:52 +00:00
Matthew Hoops ecd8e6f7d1 Rewrite detectSetCursorType() so that it works for KQ5 Mac in addition to KQ5 DOS CD.
svn-id: r47948
2010-02-07 02:53:07 +00:00
Martin Kiewitz 67870c7dc8 SCI: adding more debug output to kPalVary, fixing loading savedgames (_gfxPaint wasnt copied over)
svn-id: r47943
2010-02-06 21:38:58 +00:00
Martin Kiewitz 3255b572ad SCI: added debug code to kPalVary, added warning when calling kPalette(setFromResource) with unsupported parameters
svn-id: r47941
2010-02-06 21:22:05 +00:00
Walter van Niftrik 1e67b56eee SCI: Revert r47925 and put fix inside GC instead.
svn-id: r47940
2010-02-06 19:41:55 +00:00