Commit Graph

968 Commits

Author SHA1 Message Date
Eugene Sandulenko
c09fef73c0 Add comments explaining what does EN_ANY mean
svn-id: r21703
2006-04-08 23:20:15 +00:00
Eugene Sandulenko
5a2ad04a9e Introduced language EN_ANY used for general English game entries. EN_USA and
EN_GRB should be used for games which have both variants. Currently it is
MM NES and BASS. All other are switched to EN_ANY.

svn-id: r21702
2006-04-08 23:12:56 +00:00
Max Horn
453e69b6c2 Change check for MIN/MAX macros: Always undef those so that our templates are used (which are safer, consider MIN(a++, b++))
svn-id: r21692
2006-04-08 12:41:02 +00:00
Max Horn
4a8c9c323d AmigaOS4 changes from tracker #1416370
svn-id: r21691
2006-04-08 12:39:27 +00:00
Max Horn
dc77d02c7e Removed common/map.h with the Common::Map template class (it was a very bad implementation, and our HashMap is simply better).
svn-id: r21688
2006-04-08 11:38:41 +00:00
Won Star
7cd565f884 Fix compile with GP32 by overriding datatypes.
svn-id: r21664
2006-04-07 10:40:08 +00:00
Lars Persson
c409c60096 Added comments to Symbians data types.
svn-id: r21631
2006-04-05 14:10:13 +00:00
Lars Persson
25e19148bd Updated datatypes for Symbian OS
svn-id: r21628
2006-04-05 07:09:47 +00:00
Max Horn
2a528657ad Added SCUMMVM_DONT_DEFINE_TYPES so that (a) porters can still override our typedefs if they must, and (b) my image of evil-scummsys.h-changer is strengthened
svn-id: r21624
2006-04-05 00:54:10 +00:00
Max Horn
d7dd5ad9d9 Re-fix sort by renaming min to minElem (avoid conflicts with certain system headers that #define min)
svn-id: r21618
2006-04-04 23:57:56 +00:00
Max Horn
bec09d3094 Turned FSList::sort into a generic function which can be applied to anything which implements comparable iterators (like Array, List, or plain C arrays)
svn-id: r21617
2006-04-04 23:55:47 +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
Lars Persson
595a48a87e Small updates to intiate variable and member visibility.
svn-id: r21604
2006-04-04 21:32:19 +00:00
Max Horn
935ed2dadb Added const qualifier
svn-id: r21603
2006-04-04 21:18:58 +00:00
Max Horn
db8715fffd We don't need wchar_t -> removing this to improve portability
svn-id: r21595
2006-04-04 20:13:59 +00:00
Marcus Comstedt
7242dc169c Remove SCUMMVM_USE_LONG_INT from DC port.
svn-id: r21594
2006-04-04 19:05:50 +00:00
Max Horn
9217472f0e With this change, backends are now responsible for instantiating their OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently)
svn-id: r21557
2006-04-02 14:16:31 +00:00
Max Horn
32de344111 Move gDebugLevel to common/util.cpp (where most other debug() related stuff already is)
svn-id: r21551
2006-04-02 09:31:06 +00:00
Max Horn
8a8bdcd1f8 Moved all debug functions to from main.cpp to util.cpp
svn-id: r21545
2006-04-02 00:56:53 +00:00
Max Horn
587431f8e8 Fully and officially renamed our main function to scummvm_main, thus making
various backend specific hacks unnecessary. As a consequence, it is now the
responsibility of the backend to define main. Hence I adapted the SDL backend
accordingly.

