Commit Graph
71 Commits
Author SHA1 Message Date
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 a5ebc88dbc Fixed mouse cursor when closing inventory.
svn-id: r33220
2008-07-23 02:01:15 +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 85f56095bf Removed unneeded input code.
svn-id: r33189
2008-07-22 09:12:10 +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
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 7f480ac571 Quit and RTL code is more modular now. EVENT_RTL no longer sets _shouldQuit, shouldQuit is only set if there's an EVENT_QUIT. EVENT_RTL and EVENT_QUIT are completely separate from each other. Engine::quit() method now checks both _shouldQuit and _shouldRTL to determine if the engine should exit. There is no longer a need for resetQuit(), so it's removed
svn-id: r33082
2008-07-16 04:22:56 +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 67c8c39fdf Queen works with the new GMM implementation, and made a correction to a change in parallaction
svn-id: r32999
2008-07-11 00:49:01 +00:00
Christopher Page b519013925 One more thing for Parallaction
svn-id: r32998
2008-07-10 23:04:57 +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 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 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 765f976008 * Cleanup of input code.
* Removed old timer routines.

svn-id: r32135
2008-05-15 01:18:26 +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