Commit Graph

83 Commits

Author SHA1 Message Date
Max Horn
d3642080de Moved check for shouldRTL() from engines to scummvm_main
svn-id: r34310
2008-09-03 16:56:40 +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
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
0a387bca12 Moved mouse cursor loading/handling to Input class.
svn-id: r34206
2008-08-30 10:27:20 +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
c528106b86 Fixed segfault when quitting BRA.
svn-id: r34022
2008-08-19 08:08:32 +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
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
f46ee2b70c * Implemented pause/resume of command execution
* Implemented command opcode MOVE (not the script instruction).

svn-id: r33408
2008-07-29 12:59:55 +00:00
Nicola Mettifogo
ec04a81e81 Yet another hack to deal with labels... Must rethink this crap from scratch.
svn-id: r33377
2008-07-28 14:23:49 +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
Travis Howell
533dbfd756 Add basic support for running Amiga and PC demos of BRA.
svn-id: r33357
2008-07-28 07:20:55 +00:00
Nicola Mettifogo
03ffd60054 * Changed Disk code in BRA to use FilesystemNode (duplication has become truly visible!).
* Fixed Inventory items loading.

svn-id: r33352
2008-07-28 05:18:23 +00:00
Nicola Mettifogo
d223e90002 Inventory icons are now loaded correctly (not yet displayed). BRA doesn't crash anymore when pressing the right button. :)
svn-id: r33335
2008-07-27 13:43:40 +00:00
Nicola Mettifogo
a27f0faeef Made character visible in BRA.
svn-id: r33273
2008-07-25 08:27:44 +00:00
Nicola Mettifogo
884a6b1dfb Converted BRA to work with the new menu approach. It is not yet well plugged-in as in NS, but it suffices for the moment.
svn-id: r33272
2008-07-25 06:35:02 +00:00
Christopher Page
09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
2008-07-21 22:46:39 +00:00
Nicola Mettifogo
361bed0a95 Massive refactoring of dialogue code, which is now implemented as a finite state machine. Related code in other files has been updated has well.
svn-id: r33162
2008-07-21 06:08:30 +00:00
Christopher Page
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +00:00
Nicola Mettifogo
8ed023142a Moved program and command execution code out of the engine, into their own brand new
classes.

svn-id: r33003
2008-07-11 13:06:28 +00:00
Christopher Page
8d23846eaf Parallaction works with the new GMM implementation
svn-id: r32997
2008-07-10 23:03:34 +00:00
Nicola Mettifogo
18b48c74a9 Fixed regression introduced with GfxObj: the character sprite was sometimes removed from the rendering list.
svn-id: r32974
2008-07-09 10:52:46 +00:00
Nicola Mettifogo
d387d1af0e - Moved dialogue balloon management code from Gfx to its own class
- Added a class to draw balloons in BRA (still without text and with wrong placement)

svn-id: r32902
2008-07-04 00:29:21 +00:00
Christopher Page
e37b0745d3 Parallaction now uses the new _quit flag
svn-id: r32773
2008-06-25 01:41:40 +00:00
Christopher Page
cae6396ce7 Merged revisions 32507-32513,32516,32518,32520-32521,32523-32524,32526-32548,32550-32562 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32563
2008-06-05 21:20:35 +00:00
Nicola Mettifogo
2f92ebde2b oops. Changed stricmp to scumm_stricmp from last commit.
svn-id: r32531
2008-06-04 09:39:38 +00:00
Nicola Mettifogo
73832f2edd * Implemented character change opcodes in BRA
* Fixed loading of dialogue characters in BRA

svn-id: r32529
2008-06-04 09:07:55 +00:00
Nicola Mettifogo
b87c11a4a1 Fixed initialization of parsers, necessary after the latest removal of static arrays.
svn-id: r32509
2008-06-03 00:49:27 +00:00
Christopher Page
a338d5fdb2 PARA: Got rid of calls to system->quit() so that the Parallaction engine can return to the launcher. Also fixed a couple of memory leaks.
svn-id: r32504
2008-06-02 21:08:49 +00:00
Nicola Mettifogo
40ff1537a9 - Moved input code to its own class.
- Slightly simplified inventory highlight code thanks to changes in input code.

svn-id: r32115
2008-05-14 14:34:01 +00:00
Nicola Mettifogo
6979458e26 Extracted script parsing code to its own class.
svn-id: r31972
2008-05-10 11:11:03 +00:00
Nicola Mettifogo
1d025957ca Moved location parsing out of the engines, to LocationParser_ns and LocationParser_br.
svn-id: r31958
2008-05-09 01:35:43 +00:00
Nicola Mettifogo
1ddd54b50d - Moved some members from the engine class to Location, since they belong there.
- Cleaned up usage of location flags by using accessor functions.

svn-id: r31872
2008-05-05 11:02:40 +00:00
Travis Howell
27816d8c8b Add very basic support for Amiga version of BRA.
svn-id: r31416
2008-04-06 07:05:56 +00:00
Nicola Mettifogo
3d1a2e2049 Replaced custom ManagedList with Common::SharedPtr.
svn-id: r31415
2008-04-06 05:40:02 +00:00
Nicola Mettifogo
dabefdce05 Changed main loop to allow BRA to return to menu after intro.
svn-id: r30798
2008-02-05 10:24:22 +00:00
Nicola Mettifogo
265621de58 Fixes to make BRA introduction run:
- fixed location command parser
- implemented stop command
- temporary disabled speak zones (audio is not yet supported)

svn-id: r30796
2008-02-05 09:30:58 +00:00
Nicola Mettifogo
85171eadaa Programs are now handled in their own list, instead of being accessed via the referring Animation.
svn-id: r30768
2008-02-03 14:58:16 +00:00
Nicola Mettifogo
2e28552a7e Fixed location switching in BRA a bit more.
svn-id: r30757
2008-02-03 11:00:55 +00:00
Nicola Mettifogo
748a90ca23 Added code to unpack and render animations in BRA.
svn-id: r30755
2008-02-03 10:48:07 +00:00
Nicola Mettifogo
899fdcb367 Enabled rudimentary location switch in BRA.
svn-id: r30748
2008-02-02 22:45:31 +00:00
Nicola Mettifogo
d8349d66ff Subtitles are now displayed in the intro for BRA, though in wrong color (and I don't know why).
svn-id: r30747
2008-02-02 21:22:05 +00:00
Nicola Mettifogo
9f3ecd6409 Cleanup of BRA menu code.
svn-id: r30739
2008-02-02 12:36:06 +00:00
Nicola Mettifogo
36d863f94e Reworked menu in BRA (now functioning).
svn-id: r30737
2008-02-02 12:18:36 +00:00
Nicola Mettifogo
5306701eab Allowed BackgroundInfo to display bitmaps smaller than the screen and other small tweaks to re-enable splash screens in BRA.
svn-id: r30732
2008-02-02 10:18:31 +00:00
Nicola Mettifogo
68fc3f1dee Removed usage of kBitFront and kBitBack. Only the old kBit2 buffer is kept to store the background picture.
svn-id: r30687
2008-01-28 19:56:29 +00:00