libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-26 11:46:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,627 Commits 5 Branches 5 Tags 1.8 GiB
20095d8e93
Commit Graph

345 Commits

Author SHA1 Message Date
Torbjörn Andersson
8a60a99140 Fixed updateCallback11() according to LordHoto's directions, and renamed it 
update_writeAdlib(). (The "update_" prefix will probably be changed later, but
for now I want it to remain obvious that the functions belong to the other
updateCallback*() functions.)

svn-id: r20990
 2006-03-01 13:57:32 +00:00
Torbjörn Andersson
5734717f8e Renamed 'unk9' to a slightly more descriptive 'repeatCounter'. (I should have 
done that in the previous commit.)

svn-id: r20987
 2006-03-01 08:13:38 +00:00
Torbjörn Andersson
272a19cf5b Use signed integers for jump offsets, so that the jump opcodes can jump both 
forward and backward. This seems to fix the looping of the Black forest music
(and probably others as well), and might fix the invalid pointer crashes and
wrong music that would sometimes play after a song had finished. Changed the
names of the jump opcode functions, and added "update_" prefixes to the
previously cleaned-up opcode functions.

svn-id: r20986
 2006-03-01 08:06:54 +00:00
Torbjörn Andersson
3a38721d02 Cleaned up updateCallback36() and renamed it setVibratoDepth(). 
svn-id: r20985
 2006-03-01 07:27:35 +00:00
Torbjörn Andersson
55739f1715 Cleaned up updateCallback35() and renamed it setAMDepth(). It looks like the 
_unkOutputByte2 variable is there to keep track of the current value of the
BD register (AM Depth / Vibrato Depth / Rhythm)

svn-id: r20984
 2006-03-01 07:21:51 +00:00
Torbjörn Andersson
90cbe402b2 Minor cleanup and comments. 
svn-id: r20983
 2006-03-01 06:56:53 +00:00
Travis Howell
68f289398e Remove HE specific string array from SCUMM6 table, since the value is different in some games 
svn-id: r20982
 2006-03-01 05:00:25 +00:00
Travis Howell
0a3b58ff2a Update string array tables and use for all possible games and strings 
svn-id: r20980
 2006-03-01 04:32:44 +00:00
Travis Howell
d5710033a0 Update string array table for SCUMM7 
svn-id: r20979
 2006-03-01 01:17:40 +00:00
Travis Howell
2892e33f1d Add comment to workaround for music in Sam & Max, based on commit log. And limit the workaround to specific game. 
svn-id: r20976
 2006-02-28 23:02:15 +00:00
Gregory Montoir
e4ac92c2af updated some bugs/issues comments and removed wrong 'FIXME' markers. 
svn-id: r20975
 2006-02-28 22:20:13 +00:00
