Commit graph

58 commits

Author SHA1 Message Date
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
6f4b567124 SCUMM: Split intern.h into multiple headers
svn-id: r39567
2009-03-20 16:33:58 +00:00
Max Horn
7c0b2cfd27 Added multiple new open() methods to Common::File, which make it possible to use this class as a generic convenience wrapper around all kinds of SeekableReadStream; also renamed the name() method to the less confusing getName()
svn-id: r34696
2008-09-30 09:12:02 +00:00
Max Horn
2bc093828f Replaced Engine::_gameDataPath (a String) by Engine::_gameDataDir (an FSNode); adapted code to that (by using getChild() to get subdirs, not string concatenation
svn-id: r34434
2008-09-07 22:10:58 +00:00
Max Horn
088a1c0806 ScummFile: Don't use the File::_ioFailed flag, rather track the io status separately; also, changed eof() -> eos()
svn-id: r34389
2008-09-06 20:34:21 +00:00
Max Horn
5ceb635420 Merging more of the GSoC 2008 RTL branch: SCUMM
svn-id: r34253
2008-09-01 20:20:20 +00:00
Max Horn
c657f1d09a Made out-of-memory error in SCUMM a bit more verbose
svn-id: r34201
2008-08-29 09:44:05 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing
svn-id: r33412
2008-07-29 16:09:10 +00:00
Christopher Page
e9c6b03fc7 SCUMM works with new GMM implementation
svn-id: r33001
2008-07-11 01:22:37 +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
Travis Howell
410a4a974e Enable Windows version of early HE games by default, to match already enabled 3DO/DOS/Macintosh versions of early HE games. Adding only the minimum code required for HE70 games.
svn-id: r30011
2007-12-27 11:40:29 +00:00
Max Horn
138263ec03 cleanup
svn-id: r29974
2007-12-24 14:20:53 +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
4cc9d17c34 Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup
svn-id: r28890
2007-09-11 09:20:39 +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
2447752a51 Reverted my roomoffs changes (broke the Loom intro), and instead added the constant RES_INVALID_OFFSET to indicate an invalid room offset
svn-id: r26353
2007-04-01 15:58:34 +00:00
Max Horn
a08feb9f70 Got rid of some 0xFFFF -> 0xFFFFFFFF conversions and similiar nonsense by using a clever technique called 'signed ints' for room offsets (and this won't cause any regressions; any you may encounter are merely the products of a deranged imagination)
svn-id: r26331
2007-03-31 14:00:34 +00:00
Max Horn
8fa6a1ffd5 Removed the (useless, thanks to resTypeFromId) 'name' parameter from readResTypeList
svn-id: r25828
2007-02-24 19:29:40 +00:00
Max Horn
04a18dd7c4 SCUMM: cleanup (moved small header specific code from ScummEngine::readResTypeList to ScummEngine_v4::readResTypeList)
svn-id: r25827
2007-02-24 19:20:15 +00:00
Max Horn
f1f28b61a9 Modify ScummEngine::getResourceSize to assert if called on a missing resource, instead of trying to read from high memory
svn-id: r25806
2007-02-23 02:35:01 +00:00
Max Horn
b777c09ac0 Removed some dead code, updated a warning message
svn-id: r25662
2007-02-17 20:38:27 +00:00
Max Horn
5e9041b1b5 SCUMM: ArrayHeader related cleanup
svn-id: r24395
2006-10-20 19:44:27 +00:00
Max Horn
d02e4d7f7c Removed CHECK_HEAP
svn-id: r23979
2006-09-23 11:29:32 +00:00
Max Horn
fab33bf663 Moved stored flobjects to class ScummEngine_v70he
svn-id: r23924
2006-09-17 22:22:50 +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
94bd9ef05d Moved allocResTypeData from ScummEngine to ResourceManager; removed friend declarations from ResourceManager, and performed other minor tweaks
svn-id: r23856
2006-09-09 18:20:28 +00:00
Max Horn
b3ee442693 Moved _heV7RoomIntOffsets initialization
svn-id: r23855
2006-09-09 17:31:44 +00:00
Max Horn
3f41e2dc21 Detect (and error out) if readMAXS fails
svn-id: r22120
2006-04-23 22:39:55 +00:00
Max Horn
1a7b4a7d7c Added a comment regarding COMI disc changing
svn-id: r22117
2006-04-23 20:02:33 +00:00
Max Horn
4b6f90945b Modified openFile and openResourceFile to take a Common::String instead of a char pointer
svn-id: r22112
2006-04-23 17:39:31 +00:00
Max Horn
0d67640a58 Behold, the new SCUMM detector finally has arrived. Unified detection & engine instantiation, reduced code duplication, more powerful detection in case MD5 is not known / can't be computed, and many other nifty improvements.
svn-id: r22110
2006-04-23 17:33:16 +00:00
Max Horn
660efce9b2 Replaced _demoMode by GF_DEMO
svn-id: r22087
2006-04-23 00:08:18 +00:00
Max Horn
70d23ccf29 Added a small comment to ScummEngine::openRoom that explains why we check for room==0 instead of just using it as-is
svn-id: r22038
2006-04-19 18:14:28 +00:00
Max Horn
6df54763ef Yes, it is really necessry to compute a special 'disk number' here (in fbear at least)
svn-id: r21882
2006-04-14 10:32:06 +00:00
Max Horn
1470dadb1d Changed File::open to take a Common::String as file name parameter
svn-id: r21867
2006-04-14 01:48:51 +00:00
Max Horn
4ec79db410 Rearranged code in ScummEngine::openRoom a bit, to separate the filename generation from other things
svn-id: r21813
2006-04-11 22:41:44 +00:00
Max Horn
64ae34400f Removing dummy code from resource.cpp
svn-id: r21769
2006-04-10 22:11:05 +00:00
Max Horn
9f93e5bb81 Renamed various container isEmpty() methods to empty() to match STL conventions
svn-id: r21472
2006-03-28 09:42:54 +00:00
Travis Howell
67b8589c18 Reduce size of saved games for HE games, music/speech resources don't need to be saved
svn-id: r21456
2006-03-26 00:24:00 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call)
svn-id: r21141
2006-03-08 11:37:25 +00:00
Travis Howell
bc735c4595 Older naming style only used by PC version of FT demo
svn-id: r21070
2006-03-04 12:08:19 +00:00
Max Horn
7085bf3724 Slightly clarified an odd subcase in ScummEngine::openRoom
svn-id: r21068
2006-03-04 11:55:49 +00:00
Max Horn
5e881c158a This particular case in ScummEngine::openRoom only occurs for V4 games; changing the check accordingly, to ease future refactoring
svn-id: r21063
2006-03-04 10:41:40 +00:00
Max Horn
bb38ea2c17 Renamed SubstResFileNames::winName and macName to almostGameID / expandedName (the old names were misleading; the new ones aren't great either :)
svn-id: r21062
2006-03-04 10:38:05 +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
Max Horn
52970c9936 Cleanup
svn-id: r20949
2006-02-26 21:59:44 +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
2ae0f79de3 Split SCUMM's generateSubstResFileName into two functions: findSubstResFileName and applySubstResFileName
svn-id: r20879
2006-02-25 17:36:32 +00:00