Commit Graph

27395 Commits

Author SHA1 Message Date
Max Horn
1b3952fbab Don't force inline on big funcs if you don't have to (in this case, it added 24k to the binary size for no good reason)
svn-id: r34783
2008-10-12 22:03:35 +00:00
Max Horn
7cc871b84f cleanup
svn-id: r34782
2008-10-12 22:02:24 +00:00
Max Horn
ca53370157 Fix some in-line doxygen comments to document the correct member(s); also fixed some typos
svn-id: r34781
2008-10-12 21:56:03 +00:00
Max Horn
4747f8dc01 Fix warning
svn-id: r34780
2008-10-12 21:51:52 +00:00
Max Horn
ad7d753cea Changed Common::Rect doxygen comments to the (Java) style we use elsewhere
svn-id: r34779
2008-10-12 21:47:29 +00:00
Filippos Karapetis
92d12dc5c4 The MSVC8 -> MSVC 7/7.1 conversion tool now handles both cases of version numbers (with . and ,) - depending on the system's localization settings. Updated the scummvm.vcproj files
Fixes bug #2159813 - "BUILD: scummvm.vcproj fails to build in msvc7/msvc71"

svn-id: r34778
2008-10-12 16:06:04 +00:00
Nicola Mettifogo
1002b82022 Changed BRA to use the new Common:Archive infrastructure.
svn-id: r34777
2008-10-12 07:01:09 +00:00
Nicola Mettifogo
fb0d112bbd * Added prefix support to cache entries of FSDirectory, as specified in patch #2034983.
* Updated comments on most Archive-related classes.

svn-id: r34776
2008-10-12 06:06:04 +00:00
Max Horn
3d41300895 Fixed yet another typo
svn-id: r34775
2008-10-11 22:18:15 +00:00
Max Horn
c39175d2ec GUI ThemeEngine changes:
- removed unused typedefs
- fixed some typos
- got rid of pointless parser() method
- unified theme XML loading code for Zip files and regular directories

svn-id: r34774
2008-10-11 22:14:47 +00:00
Max Horn
8920f6849c Changed XMLParser to use SearchMan / FSNode::openForReading
svn-id: r34773
2008-10-11 22:11:02 +00:00
Max Horn
ce7ffc4d0e Some cleanup (in particular: do not convert String -> char * -> String needlessly) & code unification (thanks to Common::Archive, regular files and those in .zip files can both be accessed via Common::File)
svn-id: r34772
2008-10-11 21:39:24 +00:00
Max Horn
0802da1f7f Order files in gui/module.mk alphabetically
svn-id: r34771
2008-10-11 21:37:15 +00:00
Max Horn
ec874705ff Use Common::File instead of FilePtr
svn-id: r34769
2008-10-11 21:23:53 +00:00
Filippos Karapetis
b5f2e4ee8c Synced the rest of the MSVC project files (MSVC7, 7.1 and 8) with the latest changes to the GUI from the GSoC branch
svn-id: r34768
2008-10-11 14:18:11 +00:00
Travis Howell
104b39ef67 Add patch from Quietust - Correct music speed in Amiga V2/V3 games.
svn-id: r34767
2008-10-11 02:25:55 +00:00
Nicola Mettifogo
15d94dd614 Fixed crash when existing BRA: fonts were deallocated twice.
svn-id: r34766
2008-10-11 02:23:13 +00:00
Torbjörn Andersson
4fc69c4863 Fixed typo.
svn-id: r34765
2008-10-10 04:17:34 +00:00
Travis Howell
51824e58aa Update theme package name.
svn-id: r34764
2008-10-09 23:23:38 +00:00
Vicent Marti
f2f25aa840 Fixed warning when loading themes contained inside a folder.
svn-id: r34763
2008-10-09 18:51:26 +00:00
Vicent Marti
c3b1e34163 Renamed "scummodern" theme to "scummmodern", for naming consistence.
svn-id: r34762
2008-10-09 18:09:59 +00:00
Vicent Marti
bb619b4578 - Fixed theme loading from Zip files.
- Changed Common::ZipArchive to use FSNodes instead of full paths (external API unchanged).