Johannes Schickel
1e2aa59bcb Added lock() and unlock() again to readBuffer. 
Implemented stateCallback1_1.
Fix some small bugs here and there (can't say what the fixed but it should be correct now)
Also set's the correct timer call value (with the other the music was too fast)

svn-id: r20973
 2006-02-28 17:02:14 +00:00
Torbjörn Andersson
6ee443f316 Added some basic comments, along with some very, very minor cleanup. 
svn-id: r20972
 2006-02-28 15:44:39 +00:00
Torbjörn Andersson
f03958be01 Removed unnecessary line. 
svn-id: r20971
 2006-02-28 09:54:09 +00:00
Torbjörn Andersson
005861cb14 This may be needless paranoia, but I always get nervous about order of 
evaluation when there are multiple side-effects on the same variable (in this
case the internal state modified by va_arg()) in the same expression. So let's
just humor me and do the va_arg() calls one at a time.

svn-id: r20970
 2006-02-28 08:49:51 +00:00
Travis Howell
41e7bb67e4 These zakTowns specific changes aren't explained and don't match original code. If problems still occur, add bug reports with details. 
svn-id: r20967
 2006-02-28 01:14:02 +00:00
Travis Howell
e1d96cba87 Typo. 
svn-id: r20966
 2006-02-28 00:49:54 +00:00
Travis Howell
db925b310e Update code and comment for screen savers issue in Sam & Max. 
svn-id: r20965
 2006-02-28 00:46:05 +00:00
Johannes Schickel
2bcd6bb95e Fixes hangs in the "Pool of Sorrow" scene (at least I don't get them anymore). 
svn-id: r20964
 2006-02-27 23:41:27 +00:00
Travis Howell
d0bba4cb56 Typo. 
svn-id: r20963
 2006-02-27 23:32:59 +00:00
Travis Howell
86c913a5f4 Update comment for SO_WAIT_FOR_TURN workaround in The Dig, this is due to script bugs. SO_WAIT_FOR_TURN is never used by FT r COMI either, so remove game check. 
svn-id: r20962
 2006-02-27 23:25:07 +00:00
Johannes Schickel
f3106feaf5 Added WIP Adlib sound playing code to kyra. 
It needs some checks since it doesn't work correctly in every case at the moment.

svn-id: r20960
 2006-02-27 22:39:55 +00:00
Gregory Montoir
1b1bc9cde4 Revert the 'get rid of SO_WAIT_FOR_TURN workaround' commit but keep it specific to TheDig 
svn-id: r20959
 2006-02-27 22:15:21 +00:00
Gregory Montoir
0f5ef6f5b1 Get rid of the SO_WAIT_FOR_TURN hack for TheDig as the original interpreter didn't do anything special here. This will probably trigger some 'invalid actor' errors, but those are most likely caused by scripting mistakes... which should be worked around separately. 
svn-id: r20958
 2006-02-27 21:55:18 +00:00
Gregory Montoir
9c80770411 cleanup 
svn-id: r20957
 2006-02-27 21:25:59 +00:00
Travis Howell
deecb61656 Use _numStrips when checking for foreced sprite redraw, instead of set values. 
svn-id: r20956
 2006-02-27 12:23:34 +00:00
Travis Howell
be30d257e3 Charset 0 is loaded on start in original versions of OLD_BUNDLE games too 
svn-id: r20955
 2006-02-27 12:00:10 +00:00
Jamieson Christian
2469e00248 SysEx data now passed around with const pointers. Permits simplification of some SysEx client code. 
Testing on Windows. Developers on other platforms, please verify integrity of music handling in your respective MidiDrivers.

svn-id: r20952
 2006-02-27 01:59:07 +00:00
Jamieson Christian
52d55bf976 Removed deprecated IMUSE_DEBUG #define in favor of debugC calls using the runtime-selectable DEBUG_IMUSE category. 
svn-id: r20950
 2006-02-26 22:23:29 +00:00
Max Horn
52970c9936 Cleanup 
svn-id: r20949
 2006-02-26 21:59:44 +00:00
Max Horn
90c916de4b Do not compute the MD5 checksum if an override for it is set 
svn-id: r20948
 2006-02-26 21:52:49 +00:00
Paul Gilbert
dc75adbb25 Initial add of the Lure of the Temptress disassembly 
svn-id: r20947
 2006-02-26 21:36:33 +00:00
Torbjörn Andersson
094382a6d0 With the added delay to the popup menu loop, it's much more likely that each 
iteration will see several events, so pop all events from the queue each time.
Of course, we still only need to check the mouse position once. Warp the mouse
back to neutral even if we're trying to go past the first/last menu entry.

svn-id: r20918
 2006-02-26 15:24:11 +00:00
Torbjörn Andersson
f13d294ae5 Cleaned up my earlier "delay in busy-wait loop" commit, and added a similar 
delay to PopupMenu::Show().

svn-id: r20914
 2006-02-26 13:43:50 +00:00
Torbjörn Andersson
686d463def Added delays to the waitForRelease() and waitForPress() busy-wait loops. 
svn-id: r20912
 2006-02-26 13:02:25 +00:00
Travis Howell
73af2a6938 Remove roomOps cases which are never used by COMI scripts 
svn-id: r20908
 2006-02-26 07:49:11 +00:00
Travis Howell
a5cb120898 COMI uses a separate setting for the verb charset, verbs use correct charset now 
svn-id: r20907
 2006-02-26 06:55:56 +00:00
Travis Howell
270a16b37b Camera variables are initialised on startup by COMI too 
svn-id: r20906
 2006-02-26 06:15:13 +00:00
Travis Howell
0f60eaa166 Move debug mode setting to initScummVars(), so it is reset when game is restarted 
svn-id: r20905
 2006-02-26 05:48:40 +00:00
Travis Howell
bd2a59787b That change shouldn't have been commited 
svn-id: r20903
 2006-02-26 02:23:59 +00:00
Willem Jan Palenstijn
06e02f6010 stop playing a sample before deleting the sample data 
svn-id: r20902
 2006-02-26 01:25:27 +00:00
Travis Howell
76962c3ce6 Change debugInput opcode result to zerod array for now, since it expects input string 
svn-id: r20901
 2006-02-26 00:32:10 +00:00
Max Horn
a76e3bab2f Remove the dummy index 0 entry from substResFileNameTable 
svn-id: r20898
 2006-02-25 21:36:19 +00:00
Max Horn
331110271b Moved the plugin interface code of the SCUMM engine into a separate source file 
svn-id: r20885
 2006-02-25 19:20:51 +00:00
Gregory Montoir
164f35b878 cleanup unpacking function and get rid of an old hack to prevent buffer overflows. 
svn-id: r20884
 2006-02-25 18:26:16 +00:00
Max Horn
bb4d463138 Fix compiler warning (wrong return type) 
svn-id: r20883
 2006-02-25 18:24:55 +00:00
Max Horn
05559c89f2 Moved check for unknown MD5 checksum from ScummEngine::ScummEngine to Engine_SCUMM_create 
svn-id: r20882
 2006-02-25 18:24:22 +00:00
Gregory Montoir
0364eeed5c cleanup (endianess fixes, fixed partBufferStruct structure) 
svn-id: r20881
 2006-02-25 18:16:40 +00:00
Max Horn
779028dcd2 Modified the workaround for bug #1407789 to not depend on MD5 detection 
svn-id: r20880
 2006-02-25 18:16:24 +00:00
Max Horn
2ae0f79de3 Split SCUMM's generateSubstResFileName into two functions: findSubstResFileName and applySubstResFileName 
svn-id: r20879
 2006-02-25 17:36:32 +00:00
Travis Howell
7b9baa4f9f Cleanup decompress wizImage functions, to help find similar code 
svn-id: r20874
 2006-02-25 11:48:35 +00:00
Max Horn
1f987027f8 Removed last two uses of MKID 
svn-id: r20872
 2006-02-25 11:12:44 +00:00
Sven Hesse
f51dd597dd Fix c&p mistake in adding DEBUG_PARSER debug level 
svn-id: r20868
 2006-02-25 10:16:46 +00:00
Max Horn
142bfeb356 Some more MKID -> MKID_BE changes 
svn-id: r20867
 2006-02-25 02:47:22 +00:00
Max Horn
075dc8a538 A typical example why MKID is dangerous: Kyra uses it incorrectly, thus savegames are not interchangable between BE and LE systems. Fixing this, by breaking all LE savegames (enabling a compatibility mode, if desired, is easy) 
svn-id: r20866
 2006-02-25 02:35:45 +00:00
Max Horn
ee0f0a1f13 Replaced some more MKIDs by MKID_BE; this then enabled me to remove ScummEngine::fileReadDword() 
svn-id: r20865
 2006-02-25 02:31:49 +00:00
Max Horn
87fd6957ac Got rid of the 'tag' parameter for readResTypeList() 
svn-id: r20864
 2006-02-25 02:22:17 +00:00
Max Horn
6914121f61 Replaced MKID by MID_BE in most places in the SCUMM engine 
svn-id: r20862
 2006-02-25 02:12:58 +00:00
Max Horn
a30f829773 Some more cine header cleanup 
svn-id: r20859
 2006-02-25 01:18:01 +00:00
Travis Howell
a0b7c01762 Adjust masking in copyWizImageWithMask() to match ScummVM, wizImages masking works fine now 
svn-id: r20858
 2006-02-25 01:02:07 +00:00
Max Horn
275344a931 Reducing the header dependencies in cine a bit more 
svn-id: r20857
 2006-02-25 01:01:27 +00:00
Max Horn
5ea3b8f9cd - avoid using typedef for structs (it is just not necessary in C++) 
- added a const/static here and there
- started to reduce header dependencies

svn-id: r20856
 2006-02-25 00:46:56 +00:00
Max Horn
e35eb1dd2f Fix cine module.mk file (this fixed the dependencies system) 
svn-id: r20855
 2006-02-25 00:42:26 +00:00
Travis Howell
d08dbb2a3c More corrections to copyWizImageWithMask() in HE games 
svn-id: r20854
 2006-02-25 00:35:36 +00:00
Max Horn
f396995173 Use static/const on data tables when possible (this helps the compiler to optimize things better) 
svn-id: r20853
 2006-02-25 00:33:12 +00:00
Max Horn
2fc23c85da Moved cine engine into namespace Cine 
svn-id: r20851
 2006-02-25 00:26:14 +00:00
Travis Howell
3064679e6c Add corrections to copyWizImageWithMask() in HE games 
svn-id: r20849
 2006-02-24 23:39:40 +00:00
Sven Hesse
1758260c39 Changed debug()s to debugC()s 
svn-id: r20848
 2006-02-24 23:31:31 +00:00
Gregory Montoir
047298745f added TRLE wiz masking (mostly untested) 
svn-id: r20847
 2006-02-24 22:36:55 +00:00
Gregory Montoir
481094ada0 cleanup 
svn-id: r20846
 2006-02-24 22:34:22 +00:00
Sven Hesse
ca504aca4f Adding GOB2's CD handling opcodes, the CD version of GOB2 now starts 
correctly; playMult() doesn't work yet, though

svn-id: r20844
 2006-02-24 21:58:03 +00:00
Torbjörn Andersson
36180ed017 I assume -1 and 0xFFFFFFFF are supposed to be the same value when assigned to 
_lastHitArea3, so use -1 consistently.

svn-id: r20838
 2006-02-23 22:38:16 +00:00
Paweł Kołodziejski
96838c8ca6 formating code 
svn-id: r20837
 2006-02-23 20:02:46 +00:00
Paweł Kołodziejski
6b50204eea formating code 
svn-id: r20836
 2006-02-23 19:28:36 +00:00
Paweł Kołodziejski
e31b271760 formating code 
svn-id: r20835
 2006-02-23 18:47:28 +00:00
Paweł Kołodziejski
11f348dd6c fixed warnings 
svn-id: r20829
 2006-02-23 17:51:27 +00:00
Torbjörn Andersson
7b25fa0bd4 In Feeble Files, mouse clicks are recorded in _bitArray[] as well. I was hoping 
that this would make a difference for the Oracle, but apparently not.

svn-id: r20828
 2006-02-23 14:52:07 +00:00
Travis Howell
f4c9c4f4d7 Fix a few more compile warnings. 
svn-id: r20827
 2006-02-23 11:29:37 +00:00
Travis Howell
26e0d95ef4 Fix a few compile warnings. 
svn-id: r20826
 2006-02-23 11:05:58 +00:00
Travis Howell
c9d6277d27 Update function type, to match last commit 
svn-id: r20825
 2006-02-23 10:45:59 +00:00
Travis Howell
8fa8d10c3f Fix a few compile warnings. 
svn-id: r20824
 2006-02-23 10:35:33 +00:00
Torbjörn Andersson
901edf5b33 Fixed some more compiler warnings. Many still remain. 
svn-id: r20823
 2006-02-23 10:26:14 +00:00
Travis Howell
3fe8c971f2 Cleanup to remove duplicate type defines 
svn-id: r20821
 2006-02-23 09:12:21 +00:00
Torbjörn Andersson
725a9d21f9 Fixed some of the compiler warnings. 
svn-id: r20819
 2006-02-23 07:59:25 +00:00
Torbjörn Andersson
43f2d984fb Don't call exit() directly. Instead, use the backend's quit() method for normal 
shutdown, and error() for abnormal termination.

svn-id: r20818
 2006-02-23 07:45:51 +00:00
Eugene Sandulenko
71c170bb13 Initial version of Cinematique engine evo 1. 
svn-id: r20813
 2006-02-22 22:40:53 +00:00
Eugene Sandulenko
a467247e6e Fix bug #1386333: "FT DEMO: assertion triggered when playing movie". 
svn-id: r20812
 2006-02-22 13:26:13 +00:00
Travis Howell
fcd9c09059 Cleanup decompressWizImage() in HE games 
svn-id: r20809
 2006-02-21 21:59:37 +00:00
Eugene Sandulenko
c50da10571 Fix compiler error introduced by last commit. 
svn-id: r20808
 2006-02-21 16:16:56 +00:00
Eugene Sandulenko
6011d302c3 Fix crash on floppy version of gob2 
svn-id: r20807
 2006-02-21 16:15:07 +00:00
Sven Hesse
08a57f0837 More GOB2 changes (Mult::loadMult()) + correcting some mistakes I made 
svn-id: r20806
 2006-02-21 14:22:25 +00:00
Torbjörn Andersson
c5cf806f82 Removed the "extra bars/nodes" code, since nothing ever added the extra bars or 
nodes.

Removed the path-plotting debugging code, since the line-drawing function has
been a stub for the past few years, as far as I can tell.

Similar code was removed from the BS2 router long ago, so this could be a first
tiny step towards bringing them together.

svn-id: r20805
 2006-02-21 10:22:37 +00:00
Paul Gilbert
dd6b207025 Improved layering of objects within rooms - for example, Ratpouch now properly shows up on the rack 
svn-id: r20804
 2006-02-21 09:25:39 +00:00
Travis Howell
4d6b3dd5f3 Add German version of Simon the Sorcerer 2 (DOS Floppy) 
svn-id: r20803
 2006-02-20 23:27:32 +00:00
Max Horn
81e8a2860e Moved iMUSE code to the new directory engines/scumm/imuse/ 
svn-id: r20801
 2006-02-20 20:57:26 +00:00
Max Horn
130bee1b1e Fixing compiler (cast) warning 
svn-id: r20799
 2006-02-20 20:41:13 +00:00
Max Horn
e49e7ebb3f Fixing up my previous commit: finished moving common/scaler* to graphics 
svn-id: r20798
 2006-02-20 20:40:12 +00:00
Max Horn
7335d348ba Moved common/scaler* to graphics/ 
svn-id: r20797
 2006-02-20 20:29:02 +00:00
Max Horn
6160a17b30 Updated MD5 tables again, adding details to more HE game variants 
svn-id: r20796
 2006-02-20 17:01:30 +00:00
Max Horn
e389bcf497 Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game 
svn-id: r20795
 2006-02-20 16:51:30 +00:00
Max Horn
a6e5f6fd2c Added / corrected some comments, and moved ScummGameSettings to scumm.h 
svn-id: r20794
 2006-02-20 16:35:37 +00:00
Max Horn
6176252117 Use ptrdiff_t from stddef.h for our offsetof-clone (this should reduce warnings on e.g. the PS2, but may cause problems on systems that are missing this type/header. Please contact me if this causes problems on your port) 
svn-id: r20793
 2006-02-20 16:03:48 +00:00
Max Horn
7b28e4a4de Updated scumm-md5 table a bit more 
svn-id: r20790
 2006-02-20 14:48:49 +00:00
Max Horn
1bedb24dac Simplified puttrace entry in the (still unused) extra_versions table 
svn-id: r20789
 2006-02-20 14:48:32 +00:00
Max Horn
12b0ac3a72 Removing the GF_HE_985 from HE 99 games (I only was able to verify that this is correct for the demos, but am confident enough to risk this change even for the full german version) 
svn-id: r20788
 2006-02-20 14:44:44 +00:00
Max Horn
0712b468a3 Fix for bug #1428261 (Solaris x86 build fails: variable name collision) 
svn-id: r20787
 2006-02-20 14:18:30 +00:00
Max Horn
549eb83986 Workaround for bug #1308033 (FOA: skips single line of dialogue) 
svn-id: r20785
 2006-02-20 14:01:49 +00:00
Max Horn
78c44df439 More tweaks to the still unused extra_versions table 
svn-id: r20783
 2006-02-20 13:26:40 +00:00
Max Horn
011bcc04d2 Disable unchecked use of OSystem::setWindowCaption from SCUMM/HE scripts (this fixes crashes under Mac OS X with e.g. german puttrace) 
svn-id: r20782
 2006-02-20 13:24:19 +00:00
Paweł Kołodziejski
1fb19714e2 added experimental hook handle on 8,9 sub opcode music 
svn-id: r20779
 2006-02-19 23:25:27 +00:00
Max Horn
c175368230 Added more variant IDs for HE games 
svn-id: r20778
 2006-02-19 19:21:52 +00:00
Max Horn
bb0f2eec5d Specify variant IDs for some HE games in scumm-md5.txt/.h 
svn-id: r20777
 2006-02-19 19:05:31 +00:00
Max Horn
81ec4980a6 Updated the (still unused) extra_versions table a bit 
svn-id: r20776
 2006-02-19 19:04:22 +00:00
Max Horn
0c757abb72 - Added new extra_versions table -> work in progress and disabled for now. 
- Refined information in scumm-md5.txt a bit
- Updated scumm-md5.h to reflect the changes in scumm-md5.txt
- Removed some unicode garbage from scumm.cpp

svn-id: r20774
 2006-02-19 18:32:48 +00:00
Max Horn
85b9205f42 Fixed compiler warning 
svn-id: r20773
 2006-02-19 17:44:50 +00:00
Paul Gilbert
1cc03798d9 Cleaned up the main game loop, improved handling for changing rooms, and improved click handling to properly support areas that override standard click handling, such as when having a conversation 
svn-id: r20769
 2006-02-19 04:29:26 +00:00
Paul Gilbert
9496df6f1b Added basic support for conversations, as well as reworking the Hotspot class to allowing for non-hotspot animations like the floating talk icon during conversations 
svn-id: r20768
 2006-02-19 04:25:28 +00:00
Paul Gilbert
9a653960c7 Converted mouse and events classes to use new getReference style 
svn-id: r20767
 2006-02-19 04:22:00 +00:00
Paul Gilbert
cf99c2092d Updated memory set method call to new name 
svn-id: r20766
 2006-02-19 04:20:18 +00:00
Paul Gilbert
8de9189ffe Changed hotspot references to use updated hotspot methods 
svn-id: r20765
 2006-02-19 04:19:09 +00:00
Paul Gilbert
d0fe9fdd79 Added handling for conversation data, as well as moved storing cursor data into it 
svn-id: r20764
 2006-02-19 04:17:54 +00:00
Paul Gilbert
5d8d871df3 Added new resources for conversations, cleaned up existing class names, and expanded hotspot resources to add newly understood fields 
svn-id: r20763
 2006-02-19 04:15:33 +00:00
Paul Gilbert
d525af4685 Added display of talk dialogs during conversations 
svn-id: r20762
 2006-02-19 04:13:08 +00:00
Paul Gilbert
3d0ada9443 Implemented several more script engine methods 
svn-id: r20761
 2006-02-19 04:11:22 +00:00
Paul Gilbert
b55cf4b0ff Added new class for displaying conversation talk dialogs 
svn-id: r20760
 2006-02-19 04:08:41 +00:00
Paul Gilbert
7ce5441ad6 Added new definitions used by the conversation subsystem 
svn-id: r20759
 2006-02-19 04:07:11 +00:00
Paul Gilbert
91d6bd57d7 Changed subsystem object create methods whose constructors I've switched to the newer getReference access 
svn-id: r20758
 2006-02-19 04:05:45 +00:00
Paul Gilbert
f868a59940 Changed the menu subsystem to use getReference rather than being passed in the constructor 
svn-id: r20757
 2006-02-19 04:04:07 +00:00
Paul Gilbert
441d0a89cc Changed the changed memset method to setBytes, which I like better 
svn-id: r20756
 2006-02-19 04:02:01 +00:00
Max Horn
01fc7034b5 - Merged GameDetector::detectGame() into GameDetector::detectMain() 
- Replaced GameSettings GameDetector::_game by a simple gameid string

svn-id: r20753
 2006-02-18 12:50:48 +00:00
Max Horn
8ac17430ac - renamed PLUGIN_getSupportedGames to PLUGIN_gameIDList for consistency 
- renamed Engine_XXX_gameList to Engine_XXX_gameList for consistency
- added new Engine_XXX_findGameID / PLUGIN_findGameID function
- updated plugins code to take advantage of the new plugin API, to support
  obsolete gameids w/o showing them to the user

svn-id: r20752
 2006-02-18 11:15:37 +00:00
Eugene Sandulenko
e13315928b Enable gob2 detection 
svn-id: r20749
 2006-02-18 01:04:58 +00:00
Eugene Sandulenko
a757cab416 Simplified use of namespaces 
svn-id: r20748
 2006-02-18 00:36:45 +00:00
Max Horn
81798556db - Removed the 'features' field from GameSettings 
- Removed GF_DEFAULT_TO_1X_SCALER

svn-id: r20747
 2006-02-18 00:12:36 +00:00
Max Horn
d13950dab2 Fixed extra desc for a few MD5 table entries 
svn-id: r20744
 2006-02-17 15:51:20 +00:00
Max Horn
4ad0b867b3 Reduced header dependencies 
svn-id: r20743
 2006-02-17 15:37:25 +00:00
Torbjörn Andersson
147c17989a This file was obsoleted by the previous commit, but I didn't want to force SVN 
to remove it. Removed it now instead.

svn-id: r20742
 2006-02-17 15:15:29 +00:00
Torbjörn Andersson
002c587965 Removed includes from sword2.h so that (hopefully) there will eventually be 
less dependencies.

svn-id: r20741
 2006-02-17 15:07:36 +00:00
Max Horn
bf79947a5b Removed lots of unneeded #includes from gob.h, and moved GobGameSettings to gob.cpp -> reduced header dependencies -> faster recompile when one of those headers is modified 
svn-id: r20740
 2006-02-17 08:44:16 +00:00
Max Horn
7967e30c73 Added global toGameSettings() template function for convenience; simplified GameSettings usage in some engines 
svn-id: r20739
 2006-02-17 00:22:53 +00:00
Max Horn
a96760a2fd Reduced use of GF_DEFAULT_TO_1X_SCALER in favor of a new param to Engine::initCommonGFX; added a TODO stating that it should eventually be removed completly 
svn-id: r20738
 2006-02-17 00:01:18 +00:00
Torbjörn Andersson
fde1da92f0 Whitespace fix. 
svn-id: r20737
 2006-02-16 23:43:51 +00:00
Max Horn
405733e044 - Fixed a bug that prevented you from overriding the scaler from the command 
line for 640x480 games.
- Updated NEWS file a bit

svn-id: r20736
 2006-02-16 23:24:23 +00:00
Travis Howell
c26af987c2 Fix overlay images not always been marked as compressed in the Feeble Files 
svn-id: r20735
 2006-02-16 22:49:26 +00:00
Travis Howell
5c98378e84 Cleanup drawing code for Feeble Files 
svn-id: r20734
 2006-02-16 22:35:43 +00:00
Paweł Kołodziejski
8b76033dc3 added more asserts into imuse digi code 
svn-id: r20733
 2006-02-16 21:50:14 +00:00
Sven Hesse
fbefbfc160 Updating more opcodes for Gob2 
svn-id: r20731
 2006-02-16 20:25:59 +00:00
Max Horn
200320c237 - Further extended the file format of tools/scumm-md5.txt: One can now specify 
a variant ID, and the description field has been split into two parts.
- Updated the PHP output, removing duplicate information and hopefully
  increasing the readability at the same time.

svn-id: r20729
 2006-02-16 18:00:22 +00:00
Torbjörn Andersson
6e3686e494 For now, do not attempt to draw "overlay" sprites, like the Oracle icon. The 
good news is that the original function to draw these appears to be written in
C, so it should be easy to decipher.

The bad news is that I failed. :-)

svn-id: r20728
 2006-02-16 16:39:45 +00:00
Travis Howell
d4e2b25e5d Stop music in HE games, before nuking the resource 
svn-id: r20727
 2006-02-16 13:45:52 +00:00
Paweł Kołodziejski
6b557fabd5 force arg variable to float type, msvc8 can't select from float or double 
svn-id: r20725
 2006-02-16 12:04:12 +00:00
Travis Howell
4694e98649 Remove auto free flag for sounds in some HE games 
svn-id: r20724
 2006-02-16 08:55:06 +00:00
Travis Howell
37cc74db39 Use simplier method of checking sound status in HE60/61 games 
svn-id: r20723
 2006-02-16 08:47:19 +00:00
Travis Howell
903daa7252 Send sound resource data directly to sound mixer in HE Games.\n Fixes songs in kitchen of Pajama Sam 1 
svn-id: r20721
 2006-02-16 08:25:12 +00:00
Travis Howell
448ea4f16e Only DOS & Macintosh versions of HE60/61 games require XMIDI support 
svn-id: r20720
 2006-02-16 06:00:46 +00:00
Travis Howell
5f72260f20 Stop current music in HE60/61 games, before starting new music 
svn-id: r20719
 2006-02-16 05:55:44 +00:00
Travis Howell
e77fc9b9aa Clear sound queue when stopping sound channel in HE games 
svn-id: r20718
 2006-02-16 05:52:39 +00:00
Travis Howell
fbcecb98a1 Add 3DO platform for HE games 
svn-id: r20714
 2006-02-16 05:01:06 +00:00
Travis Howell
dd23256b24 Only print debug message when flag 0x800000 is triggered by HE games in drawWizPolygonTransform(). 
svn-id: r20711
 2006-02-15 23:27:53 +00:00
Travis Howell
e98555249e Read correct index by block size in HE games again, to help track down unknown versions. 
svn-id: r20709
 2006-02-15 23:04:48 +00:00
Travis Howell
bcef7a167c Read correct index by block size in HE games again, to help track down unknown versions. 
svn-id: r20708
 2006-02-15 23:02:37 +00:00
Eugene Sandulenko
eba1653904 o Renamed script_v6he.cpp and script_v7he.cpp to script_v60he.cpp and 
script_v70he.cpp respectively since we use 2 digits for HE versioning.

o Also renamed resource_v7he.* to resource_he.* because it is actually not
  HE70-specific but is used by all HE70+ titles.

svn-id: r20703
 2006-02-15 18:48:49 +00:00
Max Horn
b20384d375 Fix for bug #795214 (MI1: Crash on church entry) 
svn-id: r20697
 2006-02-15 17:31:26 +00:00
Eugene Sandulenko
10c7835cfc Moved all he-specific source files to engines/scumm/he/ subdirectory 
svn-id: r20696
 2006-02-15 00:57:50 +00:00
Johannes Schickel
0bea9cf47b Made the kyra debug extensions more generic, i.e. scumm engine could replace 
their debugC calls now with the new introduced debugC calls.
(A mail how to use it will follow shortly on -devel)
Also now these special engine debug flags can be specified from the commandline.
Also made the -c & --config parameter check more secure.

svn-id: r20695
 2006-02-14 23:31:25 +00:00
Torbjörn Andersson
fc3cdbe5a9 It looks like Feeble Files adjustis sprite coordinates by _scrollY as well, 
where Simon 2 only adjusts by _scrollX. Perhaps Feeble Files have rooms that
scroll both horizontally and vertically?

Again, this makes no difference to the early stages of the game.

svn-id: r20694
 2006-02-14 21:20:10 +00:00
Torbjörn Andersson
2bdbfa0669 As far as I can tell, The Feeble Files should subtract _scrollX from the 
sprite's X coordinate, just as we already do for Simon 2. (I believe that was
when scrolling rooms were first introduced.)

