33543 Commits

Author SHA1 Message Date
Filippos Karapetis
3d0f106edc Removed the MSVC-specific pragmas for disabling warnings. These are now in ScummVM_Global.vsprops and thus not needed in scummsys.h
svn-id: r44283
2009-09-24 02:06:07 +00:00
Travis Howell
c4f6d91777 Fix bug #2865191 - NoPatience hangs after undo.
svn-id: r44281
2009-09-24 00:38:29 +00:00
Andre Heider
3045ecce2f Removed an assert() in favour of error checking.
svn-id: r44278
2009-09-23 21:14:37 +00:00
Joost Peters
6a5bd81599 PSP: improved suspend/resume support [patch from bluddy]
svn-id: r44276
2009-09-23 16:11:23 +00:00
Paweł Kołodziejski
227e4e65df fix for bug #2820389
svn-id: r44274
2009-09-23 13:22:12 +00:00
Johannes Schickel
c05c5fca03 Commit modified patch from bug report #2849084 "AGI: Crash when saving fallback-matched game" to fix that bug.
svn-id: r44273
2009-09-23 13:17:08 +00:00
Paweł Kołodziejski
e6580be475 not need continue checks after found
svn-id: r44272
2009-09-23 13:04:51 +00:00
Max Horn
ba0bd938e4 SCI: Rename _sciVersion to s_sciVersion and made it local to resource.cpp (i.e. follow CFG and achieve code/data isolation)
svn-id: r44271
2009-09-23 12:12:37 +00:00
Paul Gilbert
92e75a768a Removed redundant offset from dirty rect calculation logic
svn-id: r44270
2009-09-23 10:58:17 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
2009-09-23 10:55:35 +00:00
Paweł Kołodziejski
63208a20fd ops, remove some ancient change
svn-id: r44268
2009-09-23 10:49:18 +00:00
Paweł Kołodziejski
66df660e2a this should fix bug #2820389
svn-id: r44267
2009-09-23 10:40:13 +00:00
Johannes Schickel
c50940bbf4 Got rid of Common::File::addDefaultDirectory, instead implemented the solution proposed in "Case agnostic handling for directories (and files)" on -devel.
svn-id: r44266
2009-09-23 00:15:00 +00:00
Johannes Schickel
75113ad5f3 COMMON: Add "ignoreCase" parameter to matchString.
svn-id: r44265
2009-09-23 00:14:06 +00:00
Johannes Schickel
ebde95b3d8 Clear menu stack in FWRenderer deconstructor.
svn-id: r44264
2009-09-22 17:53:00 +00:00
Johannes Schickel
e591333d4b Implement menu stack to support all menu color effects, specific to the Amiga version of the game.
svn-id: r44263
2009-09-22 17:51:06 +00:00
Johannes Schickel
dc8edb7203 Fix warning in gcc 3.3.5, by changing FORCEINLINE definition.
svn-id: r44262
2009-09-22 17:10:08 +00:00
Filippos Karapetis
5184f86e15 - Merged scriptObjInit0() and scriptObjInit11()
- Replaced some cases where getSciVersion() is used with _resMan->sciVersion(), as getSciVersion() will fail with the fallback detector (as the engine is not initialized). Object property accessors still crash currently, when used with the fallback detector

