Commit Graph

67 Commits

Author SHA1 Message Date
Nicola Mettifogo
eb5beef6a1 * Added secondary inventories for BRA.
* Added comments where code must be added/updated to support multiple inventories.

svn-id: r44476
2009-09-30 07:47:58 +00:00
Nicola Mettifogo
e660f31ed8 Provide only the data that is strictly needed when creating a new Inventory.
svn-id: r44475
2009-09-30 07:09:07 +00:00
Nicola Mettifogo
465da49782 Made BRA demos start again by partially reverting commit 39773. Multiple inventory support must be done somehow differently.
svn-id: r40750
2009-05-21 08:06:15 +00:00
Nicola Mettifogo
86a1926c19 Added basic multiple inventory support. This will be used for the GIVE and SWAP commands.
svn-id: r39773
2009-03-31 15:45:44 +00:00
Travis Howell
7f99a190cb Fix loading objects in the Amiga version of BRA.
svn-id: r39413
2009-03-15 09:29:25 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab
svn-id: r39203
2009-03-07 19:24:31 +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
6724097f67 Fixed positioning of inventory.
svn-id: r35325
2008-12-13 03:36:28 +00:00
Nicola Mettifogo
db88c544b7 Fixed assorted leaks in Parallaction.
svn-id: r35270
2008-12-07 12:41:50 +00:00
Nicola Mettifogo
4c377e0339 Fixed positioning of overlayed graphics (dialogues, inventory, labels) in all locations. These items are now all handled in screen coordinates which are translated automatically by the renderer.
svn-id: r35255
2008-12-06 06:17:10 +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
f31cf5d94c * Added flexible verb configuration for both NS and BRA.
* Objects can now be really opened and closed in BRA.

svn-id: r33405
2008-07-29 10:22:50 +00:00
Nicola Mettifogo
df50b8ee68 Inventory is now properly rendered. Item selection is not yet working.
svn-id: r33355
2008-07-28 06:06:35 +00:00
Nicola Mettifogo
387134a16a Moved inventory cursor drawing code to InventoryRenderer.
svn-id: r33337
2008-07-27 14:21:16 +00:00
Nicola Mettifogo
8932619ee2 More decoupling of inventory code.
svn-id: r33224
2008-07-23 02:45:09 +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
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Nicola Mettifogo
f8e1da5b60 * made engine use Inventory and InventoryRenderer
* inventory drawing is now performed directly in the framebuffer instead of using the game screen buffer
* specialized jobs to handle inventory drawing have been deleted as they had become obsolete

svn-id: r29571
2007-11-19 20:46:28 +00:00
Nicola Mettifogo
28289fb694 Cleanup.
svn-id: r29562
2007-11-18 21:32:22 +00:00
Nicola Mettifogo
c68871860a Added new debug level for inventory routines.
svn-id: r29239
2007-10-21 13:10:36 +00:00
Nicola Mettifogo
6351ed5379 Fixed bug #1808529. One must use memmove() when copying overlapping blocks of memory (blush).
svn-id: r29161
2007-10-07 07:11:09 +00:00
Nicola Mettifogo
9280c25a36 Fixed bug #1808620. The original Inventory::addItem routine relied on a trick that went undetected until r29060 actually broke it. Not all regression is bad, after all.
svn-id: r29157
2007-10-06 20:56:17 +00:00
Nicola Mettifogo
212d4ed913 Changed InventoryRenderer to draw inventory over a Surface, thus removing useless drawing routines.
svn-id: r29097
2007-09-25 15:58:44 +00:00
Nicola Mettifogo
8e1e4b9079 Fixed inventory regression introduced with yesterday's commit.
svn-id: r29091
2007-09-24 19:45:18 +00:00
Nicola Mettifogo
19e9161a20 Oops. Some debug code was committed.
svn-id: r29061
2007-09-23 20:23:49 +00:00
Nicola Mettifogo
05abbf49a2 Moved most of inventory-related code inside classes Inventory and InventoryRenderer. Shift is not completed, as new code doesn't handle selections yet (falling back to existent code).
svn-id: r29060
2007-09-23 20:17:50 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Nicola Mettifogo
af72280fb9 Cleanup: removed unneeded references to engine (_vm).
svn-id: r28826
2007-09-02 15:27:25 +00:00
Nicola Mettifogo
60a6d5aa53 Jobs are now members of the engine and are handled with a table, instead of being external functions.
svn-id: r28824
2007-09-02 15:17:41 +00:00
Nicola Mettifogo
39e4a9b180 Added an abstract base class for representing multiple-frames for animations. Changed user code to rely on the new interface. Cnv has been turned into an implementation of the new interface, and it is now known as a concrete class only to Disk and Font code for Nippon Safes.
svn-id: r28734
2007-08-25 20:34:10 +00:00
Nicola Mettifogo
37cdd1c69a First step in restructuring engine code:
- code has been consolidated in fewer files
- new table-driven parsers/execution
- some functions has been pushed down the engine hierarchy
- Parallaction_br now inherits from Parallaction_ns