svn-id: r21542
2006-04-02 00:08:22 +00:00
Max Horn
8b1c432bac Switch ConfigManager to use HashMap (seems to work fine over here, but an older version killed my scummvm.ini, so use at your own risk (not that you really have a choice. I just like being evil *g*))
svn-id: r21539
2006-04-01 22:31:45 +00:00
Max Horn
9ed2d26db5 Simplified the File::addDefaultDirectory(Recursive) code; avoid scanning directory multiple times
svn-id: r21527
2006-04-01 17:36:43 +00:00
Eugene Sandulenko
8272591c8d Add size() methods to Map and HashMap classes
svn-id: r21520
2006-03-31 23:49:08 +00:00
Max Horn
e947bd5e27 Updated ConfigFile/ConfigManager classes, that work with the updated Map class, and optionally support HashMap (disabled for now)
svn-id: r21519
2006-03-31 23:10:24 +00:00
Max Horn
05b0ed007e Disable DEBUG_HASH_COLLISIONS again (accidentally got enabled in my previous commit)
svn-id: r21518
2006-03-31 22:38:27 +00:00
Max Horn
c50bfd9d34 Modify HashMap to allow client code to override the equality/hash functionality via functors that are specified as template paramaters (emulating the hash_map class which many STL implementations provide) -> this is necessary to allow e.g. HashMaps that use case insensitive strings as keys
svn-id: r21517
2006-03-31 22:19:39 +00:00
Max Horn
661128b2b4 Modified our Map class to use a 'Less' function instead of a 'strcmp'-like comparator functor, to match the STL map template
svn-id: r21516
2006-03-31 22:17:06 +00:00
Max Horn
088b0afad5 Modified the List postfix ++/-- operators to simply invoke their prefix counterparts; also removed Symbian/Palm specific hack
svn-id: r21515
2006-03-31 22:15:42 +00:00
Max Horn
a23fba7a42 Avoid using Map::merge
svn-id: r21511
2006-03-31 07:30:43 +00:00
Max Horn
e0b3e777cf Added some functor objects (for comparision and hash computations), similar to those present in the STL
svn-id: r21510
2006-03-31 07:22:49 +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
76cfaca23d - Added some explanatory comments (everybody feel free to extend them)
- Unified the various typedefs
- Added a couple FIXME comments (which porters may want to resolve)
- Some cleanup

svn-id: r21498
2006-03-29 12:47:35 +00:00
Max Horn
70040aed47 cleanup
svn-id: r21496
2006-03-29 12:09:15 +00:00
Max Horn
f38d89f327 Set correct load factor for hashmap (just wanted to check if anybody is paying attention to those commit messages *cough* ;-)
svn-id: r21482
2006-03-28 16:19:18 +00:00
Max Horn
62da4eec26 Get rid of Map::addKey
svn-id: r21480
2006-03-28 15:15:45 +00:00
Max Horn
37c79be740 - Renamed Map::remove to Map::erase (matching the STL and HashMap)
- Added Map::find() (see also HashMap), and made the ConfigManager use it

svn-id: r21477
2006-03-28 12:35:50 +00:00
Max Horn
41991f88a9 Added iterator support to hashmap, as well as erase & find methods (all currently needs more testing and may be buggy)
svn-id: r21476
2006-03-28 12:34:34 +00:00
Max Horn
92437ce549 Reduce the differences between Map and HashMap some more (in the end, we should be able to easily switch between the two, e.g. in the ConfigManager class)
svn-id: r21475
2006-03-28 11:21:13 +00:00
Max Horn
dae92b83f2 Increase the load factor for our hashmaps from 50% to 75%, to be slightly nicer regarding memory consumption
svn-id: r21474
2006-03-28 10:54:02 +00:00
Max Horn
f4339ff6c4 - Renamed class AssocArray to HashMap to match our existing class Map (note also
that many STL implementations have a class hash_map next to class map, too)
- Changed some static File class member vars to be normal static variables, in
  yet another attempt to reduce header dependencies (in this case on hashmap.h)

svn-id: r21473
2006-03-28 10:05:25 +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
dd505ff6ae Fixing bug #1458388: "SIMON1: Game Detection fails".
Sometimes instead of "GAMEPC" we get "GAMEPC." (note trailing dot)

svn-id: r21455
2006-03-25 21:17:38 +00:00
Eugene Sandulenko
e373c9b7b5 - Revert my last change with moving addDefaultDirectory() from TheneNew.cpp
- Removed locking of further directory adds because it did not work for themes.

svn-id: r21452
2006-03-25 19:30:10 +00:00
Travis Howell
a98aea6efd Add kListAllNoRoot type to listDir() to handle recent file class changes, on file system backends which use _isPseudoRoot
svn-id: r21449
2006-03-25 10:39:05 +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
Max Horn
1c061dea4b Changed the DEBUG_HASH_COLLISIONS feature: Now measures the ratio between lookup collisions and total number of lookups
svn-id: r21432
2006-03-24 17:13:24 +00:00
Max Horn
9dc07c11cd - replaced the hash table size heuristic with a table of hard coded table sizes
(taken from the GNU ISO C++ Library), which are all prime
- replaced the string hash function by one that works slightly better & faster
- changed various types to unsigned
- added code to help debug the number of hash collisions (off by default)