svn-id: r44261
2009-09-22 14:33:46 +00:00
Willem Jan Palenstijn
46511f3c63 Add basic test for HashMap::iterator
svn-id: r44259
2009-09-22 12:49:32 +00:00
Willem Jan Palenstijn
f9909bfbf5 Remove superfluous checks
svn-id: r44258
2009-09-22 12:39:07 +00:00
Johannes Schickel
4f65994267 Fix regression in 44236, which caused iterators to see dummy node entries as valid entries.
svn-id: r44256
2009-09-22 11:58:59 +00:00
Joost Peters
161659052b cleanup
svn-id: r44253
2009-09-22 09:37:39 +00:00
Joost Peters
58f7f2132e Apply patch #2863653: "PSP: Flickering problem fix" + some formatting changes and fixing several incorrect depth values.
svn-id: r44251
2009-09-22 09:31:19 +00:00
Filippos Karapetis
4df106e1f0 Copy the internal game name when loading, and don't recreate it
svn-id: r44250
2009-09-22 09:16:16 +00:00
Filippos Karapetis
e331269a36 Removed unused variable
svn-id: r44249
2009-09-22 09:00:32 +00:00
Filippos Karapetis
af7b2fc018 Simplified the code which creates the mouse cursor
svn-id: r44248
2009-09-22 08:57:45 +00:00
Filippos Karapetis
444615777b Updated the MSVC project files for commit #44240 (removed intmap.*)
svn-id: r44247
2009-09-22 06:58:17 +00:00
Max Horn
c5cc785802 SCI: Change SystemStrings to use RAW storage consistenly
svn-id: r44246
2009-09-22 01:08:42 +00:00
Max Horn
6424a1e9e2 SCI: Add some FIXMEs, and print warning if accessing a raw segment as non-raw or vice versa
svn-id: r44245
2009-09-22 00:51:55 +00:00
Max Horn
5f5ab54810 SCI: Add new type SegmentRef which ultimately will allow us to distinguish between raw and 'reg_t' memory blocks in client code
svn-id: r44244
2009-09-22 00:36:24 +00:00
Max Horn
97d1f79e2d SCI: Change SystemString::name from char* to Common::String
svn-id: r44243
2009-09-22 00:36:05 +00:00
Max Horn
5fc2428c99 SCI: SegmentObj's now set their type in constructor; replace central SegmentObj::createSegmentObj call in SegManager::allocSegment by several explicit 'new' statements; some extra cleanup
svn-id: r44242
2009-09-22 00:35:46 +00:00
Max Horn
996b9cc74b SCI: cleanup
svn-id: r44241
2009-09-21 21:39:00 +00:00
Max Horn
d2a6713a8e SCI: Replace IntMapper Script::_objIndices and Common::Array Script::_objects by a HashMap -- goodbye, class IntMapper
svn-id: r44240
2009-09-21 21:38:43 +00:00
Max Horn
7f728af76e SCI: Workaround for crash in debugger's backtrace
svn-id: r44239
2009-09-21 21:38:07 +00:00
Max Horn
43da40996b SCI: Change kAnimate to actually tail recurse
svn-id: r44238
2009-09-21 21:37:47 +00:00
Max Horn
537c886aeb Stop confusing doxygen :)
svn-id: r44237
2009-09-21 21:37:12 +00:00
Max Horn
2bf7969f95 COMMON: Remove Common::HashMap::_dummyNode, instead use HASHMAP_DUMMY_NODE (this saves memory and should still be safe)
svn-id: r44236
2009-09-21 21:36:35 +00:00
Max Horn
6b60bfd7ce Updated from upstream
svn-id: r44235
2009-09-21 21:36:12 +00:00
Max Horn
57dfb9bafd SCI: Rename Object::flags and pos to _flags and _pos; tweak scriptObjInit0 and scriptObjInit11 to be more similar
svn-id: r44234
2009-09-21 21:35:43 +00:00
Andre Heider
47e677ffcc whitespace fix
svn-id: r44233
2009-09-21 20:50:13 +00:00
Andre Heider
d020800e57 reinit the console when changing the video mode.
svn-id: r44232
2009-09-21 20:45:21 +00:00
Johannes Schickel
cb41cea6f1 Changed AMIGA menu code to closer match the original. (The menu item highlight selection is still wrong though.)
svn-id: r44231
2009-09-21 01:15:34 +00:00
Johannes Schickel
756659b00e Add more shouldQuit checks in event loops.
svn-id: r44230
2009-09-21 01:15:11 +00:00
Johannes Schickel
94e359d3fb Fix box outline color for FW Amiga.
svn-id: r44229
2009-09-21 01:14:50 +00:00
Johannes Schickel
9eabcb7baa Cleanup.
svn-id: r44228
2009-09-20 23:56:42 +00:00
Johannes Schickel
df4978b776 Fix valgrind warning.
svn-id: r44227
2009-09-20 23:56:21 +00:00
Johannes Schickel
c9d8146c64 Fix compilation under Linux.
svn-id: r44226
2009-09-20 23:38:35 +00:00
Johannes Schickel
44359cd920 Add some shouldQuit() checks in event loops. This makes it possible to easily quit ScummVM (or doing an RTL), when failing the copy protection in Future Wars for example.
svn-id: r44225
2009-09-20 23:35:10 +00:00
Johannes Schickel
8daf7fbba8 Changed some type names to match our coding guidelines.
svn-id: r44224
2009-09-20 23:34:48 +00:00