libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-15 22:38:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,973 Commits 5 Branches 5 Tags
Commit Graph

53 Commits

Author SHA1 Message Date
Max Horn
5ceb635420 Merging more of the GSoC 2008 RTL branch: SCUMM 
svn-id: r34253
 2008-09-01 20:20:20 +00:00
Torbjörn Andersson
28ce384cb6 Added a whitespace, just for salty-horse. 
svn-id: r34208
 2008-08-30 12:54:54 +00:00
Christopher Page
ce3d1e1a7d Merged revisions 33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33720
 2008-08-09 19:03:29 +00:00
Max Horn
e7027503f1 Workaround for bug #2016521 (DOTT: Bernard impersonating LaVerne) 
svn-id: r33655
 2008-08-06 10:32:20 +00:00
Christopher Page
e9c6b03fc7 SCUMM works with new GMM implementation 
svn-id: r33001
 2008-07-11 01:22:37 +00:00
Chris Apers
1b69c18b56 Fixed PalmOS compilation 
svn-id: r32223
 2008-05-23 11:13:15 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time 
svn-id: r31888
 2008-05-06 03:00:26 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs. 
svn-id: r30667
 2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Eugene Sandulenko
0f6246bab8 Fix for bug #896489: "DIG: Missing subtitles when talking to Brink" 
svn-id: r30167
 2008-01-02 21:15:23 +00:00
Max Horn
be11104d70 Removed obsolete _insaneRunning flag 
svn-id: r30107
 2007-12-31 16:34:30 +00:00
Eugene Sandulenko
ef319ad674 Patch #1859448: Add OSystem::getTimeAndDate API 
svn-id: r30034
 2007-12-28 07:43:52 +00:00
Max Horn
6d37f5ccd8 Do not #include time.h globally (ideally, we should provide a localtime clone in OSystem so we can completly get rid of this) 
svn-id: r29919
 2007-12-20 14:29:58 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Max Horn
0cccbb29d6 Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :) 
svn-id: r28877
 2007-09-08 11:15:27 +00:00
Max Horn
302da0b855 SCUMM: Added three FIXME comments to the _keyDownMap code, and made it use KEYCODE_ constants for clarity 
svn-id: r27659
 2007-06-23 11:53:24 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Max Horn
6899e72be9 Got rid of GF_DIGI_IMUSE and GF_NEW_CAMERA 
svn-id: r25454
 2007-02-10 02:05:59 +00:00
Max Horn
27432a4dc1 Moved some stuff from CharsetRenderer (back) to ScummEngine, added comments 
svn-id: r25250
 2007-01-28 20:11:31 +00:00
Max Horn
dc8dde1872 Patch from bug report #1615417: SCUMM (v6): Cursor isn't updated after hotspot changes 
svn-id: r25162
 2007-01-24 00:11:22 +00:00
Max Horn
c210aff40c * Made Actor::_pos protected, added public Actor::getPos() method 
* Added default params to Actor::putActor()
* Removed Actor::getActorXYPos

svn-id: r24742
 2006-11-19 00:39:48 +00:00
Max Horn
df2ccb78c2 cleanup 
svn-id: r24711
 2006-11-13 20:20:01 +00:00
Max Horn
12fb12caf5 Moved more SMUSH/Insane code from ScummEngine_v6 to ScummEngine_v7 
svn-id: r24710
 2006-11-13 20:12:52 +00:00
Max Horn
db1fc75012 SCUMM cleanup 
svn-id: r24612
 2006-11-04 22:59:56 +00:00
Max Horn
5e9041b1b5 SCUMM: ArrayHeader related cleanup 
svn-id: r24395
 2006-10-20 19:44:27 +00:00
Paweł Kołodziejski
e85ab4b10f now SmushPlayer is class created once same as SmushMixer while scumm engine creation. this allow finish play smush audio track finished to the end instead immediately stopped as it was happen before 
svn-id: r24263
 2006-10-10 12:16:21 +00:00
Max Horn
4973c657b8 Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases) 
svn-id: r24169
 2006-10-07 13:57:06 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now) 
svn-id: r23922
 2006-09-17 20:36:48 +00:00
Max Horn
b860f002b2 Replaced checkRange by assertRange, which has (a) an (IMO) more logical order of parameters, and (b) removes lots of useless duplicate information in error messages 
svn-id: r23885
 2006-09-16 13:38:43 +00:00
Max Horn
bd38f5f4d3 Renamed o6_getActorAnimCounter1 to o6_getActorAnimCounter 
svn-id: r23857
 2006-09-09 18:31:32 +00:00
Travis Howell
286de879fd Add cyx's patch for bug #1035739 - SCUMM/SMUSH: Ugly palette change when video finishes 
svn-id: r23216
 2006-06-21 10:28:09 +00:00
Travis Howell
4b2aa54304 Revert back to original method used for scrollEffect(), fixes regressions. 
svn-id: r23214
 2006-06-21 06:50:50 +00:00
Torbjörn Andersson
ecfedb1e81 Cleanup. It seems unnecessary to have a "break" right after an unconditional 
return in a switch case.

svn-id: r23198
 2006-06-20 18:55:25 +00:00
Travis Howell
bc6306192d Fix screen scrolling glitch when looking at the top of closet in parents room of DOS version of fbear 
svn-id: r23174
 2006-06-19 04:09:39 +00:00
Max Horn
c4df5037dc * Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data. 
* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227
 2006-04-29 16:24:39 +00:00
Max Horn
74edd90aba Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch) 
svn-id: r21951
 2006-04-16 19:23:14 +00:00
Max Horn
cf202049ff Fixing mismatch between format strings and data on some systems 
svn-id: r21827
 2006-04-12 14:54:12 +00:00
Jonathan Gray
eb3ae7d726 sizeof(void *) != sizeof(int) for a large number of systems. 
Fix a lot of debug/error statements that were using %d/%x
for the result of pointer arithmetic.

As C++ apparently has no format string for ptrdiff_t use
%lu/%lx as appropriate.

svn-id: r21824
 2006-04-12 10:01:41 +00:00
Travis Howell
3f172bb3c2 Remove unused cases of getKeyState(), checked against scripts of FT, Dig and COMI. 
svn-id: r21381
 2006-03-19 11:10:24 +00:00
Travis Howell
a379fe424c The camera position is always set by loadRoomWithEgo opcode in HE games, through cameraFollows. Fixes glitches when changing rooms in fbear and other early games. 
svn-id: r21355
 2006-03-18 10:30:47 +00:00
Travis Howell
f52e1709bf o6_setObjectName is never used by HE72+ games 
svn-id: r21211
 2006-03-10 23:09:27 +00:00
Max Horn
bac32d1a5c Moved ScummFile etc. to the new file.cpp / file.h 
svn-id: r21038
 2006-03-03 15:16: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
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
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
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
81e8a2860e Moved iMUSE code to the new directory engines/scumm/imuse/ 
svn-id: r20801
 2006-02-20 20:57:26 +00:00