thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35799 commits 35 branches 0 tags 1.4 GiB
Commit graph

199 commits

Author SHA1 Message Date
Matthew Hoops
65dcc0b2a3 SCI32: 
- Fix dup for kArray/kString
	- Implement kFileIO::rename (SCI1.1)
	- Implement part of the SCI32 additions to kFileIO
	- Implement the GetSaveDir part of kSave (SCI2.1)
	- Torin (SCI2.1!) now shows signs of life -- it will create the torin.prf file with correct data!

svn-id: r46521
 2009-12-24 02:43:07 +00:00
Filippos Karapetis
0c1b646c7f - Started wrapping the current sound code around appropriate defines 
- Introduced a new resource type, SoundResource, used in the new music code

svn-id: r46421
 2009-12-19 16:19:53 +00:00
Filippos Karapetis
e2985a4173 Removed sfx/misc.h 
svn-id: r45885
 2009-11-14 03:15:20 +00:00
Filippos Karapetis
c8fbac1517 - Changed the segment manager to be a static part of the engine, and stopped deleting and recreating it when restoring games 
- Merged game_exit(), script_free_vm_memory() and script_free_engine()
- Cleanup

svn-id: r45666
 2009-11-04 14:22:17 +00:00
Martin Kiewitz
e87808d89b SCI: validate_variable fixed and now using bool instead of int (fixes pq3 demo crash on my computer) 
svn-id: r45543
 2009-10-30 18:01:27 +00:00
Filippos Karapetis
89febd360f Cleanup 
svn-id: r45323
 2009-10-22 05:42:14 +00:00
Filippos Karapetis
033910c6af Removed the accidental inclusion of deprecated code for LSL5 - this has been superseded by commit 45297 
svn-id: r45311
 2009-10-21 19:23:37 +00:00
Filippos Karapetis
b105d690e3 - Removed kShow() and the related code it uses - it's a debugging function, and we have the same functionality in the debug console 
- Merged the view signal flags from kernel.h and gui_animate.h, and named them appropriately. Also, updated the notes next to them, cause some were incorrectly marked as not used in our engine
- Added a note about a hack used in the old GUI in the view signal flags
- Moved the control state flags inside gui_helpers.h

svn-id: r45310
 2009-10-21 19:19:03 +00:00
Max Horn
1e8883dccc SCI: Fix warning, and reformat a multi-line comment 
svn-id: r45303
 2009-10-21 10:00:08 +00:00
Filippos Karapetis
9785eca16b Fixed the bug where ego would not walk properly after he's swapped in LSL5 (from Larry to Patti and vice versa) 
svn-id: r45297
 2009-10-21 08:28:39 +00:00
Max Horn
9e64255bd1 SCI: Rename game_obj to _gameObj 
svn-id: r45235
 2009-10-18 19:43:27 +00:00
Martin Kiewitz
6d95f8ca61 SCI: pointer_add -> error changed to warning b/c iceman does it. Just ignoring it doesnt seem to have any effect on the game 
svn-id: r45123
 2009-10-15 15:07:47 +00:00
Willem Jan Palenstijn
e6d3bb80b4 SCI: Improve cmdSend slightly. It's still broken, though 
svn-id: r45097
 2009-10-14 22:41:03 +00:00
Willem Jan Palenstijn
984527a479 SCI: Fix build with VM_DEBUG_SEND enabled 
svn-id: r45096
 2009-10-14 22:40:43 +00:00
Martin Kiewitz
a7e6f50ede SCI: removed speed throttler (cause of kAnimate change) 
svn-id: r45094
 2009-10-14 21:48:52 +00:00
Max Horn
5ea978f63a SCI: Rename some vars (cleaning up what seems to have been caused by a blind global search & replace) 
svn-id: r45060
 2009-10-14 09:37:22 +00:00
Max Horn
8191c04056 SCI: Merge some sfx related global funcs into SfxState. 
This allows us to get rid of "static SfxPlayer *s_player".

svn-id: r45038
 2009-10-13 18:51:59 +00:00
Filippos Karapetis
81a2316bd5 Reverted the Common::String::printf() related commits, as the function works fine now under MSVC 
svn-id: r44982
 2009-10-12 12:03:06 +00:00
Filippos Karapetis
e8deac29a5 Fixed a warning message under MSVC... seems like Common::String::printf does not work correctly when used on an empty string 
svn-id: r44972
 2009-10-12 10:09:25 +00:00
Filippos Karapetis
6d030126d7 More work on the Object class 
svn-id: r44921
 2009-10-11 13:46:58 +00:00
Martin Kiewitz
91eee2e99a SCI: change remove script FIXME warning into comment 
svn-id: r44901
 2009-10-11 09:34:35 +00:00
Filippos Karapetis
d6f5d93dbf Started rewriting the Object struct into a class 
svn-id: r44878
 2009-10-10 15:58:51 +00:00
Martin Kiewitz
9f88122baa SCI/newgui: calling process_sound_events now directly within kAnimate(), fixes hanging scripts (e.g. sq3 exiting pod, kq1 getting killed) 
svn-id: r44843
 2009-10-09 19:41:39 +00:00
Max Horn
6ad5840181 SCI: Rename EngineState::segMan to _segMan 
svn-id: r44629
 2009-10-04 18:38:18 +00:00
Willem Jan Palenstijn
cbcd53f1f3 Fix cppcheck issue reported by salty-horse 
svn-id: r44541
 2009-10-02 15:02:57 +00:00
