thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27123 commits 35 branches 0 tags 1.4 GiB
Commit graph

254 commits

Author SHA1 Message Date
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
Nicola Mettifogo
5ea9bdd99a Merged inventory input code from different files. 
svn-id: r33198
 2008-07-22 12:35:46 +00:00
Nicola Mettifogo
791d2b3ba2 Changed comment display code so that input polling is integrated into the main loop, instead of being performed in a blocking way from a separate routine. 
svn-id: r33188
 2008-07-22 09:00:39 +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
Christopher Page
0cae5552db Improved GMM sound setting config for Parallaction 
svn-id: r33181
 2008-07-21 21:11:28 +00:00
Nicola Mettifogo
5a71d764e7 Some refactoring for tracking of floating labels. 
svn-id: r33165
 2008-07-21 09:25:40 +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
ef95c6ff70 More refactoring of walk code. 
svn-id: r33033
 2008-07-13 13:04:36 +00:00
Nicola Mettifogo
059936854c Cleanup of walk code. 
svn-id: r33023
 2008-07-13 06:27:31 +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
12cefc4132 Fixed leaks in NS and BRA. 
svn-id: r32976
 2008-07-09 13:27:09 +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
Nicola Mettifogo
77a60673ef - Changed labels to be GfxObj's, thus removing the Label object altogether. 
- Changed Item's to be almost GfxObj's, since ownership and destruction of underlying resource is an issue here (got to think some more about it).

svn-id: r32873
 2008-07-02 01:41:08 +00:00
Christopher Page
e37b0745d3 Parallaction now uses the new _quit flag 
svn-id: r32773
 2008-06-25 01:41:40 +00:00
Nicola Mettifogo
446f66807f Circular references between Zone/Animation and Command are now manually removed, to allow the objects - which are stored into SharedPtr's - to be deallocated. 
svn-id: r32744
 2008-06-22 05:42:22 +00:00
Christopher Page
fa75221e48 PARA: Fixed some memory leaks 
svn-id: r32519
 2008-06-03 18:24:54 +00:00