I've never played The Feeble Files (apart from the first two or three rooms)
so I can't say whether or not it uses scrolling rooms.

svn-id: r20693
 2006-02-14 21:10:42 +00:00
Travis Howell
b796860ee8 Add extra costume tables (Used by HE games) to saved game. Fixes weird actor states when restoring saved game, in HE games. 
svn-id: r20689
 2006-02-14 10:11:15 +00:00
Travis Howell
d96713a857 Correct case of SPY Fox game titles 
svn-id: r20687
 2006-02-14 06:57:42 +00:00
Travis Howell
515a4ea381 Allow version string to be writen to config file in HE72+ games, in case we display version in the future. 
svn-id: r20686
 2006-02-14 05:50:29 +00:00
Travis Howell
9e8b493990 Add HE100 specific version of setSystemMessage opcode, since cases are different. 
svn-id: r20685
 2006-02-14 05:47:12 +00:00
Travis Howell
de6aac4e2f Add setSystemMessage opcode for HE70+ games. Sets the window caption correctly for all languages 
svn-id: r20684
 2006-02-14 05:27:39 +00:00
Eugene Sandulenko
e0b7feeaed Move addDefaultDirectory() calls out of init() method to constructor. 
svn-id: r20679
 2006-02-14 01:59:32 +00:00