svn-id: r28711
2007-08-24 20:14:51 +00:00
Nicola Mettifogo
236634662c Made screen size parameters properties of engine instead of compile-time constants.
svn-id: r28219
2007-07-26 18:30:27 +00:00
Nicola Mettifogo
945be6e5f2 Moved mouse cursor tampering from inventory.cpp to Gfx class, and some cleanup.
svn-id: r27996
2007-07-09 19:19:56 +00:00
Nicola Mettifogo
a641ee4fbe Changed inventory graphics update from synchronous to lazy.
svn-id: r27975
2007-07-08 20:15:43 +00:00
Nicola Mettifogo
d1b9002bb0 Cleanup inventory code.
svn-id: r27974
2007-07-08 19:56:12 +00:00
Nicola Mettifogo
f6e2c67cbb Mouse is now properly hidden during dialogues, and is restored after load/save dialog boxes are closed. Moreover, kEngineMouse constant has been renamed to better match its meaning.
svn-id: r27539
2007-06-18 20:11:49 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Nicola Mettifogo
7d2809108e Fixed the largest memory leaks.
svn-id: r26905
2007-05-21 21:06:30 +00:00
Nicola Mettifogo
2a45bcdaab Reverted some changes to inventory handling.
svn-id: r26838
2007-05-13 16:25:18 +00:00
Nicola Mettifogo
a1733f8bbe More cleanup.
svn-id: r26835
2007-05-13 14:56:44 +00:00
Nicola Mettifogo
ae63466446 cleanup
svn-id: r26834
2007-05-13 14:38:05 +00:00
Nicola Mettifogo
a4cc51b8c5 Added embryonic debugger, and some adjustments to make basic commands work.
svn-id: r26755
2007-05-06 08:52:27 +00:00
Nicola Mettifogo
a0dbf44ee1 - moved walk code to List<>
- some adjustments to #include statements

svn-id: r26424
2007-04-09 10:03:15 +00:00
Nicola Mettifogo
5a8b8ca92d cleanup
svn-id: r26409
2007-04-07 16:40:27 +00:00
Nicola Mettifogo
711865ef63 - implemented destructor for Cnv, thus removing calls to Gfx::freeCnv()
- enforced use of getFramePtr instead of Cnv::_array member

svn-id: r26317
2007-03-29 18:34:31 +00:00
Nicola Mettifogo
c1f84742f9 changed remaining stuff to Common::Point and got rid of custom Point and Rect
svn-id: r26216
2007-03-18 17:22:07 +00:00
Nicola Mettifogo
919985e4df converted input and labels to Common::Point
svn-id: r26214
2007-03-18 17:12:48 +00:00
Nicola Mettifogo
13385a5f2d Made loadObjects return a new Cnv instead of accepting a parameter.
svn-id: r26202
2007-03-18 10:34:41 +00:00
Nicola Mettifogo
5ffd410e30 fixed usage of reference operator
svn-id: r26189
2007-03-18 08:15:54 +00:00
Nicola Mettifogo
f272d19570 cleanup
svn-id: r26179
2007-03-17 17:52:30 +00:00