Commit Graph

890 Commits

Author SHA1 Message Date
Filippos Karapetis
814e27fe40 Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"
svn-id: r34457
2008-09-09 06:47:41 +00:00
Max Horn
2bc093828f Replaced Engine::_gameDataPath (a String) by Engine::_gameDataDir (an FSNode); adapted code to that (by using getChild() to get subdirs, not string concatenation
svn-id: r34434
2008-09-07 22:10:58 +00:00
Max Horn
ad87f08192 Changed some code to use the new Stream::readLine() method
svn-id: r34318
2008-09-03 18:40:49 +00:00
Max Horn
57e724bfc3 Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead
svn-id: r34315
2008-09-03 17:53:25 +00:00
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +00:00
Max Horn
531bcf847c Moved FilesystemNode / FSList to namespace Common; also got rid of some 'typedef Common::String String;' name aliases
svn-id: r34302
2008-09-03 11:22:51 +00:00
Nicola Mettifogo
4ab5d3fdc4 Merging more of the GSoC 2008 RTL branch: PARALLACTION
svn-id: r34268
2008-09-02 01:58:55 +00:00
Nicola Mettifogo
ccf88578c8 Fixed leak with Input class, introduced in commit 34206.
svn-id: r34224
2008-08-31 10:43:32 +00:00
Nicola Mettifogo
4cda7abda1 More cleanup.
svn-id: r34223
2008-08-31 10:24:32 +00:00
Nicola Mettifogo
6db501d612 Cleanup.
svn-id: r34222
2008-08-31 09:30:16 +00:00
Nicola Mettifogo
fc518efe08 Removed extra semicolon detected by salty-horse pesky compiler.
svn-id: r34221
2008-08-31 08:27:40 +00:00
Nicola Mettifogo
1fd91e2bb0 Moved save/load code into SaveLoad class.
svn-id: r34220
2008-08-31 06:14:45 +00:00
Nicola Mettifogo
983863bef3 Uniformed the interface of Parallaction class (and its hierarchy) with regards of gui code, which is now independent of engine version.
svn-id: r34219
2008-08-31 05:18:25 +00:00
Nicola Mettifogo
2e9bdfb3b1 Removed global g_system.
svn-id: r34209
2008-08-30 15:49:54 +00:00
Nicola Mettifogo
0a387bca12 Moved mouse cursor loading/handling to Input class.
svn-id: r34206
2008-08-30 10:27:20 +00:00
Nicola Mettifogo
a403372ae1 Cleanup.
svn-id: r34185
2008-08-26 12:15:11 +00:00
Nicola Mettifogo
18250a8560 Fixed regression: show mouse and enable input in NS Demo.
svn-id: r34144
2008-08-25 09:35:22 +00:00
Nicola Mettifogo
08f5ac5c4d Added workaround for bug 2070751, long standing issue with item matching exposed after revision 32873.
svn-id: r34135
2008-08-25 06:32:08 +00:00
Nicola Mettifogo
fc4256ca85 Fixed error in parsing.
svn-id: r34093
2008-08-22 06:32:12 +00:00
Nicola Mettifogo
f2f0b04627 Implement transition when entering a new location for BRA. Not pixel-perfect, but... let's e happy about it.
svn-id: r34089
2008-08-22 00:19:12 +00:00
Torbjörn Andersson
5f79db5d9d Fixed warning.
svn-id: r34086
2008-08-21 14:52:55 +00:00
Nicola Mettifogo
47b1a06e3b Removed unused code and structures, and a bit of cleanup.
svn-id: r34080
2008-08-21 12:11:24 +00:00
Nicola Mettifogo
9549cbee7f Engine now returns to the menu when intro is over.
svn-id: r34047
2008-08-20 04:02:12 +00:00
Nicola Mettifogo
d5d4500b64 * Enlarged buffer for frame decoding. Crashes in the introduction were caused by a small buffer and subsequent out-of-bound writes.
* Disabled debug code.

svn-id: r34046
2008-08-20 03:36:49 +00:00
Nicola Mettifogo
86c3ddc23c Deleted debug code that slipped in.
svn-id: r34041
2008-08-19 14:36:05 +00:00
Nicola Mettifogo
389575b5c1 Fixed bug in low-level parser. Block comments weren't interpreted correctly.
svn-id: r34038
2008-08-19 14:07:48 +00:00
Nicola Mettifogo
c528106b86 Fixed segfault when quitting BRA.
svn-id: r34022
2008-08-19 08:08:32 +00:00
Nicola Mettifogo
c2089be660 * Split up blt routine (there is room for a ton of improvements)
* Added scaling as a new blt option
* Activated scaling for the main character in BRA

svn-id: r33985
2008-08-18 07:12:05 +00:00
Nicola Mettifogo
fbc9483ed2 Extended balloon manager to handle color constants and fixed color of text in balloons for BRA.
svn-id: r33940
2008-08-16 13:10:54 +00:00
Nicola Mettifogo
b08a3885a8 Multiple balloons (answers) are now positioned correctly in BRA.
svn-id: r33939
2008-08-16 12:49:27 +00:00
Torbjörn Andersson
49aff727e2 Removed unused variable.
svn-id: r33936
2008-08-16 11:50:36 +00:00
Nicola Mettifogo
41a1763fa8 Fixed half-invisible balloons.
svn-id: r33933
2008-08-16 08:57:07 +00:00
Nicola Mettifogo
5e912f6a90 Enabled interaction with movable zones - mainly NPCs - which are linked to animations.
svn-id: r33930
2008-08-16 07:47:44 +00:00
Nicola Mettifogo
797a5e7035 Fixed label positioning in BRA.
svn-id: r33928
2008-08-16 06:39:58 +00:00
Christopher Page
909b66ef54 Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33924
2008-08-16 04:30:01 +00:00
Christopher Page
c22f9b2358 Fixes for Parallaction loading from launcher
svn-id: r33923
2008-08-16 04:15:11 +00:00
Christopher Page
ec8dac5540 Added a MetaEngineFeature for RTL support, the RTL button is disabled in the GMM if the engine doesn't support it
svn-id: r33921
2008-08-16 02:53:16 +00:00
Christopher Page
9d3cdcb2da Defined some MetaEngineFeatures for the engines, the launcher uses these features to allow/disallow loading and deleting saves
svn-id: r33909
2008-08-15 18:15:14 +00:00
Nicola Mettifogo
7891e5afce Implemented raster operation for masks and postponed blitting of zones after everything in the location has been loaded. This fixes the remaining problems with animations not being masked by items.
svn-id: r33903
2008-08-15 15:08:08 +00:00
Nicola Mettifogo
05a021fd95 Added routines to load and handle item masks: animation are now correctly hidden when they are behind any object. The masks of items that are not explicitly activated (even if visible) still are handled (e.g. the crown in the museum is not visible in the foreground).
svn-id: r33900
2008-08-15 14:25:43 +00:00
Nicola Mettifogo
22eaffcb34 Updated layer calculation: animations are now hidden properly by background elements (but not items yet).
svn-id: r33894
2008-08-15 08:44:41 +00:00
Nicola Mettifogo
0606fef24e Made coordinates and frame number protected into Zone and Animation, and changed client code to use get/set. This will allow various simplifications (e.g. when calculating Z), and is a step towards correct handling of interactive zones of Zone/Animation in BRA.
svn-id: r33892
2008-08-15 04:30:45 +00:00
Nicola Mettifogo
c70d09bc26 Made scripts access Animation fields via accessors and mutators, instead of using raw pointers.
svn-id: r33891
2008-08-15 03:59:45 +00:00
Nicola Mettifogo
2679f6ce7a Disabled lip syncing code in BRA, since I couldn't find any scripts actually using it. Some warnings have been added as a sentinel.
svn-id: r33890
2008-08-15 03:36:01 +00:00
Nicola Mettifogo
ea2a2cbb7c Simplified handling of script variables (especially locals).
svn-id: r33889
2008-08-15 02:52:42 +00:00
Nicola Mettifogo
d3440f2cc5 Some variable renamed to make more sense.
svn-id: r33864
2008-08-14 13:45:32 +00:00
Nicola Mettifogo
15f4bc43cf More cleanup.
svn-id: r33861
2008-08-14 10:24:39 +00:00
Nicola Mettifogo
4447be7102 Cleanup.
svn-id: r33860
2008-08-14 10:04:43 +00:00
Nicola Mettifogo
5cfa50f028 Finally moved parseNextToken to Script, where it belongs!
svn-id: r33859
2008-08-14 07:14:34 +00:00
Nicola Mettifogo
4a46c99026 Removed cross-references between the general parser and the text formatter. To achieve this, I have rewritten the latter for both NS and BRA.
svn-id: r33858
2008-08-14 07:10:42 +00:00