Johannes Schickel
93e9639989 Reworked kyra debug output system. Now he have special kyra intern debug levels + the global debug levels, for now I enable all kyra debug levels if the global debug level is not -1. see 'toggle_debug' in the kyra debugger and kyra.h for the different levels. (This is just the beginning of it anyway, for example the sound debug level isn't used for now) 
svn-id: r20678
 2006-02-14 01:19:30 +00:00
Travis Howell
81b820f7c9 Add hyperlink on/off functions of oracle in Feeble Files 
svn-id: r20665
 2006-02-13 10:29:25 +00:00
Oystein Eftevaag
2905826002 Initializes a var that would sometimes cause the intro to run too fast. 
svn-id: r20663
 2006-02-13 03:52:57 +00:00
Torbjörn Andersson
441ead453a Merged _mouse.cpp and mouse.cpp into mouse.cpp 
svn-id: r20659
 2006-02-12 21:41:34 +00:00
Travis Howell
d1a5345169 Include game dscriptions for HE60/61 games in a DISABLE_HE build 
svn-id: r20658
 2006-02-12 21:41:09 +00:00
Max Horn
00abb48c7d Moved SCUMM game descriptions/titles into a seperate table 
svn-id: r20657
 2006-02-12 20:51:56 +00:00
Torbjörn Andersson
8935cac6da Standardized the preprocessor constants used to prevent double inclusion of 
header files. Each now begins with "SWORD2_" and ends with "_H". (Well, except
for "SWORD2_H", since I didn't want to name it "SWORD2_SWORD2_H".)

svn-id: r20655
 2006-02-12 19:57:23 +00:00
Torbjörn Andersson
0dbeb2f65b Oops. Forgot to tell SVN to actually *move* the files. I'll get the hang of it 
eventually.

svn-id: r20652
 2006-02-12 19:38:26 +00:00
Torbjörn Andersson
2ec8584828 Renamed files for consistency with other engines: 
build_display  -> screen
    save_rest      -> saveload

More to come, no doubt.

svn-id: r20651
 2006-02-12 19:33:45 +00:00
Torbjörn Andersson
d6fea31251 Removed layers.h since it was a) empty and b) never included. 
svn-id: r20644
 2006-02-12 19:20:10 +00:00
