Commit Graph

38482 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
7c7054dbd1 Remove unnecessary svn:executable properties
svn-id: r49870
2010-06-15 17:14:38 +00:00
Johannes Schickel
c09af1dcae Some style fixes.
svn-id: r49869
2010-06-15 17:14:02 +00:00
Johannes Schickel
0d7c8071cc Fix iconv signature on BSD systems. (Based on what we do in tools/)
svn-id: r49868
2010-06-15 17:13:42 +00:00
Johannes Schickel
cf6a29e862 Some documentation cleanup to ease readability.
svn-id: r49867
2010-06-15 17:13:18 +00:00
Martin Kiewitz
831e626ccd SDL: only change mouse cursor, when mouse is currently within our window, also enable mouse position changing again for SCI
svn-id: r49866
2010-06-15 16:58:03 +00:00
Matthew Hoops
cf38303497 Don't disable kPalVary for SCI32, the semantics have remained the same.
svn-id: r49865
2010-06-15 16:56:23 +00:00
Max Horn
953b1324a3 Another attempt to fix WinCE compilation
svn-id: r49864
2010-06-15 16:50:28 +00:00
Max Horn
b8d9cf2773 SCI: Pass resman to scanSource() methods
svn-id: r49863
2010-06-15 16:50:10 +00:00
Filippos Karapetis
90408a59cc Don't adjust the object's coordinates if the object does not belong to a plane in kIsOnMe(). It's now possible to start the interactive part of the Phantasmagoria 1 demo
svn-id: r49862
2010-06-15 16:36:09 +00:00
Max Horn
365973542c Add TranslationManager::getTranslation variant taking/returning a Common::String (should fix WinCE build)
svn-id: r49861
2010-06-15 15:50:37 +00:00
Martin Kiewitz
b25aba1d1e SCI: SciGui/SciGui32 gone for good...
svn-id: r49860
2010-06-15 15:44:24 +00:00
Max Horn
44ce741f9c Code formatting
svn-id: r49859
2010-06-15 15:39:59 +00:00
Filippos Karapetis
e94e91222c Fixed comments
svn-id: r49858
2010-06-15 15:02:52 +00:00
Filippos Karapetis
ab558b45d2 Fixed detective Mosely's hotspot in GK1 (day 1)
svn-id: r49857
2010-06-15 14:55:52 +00:00
Martin Kiewitz
ddb5a769a2 SCI: reset _gfxText16 for sci32, fixes gk1
svn-id: r49856
2010-06-15 13:52:06 +00:00
Matthew Hoops
45fe9a469e Fix wave patches.
svn-id: r49855
2010-06-15 13:45:12 +00:00
Martin Kiewitz
ba2de6dfa4 SCI: putting SciGui::init into SciEngine, removing it from SciGui(32)
svn-id: r49854
2010-06-15 13:34:40 +00:00
Martin Kiewitz
af5346e7ab SCI: calling wait() directly and removing it from SciGui
svn-id: r49853
2010-06-15 13:14:23 +00:00
Yotam Barnoy
a21b9c7b96 PSP: fixed up PowerManager and removed dependency on SDL
svn-id: r49852
2010-06-15 13:10:00 +00:00
Martin Kiewitz
891b568fde SCI: move textSize and textFonts and textColors inside gfxText16
svn-id: r49851
2010-06-15 13:01:07 +00:00
Max Horn
604f855889 SCUMM: Fix composeFileHashMap
svn-id: r49850
2010-06-15 12:36:04 +00:00
Max Horn
f387025e9b SCI: Add FIXME regarding audio specific code in Resource(Source)
svn-id: r49849
2010-06-15 12:35:39 +00:00
Max Horn
e4153ffa38 SCI: Add Resource::getNumber method
svn-id: r49848
2010-06-15 12:35:17 +00:00
Max Horn
82b66ffdf8 Fix some warnings about 'format not a string literal'.
svn-id: r49847
2010-06-15 12:34:55 +00:00
Max Horn
f936443252 SCI: Saner and simpler conversion from msecs to ticks
svn-id: r49846
2010-06-15 12:34:33 +00:00
Max Horn
e62169c383 AGI: Specify bug reference for workaround
svn-id: r49845
2010-06-15 12:34:12 +00:00
Max Horn
d570e10b77 Modify makeAIFFStream to match the other sound decoder factories
svn-id: r49844
2010-06-15 12:33:54 +00:00
Max Horn
651e2760a3 Fix spelling, cleanup
svn-id: r49843
2010-06-15 12:33:20 +00:00
Max Horn
7a5ce0eddd SCI: Make Resource::_id protected
svn-id: r49842
2010-06-15 12:31:37 +00:00
Max Horn
2b24a1a2ad SCI: OOpify class ResourceId
svn-id: r49841
2010-06-15 12:31:16 +00:00
Max Horn
68eeef8f1a SCI: Add ResourceManager::getVolVersion()
svn-id: r49840
2010-06-15 12:21:29 +00:00
Martin Kiewitz
db4533533a SCI: fix changes from r49806
svn-id: r49839
2010-06-15 12:21:26 +00:00
Max Horn
703f0ca29c SYSTEM: Unify OSystem::getSupportedFormats() signature
svn-id: r49838
2010-06-15 12:21:08 +00:00
Max Horn
96f1e29300 cleanup
svn-id: r49837
2010-06-15 12:20:24 +00:00
Max Horn
79c9be5d96 Reduce header dependencies
svn-id: r49836
2010-06-15 12:20:03 +00:00
Max Horn
583a966d8c SCI: Move decompress & readResourceInfo to Resource; more cleanup
svn-id: r49835
2010-06-15 12:19:39 +00:00
Max Horn
4392cdaee1 SCI: cleanup
svn-id: r49834
2010-06-15 12:19:14 +00:00
Max Horn
335e17af01 SCI: Move several methods from ResourceManager to Resource
svn-id: r49833
2010-06-15 12:18:57 +00:00
Max Horn
63d9cfb3bf SCI: Add ResourceManager::updateResource(); change some code to use addResource()
svn-id: r49832
2010-06-15 12:18:31 +00:00
Max Horn
b9a3a9c12d SCI: Move _associatedMap to VolumeResourceSource and make it const
svn-id: r49831
2010-06-15 12:18:07 +00:00
Max Horn
6667a71027 SCI: Move _audioCompression(Type|OffsetMapping) to AudioVolumeResourceSource
svn-id: r49830
2010-06-15 12:17:47 +00:00
Max Horn
1a0201f7e9 SCI: cleanup
svn-id: r49829
2010-06-15 12:17:25 +00:00
Max Horn
6248daccfc SCI: Get rid of ugly resMan params to ResourceSource methods
We might want to add a ResourceSource::_resMan member, but for
now I am not adding one on purpose; many more things might still
move between ResourceSource and ResourceManager, so we should
wait till the refactoring is complete.

