Commit Graph

272 Commits

Author SHA1 Message Date
Nicola Mettifogo
41ebd732f5 Fixed display of location background when changing from a scrollable to a non-scrollable one.
svn-id: r35522
2008-12-24 09:53:00 +00:00
Nicola Mettifogo
6c1dc0c03b Simplified destructions of Balloon objects.
svn-id: r35521
2008-12-24 09:51:07 +00:00
Nicola Mettifogo
e11c17a005 Moved more GfxObj management to Gfx object.
svn-id: r35466
2008-12-21 15:42:47 +00:00
Nicola Mettifogo
025b2a93e9 Moved mask creation/handling to Gfx.
svn-id: r35447
2008-12-20 08:15:09 +00:00
Nicola Mettifogo
774773b7cd Reduced code duplication when manipulating Animations, and cleanup.
svn-id: r35408
2008-12-17 11:15:47 +00:00
Nicola Mettifogo
c76f0bdb10 Weeded out some more unused code, and some restructuring.
svn-id: r35377
2008-12-15 07:15:29 +00:00
Nicola Mettifogo
dc3e9027f4 Removed references to _vm from the engine itself.
svn-id: r35358
2008-12-14 10:32:26 +00:00
Nicola Mettifogo
e98bc7e402 Removed some unused code.
svn-id: r35357
2008-12-14 10:08:31 +00:00
Nicola Mettifogo
800db6f142 Restructuring of rendering code.
svn-id: r35342
2008-12-13 17:31:48 +00:00
Nicola Mettifogo
b3475d8178 * Replaced char* with Common::String in the parser.
* Enforced const-correctness on related routines.

svn-id: r35326
2008-12-13 03:37:43 +00:00
Nicola Mettifogo
3fc72c63d9 Simplified scrolling calculations.
svn-id: r35254
2008-12-06 06:13:48 +00:00
Nicola Mettifogo
7681461b16 Implemented horizontal scrolling for BRA, by using a back buffer. Dialogues in scrollable locations are a bit messed up for the moment.
svn-id: r35253
2008-12-06 04:51:04 +00:00
Nicola Mettifogo
27a5d8bd5b Better cleanup and handling of mouse when changing location in NS.
svn-id: r34942
2008-11-09 03:53:06 +00:00
Nicola Mettifogo
3eeece6a25 * cleanup
* moved find routines from Parallaction to Location

svn-id: r34940
2008-11-08 15:02:19 +00:00
Nicola Mettifogo
5581030972 * removed the obsolete _quit flag
* refactored most cleanup code for locations and game

svn-id: r34939
2008-11-08 14:56:45 +00:00
Nicola Mettifogo
e6337d11aa * completed transition to Common::Archive for Nippon Safes.
* removed lots of old Archive swap magic

svn-id: r34931
2008-11-07 15:35:18 +00:00
Max Horn
40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +00:00
Nicola Mettifogo
cd3011e408 Fixed assorted leaks in NS Amiga.
svn-id: r34870
2008-11-01 12:39:01 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +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
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
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
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
47b1a06e3b Removed unused code and structures, and a bit of cleanup.
svn-id: r34080
2008-08-21 12:11:24 +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
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
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
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
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Nicola Mettifogo
f5b7004fae * Removed references to the current _backgroundInfo from parser code.
* Re-enabled masks (in BRA DOS).

svn-id: r33474
2008-07-31 15:15:42 +00:00
Nicola Mettifogo
6ed4beb1bf Made changing of background more flexible, in that the engine can now configure its BackgroundInfo before passing it to Gfx.
svn-id: r33469
2008-07-31 12:50:43 +00:00
Nicola Mettifogo
591973c827 Changed Gfx::_backgroundInfo to be a pointer. This temporarily kills all z-buffering.
svn-id: r33468
2008-07-31 12:26:12 +00:00
Nicola Mettifogo
a1557bd776 Pick up/drop/open/close actions are now available in game.
svn-id: r33371
2008-07-28 11:50:36 +00:00
Nicola Mettifogo
b9d0e4dafb Doug from BRA can now walk in his hotel room. He still stops in bizarre poses, though.
svn-id: r33325
2008-07-27 08:35:00 +00:00
Nicola Mettifogo
8245aa42b5 More cleanup.
svn-id: r33298
2008-07-26 05:56:39 +00:00
Nicola Mettifogo
7950a9183b * Added walk calculations to BRA (doesn't walk yet, though).
* Adapted Character and Animation to handle both versions of the engine.

svn-id: r33296
2008-07-26 04:01:11 +00:00
Christopher Page
cbe0af1c19 Added --list-saves support for PARALLACTION, and -x support for NipponSafes
svn-id: r33292
2008-07-25 21:24:09 +00:00
Nicola Mettifogo
1174296a66 Changed the remaining references to Nodes into Points.
svn-id: r33290
2008-07-25 16:08:10 +00:00
Nicola Mettifogo
4936e5f7df * Moved end intro and end game sequences code to gui.
* Rewrote all gui code to be run inside the main loop
* Added code to avoid crashes when a scene with no standard background is drawn

svn-id: r33260
2008-07-24 09:24:32 +00:00
Nicola Mettifogo
53615c9128 Removed the historical waitUntilLeftClick function and adapted code to use the more general readInput and waitForButtonEvent.
svn-id: r33226
2008-07-23 07:52:43 +00:00
Nicola Mettifogo
78ccedf898 Removed useless event management code and made readInput() more general.
svn-id: r33225
2008-07-23 07:31:35 +00:00
Nicola Mettifogo
8932619ee2 More decoupling of inventory code.
svn-id: r33224
2008-07-23 02:45:09 +00:00
Nicola Mettifogo
5eec5f6b17 More merging of input code.
svn-id: r33219
2008-07-23 01:07:39 +00:00