Max Horn
952b23fec7 - Changed the scumm-md5.txt format to reduce redundancy and to make it a bit niecer to edit 
- Added --txt option to the md5table tool -> makes it easier to modify the scumm-md5.txt format

svn-id: r20641
 2006-02-12 19:03:39 +00:00
Max Horn
7ef0b0c650 Fixing platform value for two HE mac demos 
svn-id: r20624
 2006-02-12 15:40:38 +00:00
Eugene Sandulenko
faec3622b3 Committed old work on Soccer U32. Too far from being finished. 
svn-id: r20613
 2006-02-12 13:45:57 +00:00
Travis Howell
b9fec00c25 Only adjusted in SCUMM 5+ 
svn-id: r20598
 2006-02-12 11:03:16 +00:00
Travis Howell
30c5480bd3 Actor room is only checked in SCUMM 7+ 
svn-id: r20597
 2006-02-12 09:52:13 +00:00
Travis Howell
2873ae8186 Actually that should be before all code 
svn-id: r20595
 2006-02-12 07:03:04 +00:00
Travis Howell
86ee0df205 A few corrections from disasm., checked against all versions 
svn-id: r20594
 2006-02-12 06:43:42 +00:00
Travis Howell
37bc512d64 This difference only applies to SCUMM7+ 
svn-id: r20593
 2006-02-12 04:43:27 +00:00
Travis Howell
19e3882439 Add another Loom demo 
svn-id: r20591
 2006-02-12 02:21:03 +00:00
Max Horn
be068cf6f3 The GameDetector is no longer a required parameter for Engine constructors 
svn-id: r20590
 2006-02-12 01:42:34 +00:00
Max Horn
80cf2fa46f Reduced data duplication in module.mk files; added module.mk files for null and x11 backends; added engines/module.mk 
svn-id: r20584
 2006-02-12 00:16:31 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory 
svn-id: r20582
 2006-02-11 22:45:04 +00:00