Travis Howell
60db8cb8cf
Correct typo.
...
svn-id: r32903
2008-07-04 00:35:39 +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
59e672ef40
Changed balloons to use GfxObj as well. Next step is to integrate balloons for BRA.
...
svn-id: r32883
2008-07-03 10:31: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
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
Nicola Mettifogo
2779b851ab
Small cleanup/shuffling of Gfx code.
...
svn-id: r32847
2008-06-30 01:36:50 +00:00
Nicola Mettifogo
206485ffc6
Merged the three render lists (for animations, doors and objects) into a single one.
...
svn-id: r32834
2008-06-29 09:56:44 +00:00
Nicola Mettifogo
d8645297cd
Changed all remaining code to use the GfxObj class to keep frames data. This allows for more uniform processing during rendering, and also fixes the display of dialogue faces for BRA.
...
svn-id: r32833
2008-06-29 09:30:32 +00:00
Nicola Mettifogo
e6e56feb1c
Added comment for fix for bug #2001193 .
...
svn-id: r32820
2008-06-28 13:31:58 +00:00
Nicola Mettifogo
28e32bb7cb
Fix for bug #2001193 . Character confirmation screen didn't appear and game crashed because too many strings were added to the draw list.
...
svn-id: r32762
2008-06-24 13:21:22 +00:00
Filippos Karapetis
9194f39185
Fixed 2 MSVC warnings (potentially undefined behavior and possibly uninitialized variable used)
...
svn-id: r32758
2008-06-22 17:36:14 +00:00
Nicola Mettifogo
d2609258cc
Added constructor and destructor to Dialogue, thus fixing a long standing leak.
...
svn-id: r32757
2008-06-22 14:46:08 +00:00
Nicola Mettifogo
4e2e46f16c
Fixed leak when loading sounds for Amiga version of Nippon Safes.
...
svn-id: r32756
2008-06-22 14:31:45 +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
e86a422e25
Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from
...
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32667
2008-06-11 17:36:21 +00:00
Torbjörn Andersson
339874f6c0
Fixed warnings. (Mainly, GCC 4.3 doesn't want you to use "char" as an array
...
index. Probably because it's undefined whether or not it's signed.)
svn-id: r32637
2008-06-09 17:50:52 +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
2f92ebde2b
oops. Changed stricmp to scumm_stricmp from last commit.
...
svn-id: r32531
2008-06-04 09:39:38 +00:00
Nicola Mettifogo
73832f2edd
* Implemented character change opcodes in BRA
...
* Fixed loading of dialogue characters in BRA
svn-id: r32529
2008-06-04 09:07:55 +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
Nicola Mettifogo
fe6ab4227e
Return to menu after introduction has played (with glitches).
...
svn-id: r32523
2008-06-04 01:04:26 +00:00
Christopher Page
fa75221e48
PARA: Fixed some memory leaks
...
svn-id: r32519
2008-06-03 18:24:54 +00:00
Nicola Mettifogo
b87c11a4a1
Fixed initialization of parsers, necessary after the latest removal of static arrays.
...
svn-id: r32509
2008-06-03 00:49:27 +00:00
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
9630298df6
Sorted static mouse arrow bitmap, so it doesn't have to be 'decoded' on the fly. This saves a headache on re-entry.
...
svn-id: r32495
2008-06-02 13:12:07 +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
765f976008
* Cleanup of input code.
...
* Removed old timer routines.
svn-id: r32135
2008-05-15 01:18:26 +00:00
Sven Hesse
78b599bc26
Fix compilation
...
svn-id: r32118
2008-05-14 15:27:28 +00:00
Nicola Mettifogo
e2d58f4885
Oops. Forgot to update module.mk.
...
svn-id: r32116
2008-05-14 14:34:42 +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
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
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
e2e2af4ff5
Reverted commit 31928 by Buddha_, and defined kFlagsAll as 0xFFFFFFFFU in the enum, as suggested by Fingolfin.
...
svn-id: r31939
2008-05-08 02:46:12 +00:00
Kari Salminen
2d707af338
A (temporary?) fix for the signed/unsigned issues with enum CommandFlags usage.
...
svn-id: r31928
2008-05-07 14:49:42 +00:00
Nicola Mettifogo
3d3ad58e14
Reverting commit 31920, thus changing type of flags back to unsigned. If some compiler emits a warning about 0xFFFFFFFF not being an unsigned immediate, then we need to find out how to convince it without changing types of variables in the code.
...
svn-id: r31924
2008-05-07 12:44:22 +00:00
Sven Hesse
6e61b02cb9
Silencing a compiler warning
...
svn-id: r31923
2008-05-07 12:34:40 +00:00
Filippos Karapetis
a3dbf43629
Fixed signed/unsigned issues with kFlagsAll
...
svn-id: r31920
2008-05-07 08:29:11 +00:00
Jordi Vilalta Prat
38a8aa516e
Allow static and dynamic plugins to be used at the same time
...
svn-id: r31888
2008-05-06 03:00:26 +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
a3794c5f37
Partly fixed loading of bitmaps in BRA Amiga. Bitmaps are still broken, but less than before.
...
svn-id: r31864
2008-05-04 15:06:47 +00:00
Eugene Sandulenko
3af2d8d0fd
Fix compilation
...
svn-id: r31758
2008-04-28 16:10:40 +00:00
Nicola Mettifogo
6d3a7e4f6b
Moved some static members into Parallaction class.
...
svn-id: r31755
2008-04-28 09:42:29 +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
984e42569e
Replaced unpackBlt with a more general version that can also unpack animation in BRA.
...
svn-id: r31532
2008-04-17 09:31:22 +00:00
Nicola Mettifogo
ff2dfb6a4e
Cleanup of background loading for BRA.
...
svn-id: r31531
2008-04-17 09:30:04 +00:00