Commit Graph

173 Commits

Author SHA1 Message Date
Max Horn
9a955180a4 * Renamed config.mak to config.mk
* Renamed common.rules to rules.mk
* Removed explicit declaration of MODULE_DIRS in various spots (instead we let rules.mk compute it)

svn-id: r23275
2006-06-24 08:48:11 +00:00
Max Horn
d210b19aec Move backends/fs/fs.h and .cpp to common/fs/fs.h and .cpp
Rationale: backend implementations belong to backends/, but portable APIs meant to be used by high level code is for common / sound / graphics / ... (compare also with backends/midi vs. sound/mididrv.h)

svn-id: r23274
2006-06-24 08:07:48 +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
Sven Hesse
332e1d860e Some more READ_LE_* -> MemoryReadStream.* conversions
svn-id: r23099
2006-06-13 19:15:08 +00:00
Sven Hesse
a709eb05b7 More READ_LE_* -> MemoryReadStream conversion + minor cleanup
svn-id: r23089
2006-06-13 17:02:53 +00:00
Sven Hesse
243e6b2d27 Fixing Scenery::_statics, Game::_totTextData and Game::_totResourceTable
svn-id: r23078
2006-06-13 08:10:54 +00:00
Sven Hesse
f52921fb9b Using MemoryReadStream for Scenery::loadAnim()
svn-id: r23073
2006-06-12 22:21:07 +00:00
Sven Hesse
796b001b4f Fixing loading of Scenery::_animations[] + small gob2 cleanup
svn-id: r23066
2006-06-12 21:33:30 +00:00
Sven Hesse
5c630a4e63 Small corrections and cleanup for Gob2, fixing the graphical glitches in the intro
svn-id: r23060
2006-06-12 10:55:53 +00:00
Sven Hesse
897fa6a5a6 More stub-filling + small clean-up
svn-id: r23012
2006-06-10 14:37:48 +00:00
Johannes Schickel
276d754443 Fix some msvc8 warnings.
svn-id: r22988
2006-06-08 19:55:16 +00:00
Sven Hesse
34dae22c1a More goblin handling functions, now the deactivated goblin shows
his boredom. It's the wrong goblin that's deactivated, though.
Also, the entering animation is still missing (now nothing is drawn
instead).

svn-id: r22979
2006-06-07 18:49:20 +00:00
Sven Hesse
bf86b9b022 Two segfault and several coding style related fixes
svn-id: r22954
2006-06-06 15:43:44 +00:00
Sven Hesse
b5bc1c82fa - Fixed endianness/signess issues
- Added a memset in Video_v2::SpriteUncompressor(), that should have
  been there in the first place; this fixes the tree in GOB2's first room
- Fixed ADL delete[]ing

svn-id: r22917
2006-06-04 17:24:03 +00:00
Sven Hesse
4b706aca43 Fixing an endian-issue in setVoice()
svn-id: r22858
2006-06-03 08:53:10 +00:00
Sven Hesse
2aa31f4bf3 Matched the memset in imdFrameUncompressor() to the original asm, that
fixes a small glitch

svn-id: r22857
2006-06-03 08:50:41 +00:00
Sven Hesse
f3f7b670d0 - Fixed IMD transparency
- Fixed SegFault due to uninitialized _multData2
- Removed left-over debug comment

svn-id: r22830
2006-06-02 10:54:53 +00:00
Sven Hesse
96d77f16b7 - Fixed drawing of sprite-parts based texts
- Removed misplaced Music::stopPlay() call

svn-id: r22816
2006-06-01 12:18:12 +00:00
Lars Persson
0044ef7be1 Fixed deletion statement as it was deleting arrays(CW compiler was complaining).
svn-id: r22810
2006-05-31 20:19:03 +00:00
Sven Hesse
086c3dfc76 Use _mapWidth/_mapHeight instead of constant
svn-id: r22801
2006-05-31 13:43:23 +00:00
Sven Hesse
da69cc267c Hopefully fixed bug #1498024
svn-id: r22796
2006-05-31 10:55:57 +00:00
Sven Hesse
05499f58dd - Removed usage of OSystem::quit(), added a _quitRequested variable
- Fixed some leaks, unitialized memory and delete/delete[]-errors

svn-id: r22790
2006-05-31 08:44:14 +00:00
Sven Hesse
d6f1ba1540 - More GOB2 map conversions
- Added Music_Dummy (for --music-driver=null)
- Implemented IMDs. That took longer than I expected...
  On the bright side, Ween's intro now plays more correctly

