Commit graph

98 commits

Author SHA1 Message Date
Nicola Mettifogo
d3440f2cc5 Some variable renamed to make more sense.
svn-id: r33864
2008-08-14 13:45:32 +00:00
Nicola Mettifogo
f4ef55a2e5 Tiny readability aid for parser code.
svn-id: r33369
2008-07-28 11:47:03 +00:00
Nicola Mettifogo
5d2e25ee11 Preliminary code for traps.
svn-id: r33364
2008-07-28 09:00:00 +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
3e08d36363 * Changed walk code to use Common::Point instead of the clumsy WalkNode.
* Changed walk code to use object copy instead of managing pointers.

svn-id: r33289
2008-07-25 16:01:25 +00:00
Eugene Sandulenko
de09845319 Fix for bug #2008054: Parallaction engine doesn't compile under MSVC9
svn-id: r32879
2008-07-03 08:44:29 +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
52fbdd51eb Script instructions referencing unexisting animations are now skipped, instead of crashing the engine.
svn-id: r32524
2008-06-04 01:27:55 +00:00
Christopher Page
fa75221e48 PARA: Fixed some memory leaks
svn-id: r32519
2008-06-03 18:24:54 +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
Max Horn
6e3c92e239 Renamed some parallaction member vars to have a leading underscore (besides being part of our code formatting conventions, this fixes various name clash warnings)
svn-id: r32041
2008-05-11 22:08:32 +00:00
Nicola Mettifogo
1320ab610b Cleanup of parsing code.
svn-id: r31999
2008-05-11 08:55:16 +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
Nicola Mettifogo
4295392906 Added new Parser class, which will gradually grow to include all parsing code from the engine class.
svn-id: r31865
2008-05-04 15:09:23 +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
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
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
605c9d0fd6 Turned Gfx::setFont into a protected member, since now Gfx can automatically detect which font to use. Gfx still needs setFont internally to select fonts. The font shadowing introduced in revision 30221 has been removed as well, since the new approach handles it better.
svn-id: r30361
2008-01-09 21:54:58 +00:00
Nicola Mettifogo
e21fd496f8 Restructured label handling and moved all related code to Gfx.
svn-id: r30345
2008-01-08 20:46:58 +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
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
fdb20177b4 Broke up parseDialogue into more manageable and focused short routines.
svn-id: r29716
2007-12-04 20:38:45 +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
6471eb84f2 Cleanup.
svn-id: r29556
2007-11-18 13:22:38 +00:00
Nicola Mettifogo
03d5111a74 Fixed parseLocation, so that it only tries to parse scripts when they aren't already loaded. This fixes bugs like #1816899, caused by the wrong data archive being selected in the Disk object.
svn-id: r29240
2007-10-21 15:26:07 +00:00
Nicola Mettifogo
78bc71e6f5 Cleanup.
svn-id: r29238
2007-10-21 13:09:53 +00:00
Nicola Mettifogo
f9b8c8a0d4 Turned the 'unexpected keyword' warning into a debug message and added a nifty line number to aid debugging.
svn-id: r29222
2007-10-14 21:35:02 +00:00
Nicola Mettifogo
963e63d985 Integrated low-level routines into the Script class, turning it into a self-contained parser for location, program and table scripts.
svn-id: r29221
2007-10-14 21:32:43 +00:00
Nicola Mettifogo
652069f1a6 Made location parser more fault-tolerant, in that it prints out a warning message instead of exiting ScummVM when it encounters an unexpected keywords in the scripts.
svn-id: r29220
2007-10-14 20:59:46 +00:00
Nicola Mettifogo
0fab64817f Fixed bug #1808615. An unexpected (but harmless) 'ENDCOMMANDS' statement was spotted in the game scripts by the new stricter parser.
svn-id: r29158
2007-10-06 21:15:53 +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
04c323a19f Split code from parseZoneTypeBlock in specialized parser functions.
svn-id: r28922
2007-09-16 09:26:03 +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
771f3e5306 Enforced use of character's feet coordinates throughout the walk code.
svn-id: r28760
2007-08-28 14:30:17 +00:00
Nicola Mettifogo
9c608fcacb Implemented more opcodes.
svn-id: r28746
2007-08-26 09:01:19 +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
8f2e600601 Merged most parser contexts into a single structure, added some new fields to support BRA.
svn-id: r28727
2007-08-25 16:45:06 +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