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

99 commits

Author SHA1 Message Date
Christopher Page
0cbfc3a9d1 Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32505
 2008-06-02 21:36:45 +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
22d63345e3 Got rid of the static arrays for initialization of parsers and exec opcodes, to make returning to launcher easier. The code has been borrowed by Kyra, after suggestion by LordHoto. 
svn-id: r32465
 2008-06-01 14:05:39 +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
c7c8bb99ee Tiny cleanup to ease extraction of the program parser code. 
svn-id: r31959
 2008-05-09 01:42:25 +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
Nicola Mettifogo
d4c8d4e18f Fixed usage of SharedPtr, so that reference counting is proper and there are no more objects that need constructors at global level (helps PalmOS). 
svn-id: r31533
 2008-04-17 09:32:57 +00:00
Nicola Mettifogo
3d1a2e2049 Replaced custom ManagedList with Common::SharedPtr. 
svn-id: r31415
 2008-04-06 05:40:02 +00:00
Nicola Mettifogo
435c437f6d More refactoring for command parsing/execution. 
svn-id: r30841
 2008-02-09 23:26:45 +00:00
Nicola Mettifogo
cf724e889c Added new debug command to dump scripts execution status. 
svn-id: r30840
 2008-02-09 22:07:51 +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
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
ed09766acc BRA now loads and displays location backgrounds (at least in the intro). 
svn-id: r30740
 2008-02-02 13:57:29 +00:00
Nicola Mettifogo
015ad5e469 Some more integration of background code into BackgroundInfo. 
svn-id: r30731
 2008-02-02 09:48:07 +00:00
Filippos Karapetis
289d18ed07 Fix shadowing warning 
svn-id: r30710
 2008-01-30 23:09:18 +00:00
Nicola Mettifogo
d6f45b451b Fixed regression when displaying animation: the issue could only be noticed when characters appeared out of their sketches in the intro. 
svn-id: r30696
 2008-01-29 09:58:21 +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
Nicola Mettifogo
3c2c16c705 Fixed animation sorting: everything should be drawn like before revision 30673 now. Character may still disappear when changing location because of wrong resource management, though. 
svn-id: r30680
 2008-01-28 16:52:41 +00:00
Nicola Mettifogo
cce8e25960 Removed all job routines. Stubs have been left for future reference in the code for BRA. 
svn-id: r30675
 2008-01-28 13:10:49 +00:00
Nicola Mettifogo
be2c5d3c87 All interactive objects are now drawn in the framebuffer instead of using the old kBitBack/kBitFront buffers. Animation are not sorted yet, so they can overlap in an inconsistent fashion for the time being. 
svn-id: r30673
 2008-01-28 12:20:53 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs. 
svn-id: r30667
 2008-01-28 00:14:17 +00:00
Nicola Mettifogo
7d635a4b9c Added function to encapsulate/protect manipulation of background. 
svn-id: r30441
 2008-01-12 10:46:51 +00:00
Nicola Mettifogo
1b80eedaa1 Added a proper _name member to Zone, instead of using the label text. 
svn-id: r30343
 2008-01-08 20:32:29 +00:00
Torbjörn Andersson
eeb212c7e0 Indent with tabs instead of spaces. 
svn-id: r30312
 2008-01-06 20:42:28 +00:00
Nicola Mettifogo
db51514dd3 Moved balloons management into Gfx, which is now responsible for positioning and drawing. All balloons are now drawn on a different layer than the game graphics, thus simplifying screen management. Dialogue code has undergone a major revision, and the superior implementation of answer selection in the Amiga version is now used in place of the poor PC one. Other bits (where some changes had already been introduced) have been updated, too. 
svn-id: r30311
 2008-01-06 19:29:41 +00:00
Nicola Mettifogo
7bef63537d Going back to uncached mode for graphics resources of Examine zones. This prevents engine to crash when trying to cache a resource out of the currently selected archive. 
svn-id: r29798
 2007-12-09 17:29:41 +00:00
Nicola Mettifogo
919c0a2833 * added adapter from Graphics::Surface to Frames 
* changed all Disk routines to return Frames* instead of Graphics::Surface*
* changed displayItemComment to use new gfx routines
* merged code for Examine zones into displayComment

svn-id: r29615
 2007-11-22 21:51:33 +00:00
Nicola Mettifogo
d8e8050015 * added (incomplete) explicit state machine handling in engine class (see _inputMode) 
* added service routines to Gfx
* changed displayCharacterComment to work with the new state machine and gfx routines

svn-id: r29613
 2007-11-22 21:19:44 +00:00
Nicola Mettifogo
6af9577e84 * moved label drawing into Gfx, to be drawn directly in the framebuffer 
* changed low level blitting function to accept Graphics::Surface to ease development
* temporarily disabled labels/subtitles in BRA

svn-id: r29593
 2007-11-21 20:04:14 +00:00
Nicola Mettifogo
d86246308d Walk and script handling are now directly handled by the main loop, instead of relying on the job list. 
svn-id: r29568
 2007-11-19 20:23:01 +00:00
Sven Hesse
40a5f8028a Muting the compiler :P 
svn-id: r29563
 2007-11-18 22:22:38 +00:00
Nicola Mettifogo
28289fb694 Cleanup. 
svn-id: r29562
 2007-11-18 21:32:22 +00:00
Nicola Mettifogo
7731af9833 Partly decoupled rendering from game data update. Graphics routines to draw/erase animations and labels are now invoked explicitly instead of being handled in the job list. 
svn-id: r29561
 2007-11-18 21:16:27 +00:00
Nicola Mettifogo
6471eb84f2 Cleanup. 
svn-id: r29556
 2007-11-18 13:22:38 +00:00
Nicola Mettifogo
10caba3562 * centralized kEngineChangeLocation flag handling 
* simplified runGame, moving flags testing into called routines

svn-id: r29504
 2007-11-14 22:24:26 +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
d7ae40b65d Refactored a lot of Character-related code and put it into the Character class. 
svn-id: r29025
 2007-09-22 18:45:43 +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
c37de0131b Revised debug levels and added many debug strings for parsers. 
svn-id: r28921
 2007-09-16 08:43:34 +00:00
Nicola Mettifogo
c22784449f Fixed BRA parser table for scripts. 
svn-id: r28905
 2007-09-15 12:16:43 +00:00
Nicola Mettifogo
21e4f4f176 Simplified global label management and added subtitles for BRA. 
svn-id: r28828
 2007-09-02 18:34:11 +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
1e8ebaa7bd Cleanup script routines. 
svn-id: r28718
 2007-08-25 11:45:05 +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