svn-id: r22754
2006-05-29 18:24:52 +00:00
Eugene Sandulenko
b99d128a1d Add reported Gob2 german floppy.
svn-id: r22720
2006-05-28 13:28:10 +00:00
Willem Jan Palenstijn
35d242b74b make printExpr, skipExpr accept both gob1 and gob2 expressions
svn-id: r22568
2006-05-21 21:18:23 +00:00
Andrew Kurushin
45b249ee60 fix VS2005 compilation warnings
svn-id: r22431
2006-05-13 08:39:12 +00:00
Sven Hesse
42e03bd707 - Sound! Still a bit glitchy, though:
- Negative frequences?!? Maybe "SFX"?
  - No sound for a small part of the intro
    (there aren't any sndKeys covering that part either)
  - A rythm-instrument (hi-hat?) in the titlemusic isn't played as one
- More differences in the drawing functions fleshed out
- Some of the goblin handling functions written
- More unnamed functions and variables, wheeee...

svn-id: r22410
2006-05-11 19:43:30 +00:00
Sven Hesse
8a855b4251 - Stubbed goblinFunc(), it's completeley different; now it at least
doesn't crash anymore
- Reduced valgrind's complains about unitialized memory

svn-id: r22263
2006-05-01 19:11:57 +00:00
Sven Hesse
61a0266a92 More stubs; GOB2 goes in-game for a second, then segfaults in the
Global-constructor; valgrind shows invalid reads in parseValExpr()
and parseExpr() while accessing _inter_variables and _inter_execPtr

svn-id: r22262
2006-05-01 16:04:53 +00:00
Sven Hesse
2eabfd5f28 - More differences in Draw_v2::spriteOperation()
- GOB2 handles _frontSurface/_backSurface a bit differently, this fixes
  (most of) the drawing glitches in the intro
- Added using a fallback when the user's game version doesn't have the
  requested language
- off_2E51B et al. stubs, I think it has something to do with the menu

svn-id: r22254
2006-05-01 12:43:50 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
bf73598811 * Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
2006-04-29 00:27:20 +00:00
Sven Hesse
b4e5e18201 Fixed portability issue
svn-id: r22006
2006-04-18 12:55:01 +00:00
Sven Hesse
4d2f4a9f79 - Closed the stub in Draw_v2::printText()
- Added a language field in GameSettings, so that the texts in
  Gob2 work for other languages than EN_GRB as well

svn-id: r22005
2006-04-18 12:39:02 +00:00
Sven Hesse
ab48280f73 - I misunderstood Draw::initBigSprite(); fixed
- Changed Draw::spriteOperation() for blitting from/to/between and
  fillrecting to big sprites
- Enabled drawing of text

svn-id: r22001
2006-04-18 09:59:18 +00:00
Max Horn
ba1b25305e Removed the directory parameter from md5_file
svn-id: r21937
2006-04-16 12:50:39 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Sven Hesse
cff96b0a75 - Seems like I forget a branch in Mult_v2::animate()
- sub_1A52B is Scenery::updateStatic()

svn-id: r21889
2006-04-14 18:18:46 +00:00
Max Horn
daf541e0b8 Fix compiler warnings
svn-id: r21855
2006-04-14 00:05:26 +00:00
Sven Hesse
fb985a26f8 Fixed the invalid reads visible with valgrind, deleted the
printText-dup, it's wrong for Gob2 anyway...

svn-id: r21849
2006-04-13 21:52:23 +00:00
Sven Hesse
a3cd0bd17d Commented the SpriteOperation in Draw_v2::printText() out for now,
they are responsible for background mess-ups in the intro

svn-id: r21848
2006-04-13 21:09:39 +00:00
Sven Hesse
3bed2d377e Some more stubs and rearrangings
svn-id: r21847
2006-04-13 20:56:22 +00:00
Sven Hesse
07a0d54891 - More stubs, the intro now works completely (with extreme graphical
glitches and without sound in the floppy version), the title screen
  is shown afterwards
- Added skipping of the floppy version's copy protection screen,
  since the CD version doesn't show it either

svn-id: r21845
2006-04-13 16:25:07 +00:00
Sven Hesse
adbafccc64 - Fixed the mistake in Mult_v2::loadMult() that caused Gob2 floppy to
have a messed up script-pointer afterwards
- Added/Changed parts of Mult_v2::playMult() et al. so that the intro
  works for a few seconds (with glitches) before getting killed while
  trying to draw text (CD) or trying to play sounds (floppy)

svn-id: r21823
2006-04-12 09:49:08 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
svn-id: r21689
2006-04-08 12:06:07 +00:00
Max Horn
8cf8acfd63 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21686
2006-04-08 11:21:04 +00:00
Eugene Sandulenko
8fa9bd6728 Removed extra exclamation marks in warning() calls as well.
svn-id: r21608
2006-04-04 22:21:10 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +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
Eugene Sandulenko
22042bc637 - Implemented case insensitive file reading. Left old system as a fallback
in case some engine writer decide to do something unwise
- Removed used of ConfMan.getKey("path") in file-related cases, because
  now File class handles that
- Fixed bug in ScummEngine_v80he::o80_getFileSize() where path delimiters
  weren't translated

svn-id: r21443
2006-03-25 04:17:17 +00:00
Willem Jan Palenstijn
879b5e4064 workaround: manually add delay when showing image between levels in gob1 ega
svn-id: r21364
2006-03-18 13:44:57 +00:00
Max Horn
86565fcca5 - Renamed GameSettings to PlainGameDescriptor
- Added new GameDescriptor struct (similar to PlainGameDescriptor but with
  Common::String members instead of const char * ones)
- Changed DetectedGame to subclass GameDescriptor
- Removed toGameSettings() in favor of new (template) constructors in
  DetectedGame and GameDescriptor
- Fixed a bug in the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
2006-03-09 02:52:51 +00:00
Max Horn
d2f78184af - added new toDetectedGame() template function (analog to toGameSettings)
- made use of the new DetectedGame constructor from my last commit
- some related cleanup

svn-id: r21149
2006-03-09 01:42:56 +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
Max Horn
907bd7128d Fix for bug #1438822 (Targets are case sensitive)
svn-id: r21017
2006-03-02 22:29:01 +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
Sven Hesse
f51dd597dd Fix c&p mistake in adding DEBUG_PARSER debug level
svn-id: r20868
2006-02-25 10:16:46 +00:00
Sven Hesse
1758260c39 Changed debug()s to debugC()s
svn-id: r20848
2006-02-24 23:31:31 +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
Paweł Kołodziejski
11f348dd6c fixed warnings
svn-id: r20829
2006-02-23 17:51:27 +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
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
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
Sven Hesse
fbefbfc160 Updating more opcodes for Gob2
svn-id: r20731
2006-02-16 20:25:59 +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