svn-id: r34761
2008-10-09 17:56:07 +00:00
Vicent Marti
ec60fc6db7 Fixed small graphical glitch in Classic theme tabs.
svn-id: r34760
2008-10-09 17:15:10 +00:00
Vicent Marti
b4a50e65de Removed theme-config.cpp (legacy GUI code)
svn-id: r34759
2008-10-09 13:50:47 +00:00
Vicent Marti
0b489b7ab6 Fixe DIST_FILES_THEMES in Makefile for theme distribution.
svn-id: r34758
2008-10-09 12:10:23 +00:00
Vicent Marti
1f2ce8b188 Manual merge of the GSoC2008 GUI branch. (71 files)
svn-id: r34757
2008-10-09 11:49:35 +00:00
Nicola Mettifogo
5dd381932f Added an optional depth parameter to FSDirectory::getSubDirectory(), so that returned FSDirectory can be more flexibly configured.
svn-id: r34756
2008-10-08 09:05:21 +00:00
Max Horn
6a2f3dc0b9 Added new type Engine::Feature; pushed down some #include dependencies
svn-id: r34755
2008-10-06 12:48:52 +00:00
Max Horn
6ca906d7aa Fix warnings about Event::synthetic being undefined
svn-id: r34754
2008-10-06 11:28:09 +00:00
Vicent Marti
000eedb073 Merged revisions 34748,34750 via svnmerge from
https://tanoku@scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r34748 | dreammaster | 2008-10-05 12:25:35 +0200 (Sun, 05 Oct 2008) | 1 line
  
  Changed NPC schedules to be loaded when an NPC is activated - this avoids an issue with the Castle Skorl's pre-activation room number being invalid room #99
........
  r34750 | fingolfin | 2008-10-05 14:18:16 +0200 (Sun, 05 Oct 2008) | 1 line
  
  Fixed ambiguous 'else'
........

svn-id: r34752
2008-10-05 20:31:18 +00:00
Max Horn
03d8f7e196 Fixed ambiguous 'else'
svn-id: r34750
2008-10-05 12:18:16 +00:00
Vicent Marti
5f30b1f320 Merged several revisions from SVNMerge.
Fixed theme loading to use the new ArchiveMember class.