svn-id: r21431
2006-03-24 16:53:32 +00:00
Max Horn
7307c4cb3d - moved type aa_ref_t into AssocArray, improving code readability a bit
- added new "operator[] const" method, useful when accessing const instances
- removed the default value (if you access an entry without first checking that
  it is actually there, it's your own fault)
- replaced 'index' with 'key' which seems more logical and avoids troubles with
  certain systems that #define index in their system headers

svn-id: r21430
2006-03-24 15:39:07 +00:00
Max Horn
1f9566129c Some more cleanup in AssocArray
svn-id: r21429
2006-03-24 15:22:17 +00:00
Max Horn
ae0cf6e88d Cleanup for the AssocArray template: int->book, put common code into a new lookup() method, and some other tweaks
svn-id: r21428
2006-03-24 14:30:33 +00:00
Max Horn
1805f42eea Oops, accidentally commited the wrong patch (had these lines commented out for testing)
svn-id: r21427
2006-03-24 14:17:47 +00:00
Max Horn
58b14bab3c Using NULL as a default value is not working in general (e.g. for Common::String) -- force explicit definition of a default value
svn-id: r21424
2006-03-24 14:14:29 +00:00
Eugene Sandulenko
5d1b4d8f78 Implementation of AssociativeArray. Transferred GUI to it. Now it is much
faster.

svn-id: r21419
2006-03-23 22:59:38 +00:00
Oystein Eftevaag
dabfcbf10c Moving the MacOS bundle file checking to another function, it was getting called redundantly.
svn-id: r21309
2006-03-15 09:41:22 +00:00
Oystein Eftevaag
58eed3830b * 'make bundle' now copies the default theme files into the bundle.
* Common::File will now look inside the application bundle on MacOS X for a file if
it can't find it anywhere else (so it'll find default-theme.ini and .zip)
* Cleaned up some #ifs.

