ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
7940 Commits
Author SHA1 Message Date
Martin Kiewitz b49efb67f6 SCI: only remove isQueued status for sound sci0 
svn-id: r49187
 2010-05-24 14:47:43 +00:00
Martin Kiewitz 350e3d7c05 SCI: remove isQueued status when sound gets stopped - fixes iceman resuming music when entering hotel complex (with bar) right at the start 
svn-id: r49186
 2010-05-24 13:50:19 +00:00
Filippos Karapetis e2a388e2f5 SCI: Enabled saving from the ScummVM menu again 
svn-id: r49164
 2010-05-23 18:03:23 +00:00
Martin Kiewitz 2ffbd661ac SCI: removed hack for iceman in kDoBresen - fixes all sorts of automatic walking issues (like rescueing ambassador) in iceman, dancing at the beginning also still works - thx to [md5] 
svn-id: r49163
 2010-05-23 17:40:42 +00:00
Filippos Karapetis 7cd9a23c0d Remove the unused SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE flag 
svn-id: r49161
 2010-05-23 17:03:16 +00:00
Martin Kiewitz db74441d55 SCI: fixing crash in _vocab_add_rule when running qfg2 demo 
svn-id: r49160
 2010-05-23 16:59:09 +00:00
Filippos Karapetis 9be4f6250c Made shrink_execution_stack() a member of EngineState 
svn-id: r49159
 2010-05-23 16:44:36 +00:00
Martin Kiewitz b069b9fe96 SCI: reenabling "stopAllSounds" code disabled in r49101 - isn't called anymore since priority is honored so it may have been right after all 
svn-id: r49158
 2010-05-23 16:42:49 +00:00
Martin Kiewitz d27e32aa19 SCI: fix regression of r49156 - if multiple songs are stored for resume-play, use the last one - fixes iceman wrong music played after going through door in room 14 - still not sure about this, added fixme 
svn-id: r49157
 2010-05-23 13:22:58 +00:00
Martin Kiewitz aa4ae667a9 SCI: use priority when queuing up music in sound sci0 -> fixes lsl3 jingle issues 
svn-id: r49156
 2010-05-23 12:22:23 +00:00
Filippos Karapetis c874ff15a8 Cleaned up the game ID code: 
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
 2010-05-23 10:28:03 +00:00
Martin Kiewitz d04c7a58aa SCI: adding ability to specify hexadecimal number as index for debug command vmvars - also report error if invalid index is given to us 
svn-id: r49148
 2010-05-22 21:46:40 +00:00
Filippos Karapetis 80ffcc621d Cleanup 
svn-id: r49143
 2010-05-22 16:54:13 +00:00
Filippos Karapetis 9b6a3712d6 Rewrote and simplified the game ID detector. It now properly works with SCI0-SCI2.1 games 
svn-id: r49142
 2010-05-22 16:50:15 +00:00
Filippos Karapetis 6408504c93 Slight cleanup 
svn-id: r49129
 2010-05-21 13:31:45 +00:00