Original SVNMerge.py log:
=====================
Merged revisions 34686,34688-34689,34691-34698,34700-34705,34707-34713,34715-34722,34725-34727,34731-34732,34734-34738,34746 via svnmerge from 
https://tanoku@scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r34686 | cyx | 2008-09-29 21:09:56 +0200 (Mon, 29 Sep 2008) | 1 line
  
  add constructor to SearchSet::Node for proper init of structure members with gcc 3.4.x (see tracker items #2120595, #2106292)
........
  r34688 | cyx | 2008-09-29 22:08:26 +0200 (Mon, 29 Sep 2008) | 1 line
  
  restrict _heXmapNum to HE versions, should fix #2135822
........
  r34689 | eriktorbjorn | 2008-09-29 22:40:58 +0200 (Mon, 29 Sep 2008) | 4 lines
  
  Since no one has come up with any better suggestion... this should fix #2123258
  ("COMI: Crash after video (SAN) play"). The eos() function won't return true
  until we've tried to read *past* the end of the stream.
........
  r34691 | tanoku | 2008-09-30 00:29:07 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Ported ZipArchive::getAllNames() implementation from GUI branch.
........
  r34692 | fingolfin | 2008-09-30 11:07:03 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Order alphabetically
........
  r34693 | fingolfin | 2008-09-30 11:08:17 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Removed patchesCount from SAGAGameDescription
........
  r34694 | fingolfin | 2008-09-30 11:09:39 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SCUMM HE: Use FilesystemNode::openForReading() instead of 'new Common::File' (didn't cover all instances, though)
........
  r34695 | fingolfin | 2008-09-30 11:11:25 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Forgot to commit saga.h
........
  r34696 | fingolfin | 2008-09-30 11:12:02 +0200 (Tue, 30 Sep 2008) | 1 line
  
  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()
........
  r34697 | fingolfin | 2008-09-30 13:33:43 +0200 (Tue, 30 Sep 2008) | 1 line
  
  cleanup
........
  r34698 | tanoku | 2008-09-30 13:53:37 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixed functionality of ZipArchive::getAllNames(). Now it expects a possibly non-empty string list and returns the amount of new filenames added to it.
........
  r34700 | fingolfin | 2008-09-30 14:27:38 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
........
  r34701 | fingolfin | 2008-09-30 14:37:28 +0200 (Tue, 30 Sep 2008) | 1 line
  
  cleanup
........
  r34702 | fingolfin | 2008-09-30 14:38:44 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AdvancedDetector: Do not (ab)use paths to keep track of files, rather, use FSNodes -- partial (?) fix for bug #2137680
........
  r34703 | fingolfin | 2008-09-30 14:58:27 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SAGA: Some code cleanup
........
  r34704 | fingolfin | 2008-09-30 14:59:29 +0200 (Tue, 30 Sep 2008) | 1 line
  
  SKY: Fix detector to not (ab)use FSNode::getPath; if you want to open a FSNode, just pass it to File::open
........
  r34705 | thebluegr | 2008-09-30 15:19:14 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixed crash when starting IHNM, a regression from commit #34693
........
  r34707 | fingolfin | 2008-09-30 17:42:19 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fixing ConfigManager::loadConfigFile
........
  r34708 | fingolfin | 2008-09-30 18:23:35 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Another case where it is better to use FSNodes directly, instead of converting them to path strings
........
  r34709 | fingolfin | 2008-09-30 18:34:38 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Modified FilePluginProvider to use FSNodes (instead of raw filenames / paths) in its API
........
  r34710 | fingolfin | 2008-09-30 18:38:46 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Got rid of yet another unwarranted use of FSNode::getPath
........
  r34711 | fingolfin | 2008-09-30 18:53:04 +0200 (Tue, 30 Sep 2008) | 1 line
  
  AGI: Simplify WagFileParser by not reading data into a memory stream first (this was there to improve performance on systems with slow seeking; those systems should use another approach, see scummvm-devel)
........
  r34712 | thebluegr | 2008-09-30 18:55:10 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fix crash when starting ITE, a regression from commit #34705
........
  r34713 | fingolfin | 2008-09-30 19:09:41 +0200 (Tue, 30 Sep 2008) | 1 line
  
  Fix ThemeBrowser to use FSNodes, not getPath()
........
  r34715 | Kirben | 2008-10-02 16:41:50 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Correct HE version for Putt-Putt Enters the Race (French/Windows).
........
  r34716 | fingolfin | 2008-10-02 18:58:59 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Renamed FilesystemNode -> FSNode
........
  r34717 | fingolfin | 2008-10-02 19:08:15 +0200 (Thu, 02 Oct 2008) | 1 line
  
  cleanup
........
  r34718 | fingolfin | 2008-10-02 19:17:18 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Ignore String::deleteLastChar when called on an empty string
........
  r34719 | fingolfin | 2008-10-02 19:20:21 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Fix for bug #2142743: Assertion on clicking "Theme" in Options
........
  r34720 | fingolfin | 2008-10-02 19:48:01 +0200 (Thu, 02 Oct 2008) | 7 lines
  
  Engine class changed:
  - Moved initCommonGFX() && GUIErrorMessage() out of class Engine
  - got rid of the _autosavePeriod member (this prevented users from
    changing the autosave period during runtime)
  - Got rid of an evil 'using GUI::Dialog' statement
  - Clarified some Doxygen comments
........
  r34721 | fingolfin | 2008-10-02 19:52:29 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Add the current dir to the global SearchSet, i.e. to SearchMan (this should fix the problems on Windows, and maybe other systems, see 'bug' #2137680)
........
  r34722 | fingolfin | 2008-10-02 19:55:08 +0200 (Thu, 02 Oct 2008) | 1 line
  
  Forgot to mention yet another Engine class change: mainMenuDialog -> openMainMenuDialog; and also forgot to commit this related file :/
........
  r34725 | fingolfin | 2008-10-02 20:11:40 +0200 (Thu, 02 Oct 2008) | 1 line
  
  typo
........
  r34726 | thebluegr | 2008-10-03 00:04:34 +0200 (Fri, 03 Oct 2008) | 1 line
  
  Merged loadHotSpotsMads() and loadHotSpotsM4()
........
  r34727 | lordhoto | 2008-10-03 02:16:21 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Fixed typos (thanks to Raziel^ for spotting them).
........
  r34731 | fingolfin | 2008-10-03 18:07:57 +0200 (Fri, 03 Oct 2008) | 1 line
  
  Fixed Engine::hasFeature to use proper types (i.e., MetaEngine::MetaEngineFeature instead of int)
........
  r34732 | fingolfin | 2008-10-03 18:14:12 +0200 (Fri, 03 Oct 2008) | 1 line
  
  SCUMM: Added french Monkey VGA variant, see bug #2129199
........
  r34734 | lordhoto | 2008-10-03 18:57:40 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Committed slightly modified patch #2034983 "Case-insensitivy and directory handling for engines".
........
  r34735 | lordhoto | 2008-10-03 20:18:42 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Check all 'kyra.dat' files in setup paths instead of only the first one found.
........
  r34736 | lordhoto | 2008-10-03 20:23:57 +0200 (Fri, 03 Oct 2008) | 2 lines
  
  Cleanup.
........
  r34737 | dreammaster | 2008-10-04 13:10:25 +0200 (Sat, 04 Oct 2008) | 1 line
  
  Bugfix to prevent NPC characters managing to walk beyond room exits without leaving the room, and thus getting stuck
........
  r34738 | fingolfin | 2008-10-04 15:09:01 +0200 (Sat, 04 Oct 2008) | 1 line
  
  Renamed some MetaEngine feature flags; removed explicit numbers from this feature flag list (nothing should rely on their specific values, anyway); added a note that Engine::hasFeature should become independant of MetaEngine::hasFeature
........
  r34746 | john_doe | 2008-10-04 23:40:14 +0200 (Sat, 04 Oct 2008) | 3 lines
  
  - Declared all stack functions as inline
  - Sleep some ms after 500 opcodes to reduce CPU load
  - Fixed odd bug in LGoP2 where text disappeared quickly without waiting for user input by returning 0x38 in sfShowPage
........

svn-id: r34749
2008-10-05 11:21:07 +00:00
Paul Gilbert
b9a0e32c3c Changed NPC schedules to be loaded when an NPC is activated - this avoids an issue with the Castle Skorl's pre-activation room number being invalid room #99
svn-id: r34748
2008-10-05 10:25:35 +00:00
Vicent Marti
e32fc0ccca Added a fixed memory pool for XML Node allocation, as suggested by Max.
svn-id: r34747
2008-10-05 10:19:09 +00:00
Benjamin Haisch
99f8add65c - Declared all stack functions as inline
- Sleep some ms after 500 opcodes to reduce CPU load
- Fixed odd bug in LGoP2 where text disappeared quickly without waiting for user input by returning 0x38 in sfShowPage

svn-id: r34746
2008-10-04 21:40:14 +00:00
Max Horn
b41cd58cee Renamed some MetaEngine feature flags; removed explicit numbers from this feature flag list (nothing should rely on their specific values, anyway); added a note that Engine::hasFeature should become independant of MetaEngine::hasFeature
svn-id: r34738
2008-10-04 13:09:01 +00:00
Paul Gilbert
8706081b82 Bugfix to prevent NPC characters managing to walk beyond room exits without leaving the room, and thus getting stuck
svn-id: r34737
2008-10-04 11:10:25 +00:00
Johannes Schickel
d89ff31450 Cleanup.
svn-id: r34736
2008-10-03 18:23:57 +00:00
Johannes Schickel
f3469eae94 Check all 'kyra.dat' files in setup paths instead of only the first one found.
svn-id: r34735
2008-10-03 18:18:42 +00:00
Johannes Schickel
e417471177 Committed slightly modified patch #2034983 "Case-insensitivy and directory handling for engines".
svn-id: r34734
2008-10-03 16:57:40 +00:00
Max Horn
4b236a787f SCUMM: Added french Monkey VGA variant, see bug #2129199
svn-id: r34732
2008-10-03 16:14:12 +00:00
Max Horn
84229ee79c Fixed Engine::hasFeature to use proper types (i.e., MetaEngine::MetaEngineFeature instead of int)
svn-id: r34731
2008-10-03 16:07:57 +00:00
Johannes Schickel
b178332e3e Fixed typos (thanks to Raziel^ for spotting them).
svn-id: r34727
2008-10-03 00:16:21 +00:00
Filippos Karapetis
17a51a235f Merged loadHotSpotsMads() and loadHotSpotsM4()
svn-id: r34726
2008-10-02 22:04:34 +00:00
Max Horn
2219ccf911 typo
svn-id: r34725
2008-10-02 18:11:40 +00:00
Max Horn
679b5484c4 Forgot to mention yet another Engine class change: mainMenuDialog -> openMainMenuDialog; and also forgot to commit this related file :/
svn-id: r34722
2008-10-02 17:55:08 +00:00
Max Horn
d269a84e03 Add the current dir to the global SearchSet, i.e. to SearchMan (this should fix the problems on Windows, and maybe other systems, see 'bug' #2137680)
svn-id: r34721
2008-10-02 17:52:29 +00:00
Max Horn
3248906156 Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine
- got rid of the _autosavePeriod member (this prevented users from
  changing the autosave period during runtime)
- Got rid of an evil 'using GUI::Dialog' statement
- Clarified some Doxygen comments

svn-id: r34720
2008-10-02 17:48:01 +00:00
Max Horn
c77124ff50 Fix for bug #2142743: Assertion on clicking "Theme" in Options
svn-id: r34719
2008-10-02 17:20:21 +00:00
Max Horn
0aa9e6ff4c Ignore String::deleteLastChar when called on an empty string
svn-id: r34718
2008-10-02 17:17:18 +00:00