Commit Graph
7940 Commits
Author SHA1 Message Date
Filippos Karapetis a6156a6805 Removed the scriptRelocateExportsSci11() hack. The open spell in QFG1VGA works now (thanks to waltervn for all his help on this)
svn-id: r49311
2010-05-29 15:29:27 +00:00
Filippos Karapetis 3d09af0377 Removed the hack inside findGameObject(), and replaced it with code from the segment manager, till we find out why the segment is sometimes off by 1 (note that findGameObject() works fine for finding the game ID itself)
svn-id: r49310
2010-05-29 15:27:27 +00:00
Filippos Karapetis 708b37898c Fixed regression in SCI2-SCI21 games from commit 49308
svn-id: r49309
2010-05-29 15:01:33 +00:00
Filippos Karapetis 6f056c6c98 Added a method to the resource manager, to limit the places where script exports are accessed, since for SCI11 and newer exports can be functions and objects (first step in removing scriptRelocateExportsSci11(), which is a gross hack and it fails in QFG1VGA)
svn-id: r49308
2010-05-29 14:03:08 +00:00
Filippos Karapetis 5d21ff280a Silenced some superfluous warnings in KQ5CD
svn-id: r49294
2010-05-28 16:47:30 +00:00
Filippos Karapetis 5b12fda059 Added some more info when severe script errors occur
svn-id: r49293
2010-05-28 12:37:54 +00:00
Filippos Karapetis b2e4e4b340 Cleaned up detectGfxFunctionsType() slightly, and made it work for Hoyle 1 and 2 properly.
svn-id: r49292
2010-05-28 12:36:47 +00:00
Filippos Karapetis d9c0abe0b8 Cleanup
svn-id: r49290
2010-05-28 10:53:03 +00:00
Filippos Karapetis e694b66e4f Added comments to kMergePoly()
svn-id: r49289
2010-05-28 10:52:22 +00:00
Filippos Karapetis 967d9ea308 Added a stub for kMergePoly, to avoid crashing in QFG1VGA after killing a monster
svn-id: r49288
2010-05-28 10:45:20 +00:00
Martin Kiewitz dad3ad86ea SCI: read out vol selector on initSound/playSound for sci1early (soundversion) as well - fixes lsl1demo
svn-id: r49285
2010-05-28 09:29:05 +00:00
Martin Kiewitz 7029b059bf SCI: disabling music fading again, but only for sci32 - drivers seem to have issues when fading in on gk1/sierra logo
svn-id: r49271
2010-05-27 21:20:07 +00:00
Martin Kiewitz d2513c9cc2 SCI: enabling fading again, issues in pharkas and gk1demo are actually "normal" - maybe we should add some hack workaround, but the delay in ssci was just slow resource loading
svn-id: r49269
2010-05-27 20:53:37 +00:00
Matthew Hoops a32b7b3851 Fix starting GK1.
svn-id: r49265
2010-05-27 17:47:32 +00:00
Martin Kiewitz 845c34ee45 SCI: removing tab from vo output (debug console)
svn-id: r49264
2010-05-27 17:43:06 +00:00
Martin Kiewitz 453d13dc2d SCI: fixing -propDict- selector on instances to contain -propDict- of the corresponding class - fixes sq4cd/room 381 talk-clicking on robot - thx to waltervn & wjp
svn-id: r49263
2010-05-27 17:41:20 +00:00
Filippos Karapetis 5f5dcbad47 Added an explanation for audio36 and sync36 external patches
svn-id: r49262
2010-05-27 12:00:20 +00:00
Martin Kiewitz cfed70df07 SCI: fixing resuming samples - fixes hang when ship is flying away happening when you entered menu during that sequence
svn-id: r49261
2010-05-27 11:26:37 +00:00
Filippos Karapetis e5eaf3ee55 Split all of the audio-related functions of the resource manager in a separate file
svn-id: r49260
2010-05-27 08:09:32 +00:00
Filippos Karapetis 739f551852 Slight formatting, and added a note that audio36 and sync36 resource patches were introduced in SCI2, and didn't exist in SCI0-SCI1.1
svn-id: r49259
2010-05-27 07:50:23 +00:00
Matthew Hoops 99fc5cbfca Add the Mac sync resource type and allow for more than 9 Mac SCI1.1+ data files.
svn-id: r49255
2010-05-27 03:15:24 +00:00
Filippos Karapetis 2c2a1fa1ba Made _k_new_node() a method of the segment manager, and fixed a bug with the rarely used SCI0 kernel function kSort in the process (_k_new_node was called with key, value instead of value, key inside kSort)
svn-id: r49251
2010-05-26 22:05:51 +00:00
Martin Kiewitz d35121fc61 SCI: fixing kReadNumber to behave like in sierra sci (non standard atoi implementation) - fixes big door not unlocking in sq4
svn-id: r49250
2010-05-26 20:48:08 +00:00
Max Horn db475d1501 SCI: More const related changes; remove unnecessary casts which hide const issues
svn-id: r49248
2010-05-26 18:11:17 +00:00
Martin Kiewitz 2fa8ac0575 SCI: adding another workaround for picture 376 in sq4/cd (same issue like originally found in r49216)
svn-id: r49247
2010-05-26 17:15:49 +00:00
Max Horn 0197e9f6a1 SCI: Making various object and script related things const
svn-id: r49246
2010-05-26 16:30:10 +00:00
Max Horn 7b8837cda7 SCI: Simplify appending string 'seeker' to sierraId
svn-id: r49244
2010-05-26 15:41:50 +00:00
Filippos Karapetis af8a82aa13 Fixed compilation
svn-id: r49242
2010-05-26 14:31:51 +00:00
Filippos Karapetis bfaba64c6a Made find_unique_script_block() a member of the Script class
svn-id: r49241
2010-05-26 14:25:51 +00:00
Martin Kiewitz 1a01caece7 SCI: adding another hack to sci32 picture drawing, fixes crash in sci32 games introduced by r49216
svn-id: r49238
2010-05-26 13:24:32 +00:00
Filippos Karapetis 3187149cca Avoid adding a null char in the sierraId Common::String
svn-id: r49234
2010-05-26 11:02:50 +00:00
Filippos Karapetis 65fa2f5af8 Formatting
svn-id: r49233
2010-05-26 10:37:54 +00:00
Filippos Karapetis 1bee6daff0 Added more info to the warning thrown when argc > 1 while modifying a variable selector in send_selector()
svn-id: r49232
2010-05-26 10:35:54 +00:00
Filippos Karapetis 9a66bfb575 After running some tests, it appears that modifying argc inside send_selector() was a bad idea. Reverting the relevant code, and putting the warning back, with some extra comments
svn-id: r49231
2010-05-26 09:59:40 +00:00
Filippos Karapetis 1818fa137f Silence a warning inside send_selector(): argc > 0 means "write selector". Added code do make sure that argc is always either 0 or 1 when referencing variable selectors (this isn't strictly necessary, but better safe than sorry...). Some cleanup
svn-id: r49230
2010-05-26 09:33:33 +00:00
Filippos Karapetis 1c0bbb10cb More work on controlling access to members of the Object class:
- Moved the code for initializing the object class, species and base object inside the Object class
- Made propertyOffsetToId() a method of the Object class
- Made relocateObject() a method of the Object class
- The Object getVariable() method now returns a reference to the requested variable

Only SegManager::reconstructScripts() is left needing direct access to the members of the Object class

svn-id: r49228
2010-05-26 08:27:24 +00:00
Filippos Karapetis 60dd310688 Cleanup
svn-id: r49227
2010-05-26 06:53:08 +00:00
Matthew Hoops cd5e90f298 Implement QuickTime playback for SCI1.1 Mac. The 'Halfdome' and 'KQ6Movie' videos now play. However, they require multiple edit list support to look completely correct.
svn-id: r49224
2010-05-26 03:43:21 +00:00
Martin Kiewitz 71436c5a86 SCI: adding comment about error() on pattern opcodes sci1.1+
svn-id: r49217
2010-05-25 18:48:50 +00:00
Martin Kiewitz aa8c6377a5 SCI: error out on pattern opcodes inside vector data when drawing pictures in sci1.1+, also adding workaround for garbage data inside picture 381 in sq4
svn-id: r49216
2010-05-25 18:45:25 +00:00
Martin Kiewitz 849cfe4f0e SCI: dont lock mutex in pauseAll(), isn't needed anyway - fixes deadlock in sq4
svn-id: r49214
2010-05-25 15:38:30 +00:00
Martin Kiewitz 2502038e73 SCI: sci1.1 uses hardcoded white for picture cel data instead of the value specified in header - fixes pixel glitches in island of dr. brain title, sq4 title and qfg3 room during intro
svn-id: r49213
2010-05-25 12:53:35 +00:00
Martin Kiewitz 5317b8195d SCI: sci1.1 changed priority to 15, when adding to picture - fixes title in island of dr. brain intro
svn-id: r49212
2010-05-25 12:04:32 +00:00
Martin Kiewitz 58a7dbe721 SCI: forgot one rename in r49202 - MSVC, why?
svn-id: r49203
2010-05-24 21:51:45 +00:00
Martin Kiewitz 830d17ed31 SCI: renaming MacIconBar to GfxMacIconBar
svn-id: r49202
2010-05-24 21:47:06 +00:00
Filippos Karapetis d4ae096a63 Surface is a struct, not a class
svn-id: r49201
2010-05-24 20:50:53 +00:00
Matthew Hoops f5ec3a3f74 Oops, forgot to delete the icon bar.
svn-id: r49199
2010-05-24 17:55:23 +00:00
Martin Kiewitz 3fa50583a0 SCI: leave console open for pic_visualize/undither commands - also don't use SciGui class for undither anymore
svn-id: r49198
2010-05-24 17:45:00 +00:00
Matthew Hoops d49fb8f42d Add support for showing the icon bar in SCI1.1 Mac.
svn-id: r49196
2010-05-24 17:21:11 +00:00
Martin Kiewitz e9db62b272 SCI: sort according to original order in kAnimate, when y and z are the same - fixes iceman half-open compartment in room 35
svn-id: r49189
2010-05-24 15:39:30 +00:00