Filippos Karapetis e6ede6bba1 Removed the reliance on the segment manager from the fallback detector, for SCI0-SCI1 games (it still doesn't work with SCI1.1 and newer games, though) 
svn-id: r49126
 2010-05-21 07:51:47 +00:00
Filippos Karapetis 20fcedc34a Some further work on the fallback detector, reducing the reliance on the segment manager 
svn-id: r49125
 2010-05-21 07:30:37 +00:00
Martin Kiewitz 5f8778395a SCI: fix regression of r49109 - only queue up midi sounds 
svn-id: r49114
 2010-05-20 06:11:46 +00:00
Martin Kiewitz a0db16294a SCI: adding workaround for some underwater rooms in iceman - removing visual&priority lines that appear because of non dither mode (would merge with dithered fill color combination normally) 
svn-id: r49113
 2010-05-20 05:48:37 +00:00
Filippos Karapetis 678411ae5e Slight bugfix in the object iteration inside getSierraGameId() 
svn-id: r49110
 2010-05-19 23:29:27 +00:00
Martin Kiewitz 264fde962b SCI: sound code now queues up music in sci0, wip-code: not reacting on priority yet - fixes iceman room 14 
svn-id: r49109
 2010-05-19 21:10:43 +00:00
Martin Kiewitz e243c87fc0 SCI: updated comment on kDoSound(12) 
svn-id: r49108
 2010-05-19 19:41:10 +00:00
Filippos Karapetis 92c1f4625d Fixed silly typo in #49099. Iceman works again (thanks m_kiewitz) 
svn-id: r49104
 2010-05-19 17:11:15 +00:00
Filippos Karapetis 480e5c8488 Added a new method to the resource manager, to help determine if we got a SCI1.1 Mac game. Started rewriting the fallback detector so that it doesn't rely on the segment manager to find the internal game ID 
svn-id: r49102
 2010-05-19 15:57:58 +00:00
Martin Kiewitz 3f10841ae8 SCI: removed cmdStopAllSounds(), can't be right - added FIXME - fixes iceman room 14 music stopping within 1-2 seconds 
svn-id: r49101
 2010-05-19 14:54:39 +00:00
Filippos Karapetis 893af1600a Fixed signed/unsigned warning, changed to CamelCase 
svn-id: r49100
 2010-05-19 14:45:56 +00:00
Filippos Karapetis d1f1c71f50 Cleaned up script_instantiate_sci0() 
svn-id: r49099
 2010-05-19 14:43:16 +00:00
Martin Kiewitz 9b4f352870 SCI: cleanup soundcode - number renamed to resourceId, prio renamed to priority 
svn-id: r49098
 2010-05-19 14:19:16 +00:00
Martin Kiewitz bb10dabe90 SCI: changing debugger commands to not require "?"-prefix for objects anymore. It's now also possible to use 0x prefix for hexadecimal values e.g. "vo 0x13", "vo 13h", "vo theSound", "vo 12f:34f" is now possible 
svn-id: r49097
 2010-05-19 13:32:27 +00:00
Filippos Karapetis 209798474b Updated the save game format for the changes in #49093 
svn-id: r49094
 2010-05-19 09:39:11 +00:00
Filippos Karapetis 174a043aa7 Removed the exportsAreWide variable from the segment manager and save games, and moved validateExportFunc() in the Script class, thus resolving a TODO 
svn-id: r49093
 2010-05-19 08:50:24 +00:00
Filippos Karapetis 852cb16c49 Moved the breakpoint information inside the DebugState struct 
svn-id: r49092
 2010-05-19 07:25:06 +00:00
Martin Kiewitz e41874c91d SCI: set signal on fadeOut and also set signal when fade is requested but sound is not playing (& show warning in that case) - fixes iceman hang after fireworks in room 14 
svn-id: r49087
 2010-05-18 19:59:43 +00:00
Matthew Hoops 759e4923d0 Add a new class 'RewindableVideoDecoder' that allows a video to be rewound and have QTPlayer inherit from that. 
svn-id: r49084
 2010-05-18 17:36:34 +00:00
Filippos Karapetis 83f31e4e44 Added the number of parameters passed in unknown kDoAudio subops 
svn-id: r49083
 2010-05-18 15:52:45 +00:00
Matthew Hoops 11cbdd0318 Committing the rest of the VideoDecoder Rewrite from patch #2963496. 
svn-id: r49079
 2010-05-18 14:17:24 +00:00
Filippos Karapetis f3892a506b - Removed the wrapper kalloc, kmem and kfree functions. Now, the associated Segment manager functions allocateHunkEntry, getHunkPointer and freeHunkEntry are used directly (which are more descriptive, anyway) 
- Replaced the GET_SEGMENT macro by a method of the segment manager
- Removed the unused reference to the created hunk in allocateHunkEntry(), only the reg_t reference to it is returned now

svn-id: r49078
 2010-05-18 13:05:09 +00:00
Martin Kiewitz e3297ef2ca SCI: fixing crash in pq2 - not sure about this, lskovlun should take a look at this 
svn-id: r49077
 2010-05-18 12:34:14 +00:00
Filippos Karapetis 46af5a5162 - Moved kernel_lookup_text inside the Kernel class 
- Added a pointer to the segment manager from within the Kernel class, thus simplifying the calls to it

svn-id: r49076
 2010-05-18 12:16:48 +00:00
Filippos Karapetis 75f4791a4a - Moved determine_reg_type() and kernel_matches_signature() inside the Kernel class, where they belong 
- Moved the kernel signature defines inside kernel.h
- Removed some unused references to EngineState

svn-id: r49075
 2010-05-18 11:23:13 +00:00
Filippos Karapetis 8b7c29a4ad Moved breakpointWasHit inside the DebugState struct, thus resolving a FIXME 
svn-id: r49071
 2010-05-18 09:18:27 +00:00
Matthew Hoops 3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression. 
svn-id: r49070
 2010-05-18 04:17:58 +00:00
Matthew Hoops c7fa1074fb Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite). 
svn-id: r49063
 2010-05-17 21:59:05 +00:00
Martin Kiewitz 4119fdb9a9 SCI: adding speed throttler special case for iceman / submarine control room 
svn-id: r49056
 2010-05-17 09:32:16 +00:00
Martin Kiewitz c49930d523 SCI: fixing possible typo for Shift-F1/F10 keys, fixing submarine controls in iceman 
svn-id: r49048
 2010-05-16 17:21:37 +00:00
Martin Kiewitz 5e4868fb00 SCI: handle TAB like Ctrl-I on menu key checking, sci0 also did it that way - makes TAB work for inventory in iceman/qfg1ega 
svn-id: r49044
 2010-05-15 21:28:26 +00:00
Martin Kiewitz ae4da9debe SCI: setting port _menuPort, fixing crash on setFont() 
svn-id: r49043
 2010-05-15 15:59:46 +00:00
Martin Kiewitz 19af89a902 SCI: removed _mainPort (was unused, is unused) 
svn-id: r49042
 2010-05-15 15:45:05 +00:00
Martin Kiewitz f3b2627179 SCI: adding special 640x440 upscaling mode for kq6, finally hires portraits are drawn at the right position 
svn-id: r49041
 2010-05-15 15:16:32 +00:00
Martin Kiewitz eb2b3f352e SCI: adding upscaled hires mode 640x480 for kq6 and gk1, fixing valgrind error in GfxPortrait class, not using priority anymore when drawing hires cels (shouldnt be needed for kq6) 
svn-id: r49040
 2010-05-15 14:17:50 +00:00