svn-id: r21308
2006-03-15 07:43:44 +00:00
Travis Howell
ff676b0b54 Correct GCC_PACK define for non-GCC
svn-id: r21160
2006-03-09 09:51:42 +00:00
Travis Howell
47f66f80b9 Revert GCC_PACK removal, which broke compile
svn-id: r21159
2006-03-09 09:40:07 +00:00
Travis Howell
f848dd1d99 Revert GCC_PACK removal, which broke compile
svn-id: r21158
2006-03-09 09:36:09 +00:00
Max Horn
c59ca20ce6 Check format string in calls of debug/error (adapted from patch #1445422)
svn-id: r21139
2006-03-08 10:00:12 +00:00
Eugene Sandulenko
1eff73cb41 GUI widget positions:
o Add 'true' and 'false' constants
o add .visible widget property
o allow dots to be part of section and key names in configs

svn-id: r21123
2006-03-07 13:41:36 +00:00
Eugene Sandulenko
4c16b73bd1 o Properly react to end-of-file is loadFromStream()
o Add types SectionList and SectionKeyList
o Implement getKeys() method

svn-id: r21114
2006-03-07 02:23:37 +00:00
Paweł Kołodziejski
95116f2098 define int types for msvc to allow compile mpeg2 library. msvc does not fully conform C99
svn-id: r21073
2006-03-04 15:26:26 +00:00
Max Horn
1c93f7bcea Removed the obsolete MKID macro; added some doxygen comments, in particular for MKID_BE
svn-id: r20873
2006-02-25 11:45:56 +00:00
Max Horn
6931478e91 Removed the (useless and confusing) PROTO_MKID_BE macro
svn-id: r20860
2006-02-25 01:24:10 +00:00
Max Horn
7335d348ba Moved common/scaler* to graphics/
svn-id: r20797
2006-02-20 20:29:02 +00:00
Max Horn
188cdf937d Clarified that OSystem::setWindowCaption currently only supports ASCII captions
svn-id: r20780
2006-02-20 13:09:39 +00:00
Travis Howell
54babe81ce Fix mistake in last commit
svn-id: r20716
2006-02-16 05:33:27 +00:00
Travis Howell
fa4f74ab73 Add 3DO platform for HE games
svn-id: r20713
2006-02-16 04:52:10 +00:00
Johannes Schickel
0bea9cf47b Made the kyra debug extensions more generic, i.e. scumm engine could replace
their debugC calls now with the new introduced debugC calls.
(A mail how to use it will follow shortly on -devel)
Also now these special engine debug flags can be specified from the commandline.
Also made the -c & --config parameter check more secure.

svn-id: r20695
2006-02-14 23:31:25 +00:00
Travis Howell
d96713a857 Correct case of SPY Fox game titles
svn-id: r20687
2006-02-14 06:57:42 +00:00
Lars Persson
0b847325e1 'Changed Symbian configuration handling so it is using the basepath of the application installation as a path for Savegames, ini files etc
*Updated list.h so it also compiles for Symbian codewarrior and gcce compilers

svn-id: r20586
2006-02-12 00:33:04 +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
Chris Apers
32b2efb8d7 This seems to definitively fix my compilation problem
svn-id: r20554
2006-02-11 18:02:13 +00:00
Max Horn
36934b611d Change CVS keywords to SVN keywords
svn-id: r20510
2006-02-11 09:53:53 +00:00
Max Horn
0ad58cdb95 Removed .cvsignore files
svn-id: r20424
2006-02-07 22:50:14 +00:00
Chris Apers
d88462e7d6 Fixed PalmOS backend compilation
svn-id: r20352
2006-02-02 20:39:12 +00:00
Chris Apers
4c8cd695da Typo
svn-id: r20351
2006-02-02 20:35:21 +00:00
Gregory Montoir
eae3d40f67 Fixed assert conditions.
svn-id: r20317
2006-01-30 19:32:28 +00:00
Johannes Schickel
d4b3467ac8 Fixes a bug when loading the theme config file from a directory instead of the zip file.
svn-id: r20310
2006-01-30 14:19:02 +00:00
Jonathan Gray
38ae101bde cyx's gcc 2.95 fix makes things compile with gcc 2.95 again.
svn-id: r20288
2006-01-29 03:44:13 +00:00
Eugene Sandulenko
052a42f89f Added new debugN() function which doesn't append newline.
svn-id: r20285
2006-01-29 02:44:30 +00:00
Eugene Sandulenko
fef533e93e Proper RCS IDs
svn-id: r20236
2006-01-27 19:05:24 +00:00
Paweł Kołodziejski
c0938748f6 turn off warning #4351 with msvc8
svn-id: r20232
2006-01-27 16:48:31 +00:00
Johannes Schickel
5051b080a2 - adds the new gui renderer also a new implementation for the classic gui
- adds a ImageMan and ImageDec class for loading and managing image files
 - adds a loader for zip files which is used by the new theme and the image manager
 - changes the widgets to use the new gui code
 - changes the scumm dialogs to use the new gui code
 - fixes a #include problem in the sky debugger with the new gui code

 To use the new gui copy gui/themes/default-theme.zip to your extrapath.
If the theme zip can not be found the gui will fallback to the classic theme.
If you want to change the gui styles use "gui_theme=classic" for the classic theme
and "gui_theme=default-theme" for the new theme.

Thanks to eriktorbjorn for testing and help with the new theme and to sev for
reviewing this patch.

svn-id: r20227
2006-01-27 15:43:23 +00:00
Max Horn
2f8dacd617 Clarified comment, cleanup
svn-id: r20111
2006-01-21 11:57:19 +00:00
Eugene Sandulenko
ea42bad781 Update copyright notice
svn-id: r20088
2006-01-18 17:39:49 +00:00
Travis Howell
64f1955745 Leave as warning.
svn-id: r20043
2006-01-15 10:22:44 +00:00
Travis Howell
1b18b98ca5 Update confusing warning.
Check that config file location is writable.

svn-id: r20034
2006-01-15 00:22:29 +00:00
Max Horn
6dbfaa2c31 Restore the alphabetical order of the platforms (this should really be done by the GUI automatically, but for not it is simpler to fix it here)
svn-id: r20022
2006-01-14 11:07:06 +00:00
Travis Howell
ad14c53110 Add SegaCD platform and remove SegaCD specific game Id.
svn-id: r20015
2006-01-14 09:28:38 +00:00
Lars Persson
d4e6b02fde Updated so ScummVM also builds for Symbian WINS emulator builds (!defined added)
svn-id: r19729
2005-12-02 18:37:20 +00:00
Eugene Sandulenko
edfae828f6 Patch #1341626: "New GP32 port"
svn-id: r19710
2005-11-27 02:35:57 +00:00
Travis Howell
9cde262192 Add Polish version of Simon the Sorcerer 2 (Windows).
svn-id: r19634
2005-11-18 00:59:47 +00:00
Travis Howell
5307f21742 Add acorn platform.
svn-id: r19564
2005-11-12 06:04:32 +00:00
Max Horn
eef4e5caec Augmented OSystem docs
svn-id: r19522
2005-11-08 22:28:31 +00:00
Chris Apers
3fe9730fc9 Prevent conflic with Sky def
svn-id: r19470
2005-11-05 18:28:30 +00:00
Max Horn
0063257a2b Fix another HOME buffer overflow attack vector
svn-id: r19376
2005-10-31 01:50:51 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005
svn-id: r19142
2005-10-18 01:30:26 +00:00
Max Horn
7ab5fa8114 cleanup (really would like to unify all those typedef's eventually; maybe we can use inttypes.h on some systems?)
svn-id: r19077
2005-10-14 10:20:42 +00:00
Eugene Sandulenko
05457402f5 Added Linux platform. Now it is used by some ITE version and is required
for proper game identification (21 subtle distinct versions of same game
which still require individual flags is not a joke)
cvs: ----------------------------------------------------------------------

svn-id: r19073
2005-10-14 02:50:05 +00:00