svn-id: r49828
2010-06-15 12:17:05 +00:00
Max Horn
88663c9186 SCI: Merge ResourceManager::checkIfAudioVolumeIsCompressed into AudioVolumeResourceSource constructor
svn-id: r49827
2010-06-15 12:16:42 +00:00
Max Horn
348953c067 SCI: Make ResourceSource::_resourceFile const
svn-id: r49826
2010-06-15 12:16:17 +00:00
Max Horn
824dd44ddf SCI: Revise how ResourceManager is instantiated.
This should allow for better error handling. Also, it
means that g_sci->getResMan() returns a valid value much sooner,
allowing me to simplify some code.

Also added a note about potentially replacing Common::FSList usage
by Common::Archive (and FSNode by Archive/ArchiveMember ?). This
might be a way to unify the addAppropriateSources variants again.

svn-id: r49825
2010-06-15 12:15:52 +00:00
Max Horn
713e61acba SCI: Doxygen fixes
svn-id: r49824
2010-06-15 12:15:27 +00:00
Max Horn
4020500640 SCI: Rename ResourceSource members to follow _camelCase convention
svn-id: r49823
2010-06-15 12:15:05 +00:00
Max Horn
07b896802b SCI: Pass volume number to ResourceSource subclass constructors; make ResourceSource::volume_number const
svn-id: r49822
2010-06-15 12:14:39 +00:00
Max Horn
bb1336ca41 SCI: Add loadResource impls for WaveResourceSource and AudioVolumeResourceSource
svn-id: r49821
2010-06-15 12:14:15 +00:00