Willem Jan Palenstijn
0fe40b5053 SCI: Use String::printf instead of temporary buffer 
svn-id: r44532
 2009-10-02 12:44:12 +00:00
Max Horn
292640b14e SCI: Make NULL_REG & SIGNAL_REG const; change validate_property so that its callers cannot modify NULL_REG accidentally anymore 
svn-id: r44531
 2009-10-02 11:04:36 +00:00
Filippos Karapetis
6e462c9002 Removed the STRICT_SEND, STRICT_READ and ASSERT_ARITHMETIC defines 
svn-id: r44519
 2009-10-01 12:41:21 +00:00
Filippos Karapetis
7d40dde96f - Removed the toggle for "weak" validations, as there are cases where they fail (e.g. in Longbow), so there is no point in having strict validations 
- Removed the invalid toggle from kernel signatures - we now never error out on invalid object references, but throw a warning instead
- Simplified determine_reg_type()

svn-id: r44511
 2009-10-01 10:57:59 +00:00
Willem Jan Palenstijn
168257df24 SCI: Remove outdated debugging hack. 
In the past, a negative selector value was used to identify a callk
stack frame. Currently a type of EXEC_STACK_TYPE_KERNEL already does that.

svn-id: r44510
 2009-10-01 08:53:10 +00:00
Filippos Karapetis
9efc90c8af Fixed the warning message shown when dummy functions are invoked 
svn-id: r44506
 2009-09-30 23:13:46 +00:00
Filippos Karapetis
30084d72a5 Added a new special reg_t, SIGNAL_REG, for signaling when an error occurs (usually), or to signal success in some special occasions 
svn-id: r44505
 2009-09-30 23:00:03 +00:00
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things) 
svn-id: r44495
 2009-09-30 16:16:53 +00:00
Max Horn
27026f6565 SCI: Replace magic '-42' by an enum 
svn-id: r44492
 2009-09-30 16:00:44 +00:00
Willem Jan Palenstijn
77bd8d0bfb SCI: Add callk stackframe directly in run_vm 
svn-id: r44473
 2009-09-30 00:13:59 +00:00
Filippos Karapetis
f9296a6445 - Changed the unimplemented debug SCI kernel functions (InspectObj, ShowSends, ShowObjs, ShowFree, StackUsage and Profiler) to be dummy functions - we have our own debugger, and don't use these functions for debugging 
- Removed the function number parameter from all kernel functions, as it's no longer needed, and removed the FAKE_FUNCT_NR hack
- Removed kUnknown() and kStub()
- Dummy/unknown kernel functions are no longer invoked, and a warning is shown instead, with the paremeters passed to them

Note: there is an evil hack used for debugging scripts in invoke_selector(), which probably no longer works now

svn-id: r44461
 2009-09-29 14:24:07 +00:00
Willem Jan Palenstijn
88a9099949 SCI: Remove unsafe unmarkDeleted function. 
It did not undo all effects of a script being deleted (specifically its
superclasses remain unlocked), causing an inconsistent
state. Also removed EcoQuest CD hack that worked around a specific
instance of this problem.

svn-id: r44449
 2009-09-28 20:21:09 +00:00
Willem Jan Palenstijn
77751a0455 SCI: change segment offsets in reg segments to be in half reg_t. 
This makes offsets in raw and reg segments consistent, which
fixes string addressing in savegame dialogs.

svn-id: r44396
 2009-09-27 12:23:14 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable 
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
 2009-09-23 10:55:35 +00:00
Filippos Karapetis
5184f86e15 - Merged scriptObjInit0() and scriptObjInit11() 
- Replaced some cases where getSciVersion() is used with _resMan->sciVersion(), as getSciVersion() will fail with the fallback detector (as the engine is not initialized). Object property accessors still crash currently, when used with the fallback detector

svn-id: r44261
 2009-09-22 14:33:46 +00:00
Max Horn
996b9cc74b SCI: cleanup 
svn-id: r44241
 2009-09-21 21:39:00 +00:00
Max Horn
d2a6713a8e SCI: Replace IntMapper Script::_objIndices and Common::Array Script::_objects by a HashMap -- goodbye, class IntMapper 
svn-id: r44240
 2009-09-21 21:38:43 +00:00
Max Horn
5f440854b7 SCI: Add EngineState::_kernel member for convenience 
svn-id: r44173
 2009-09-17 17:00:36 +00:00
Max Horn
c2455aad87 SCI: Move CallsStruct into vm.cpp, the only place it is being used 
svn-id: r44172
 2009-09-17 16:56:36 +00:00
Max Horn
f2d2276c4a SCI: Move some selector related function into a new file selector.cpp 
svn-id: r44171
 2009-09-17 16:53:58 +00:00
Max Horn
eb77efda78 SCI: Add a global getSciVersion() function and make use of it 
svn-id: r44170
 2009-09-17 16:50:53 +00:00
Max Horn
364640cfd5 SCI: Rename selector_map_t -> SelectorCache and _selectorMap -> _selectorCache 
svn-id: r44152
 2009-09-17 13:21:42 +00:00
Max Horn
b2c386ed00 SCI: Move parts of struct ScriptState into a new struct DebugState 
svn-id: r44151
 2009-09-17 13:21:19 +00:00
Max Horn
d861f5c854 SCI: cleanup 
svn-id: r44150
 2009-09-17 13:20:58 +00:00
Filippos Karapetis
dce185ba8b Made script_lookup_export() a method of SegManager 
svn-id: r44140
 2009-09-17 09:36:52 +00:00