18716 Commits

Author SHA1 Message Date
Johannes Schickel
3846565058 Implements item shape loading for kyra3.
svn-id: r23637
2006-07-30 14:53:28 +00:00
Travis Howell
8b38f65d1a Add Pajama Sam 3 and Spy FOX 2 mini games
svn-id: r23635
2006-07-30 13:06:32 +00:00
Max Horn
53f73eac85 Added explicit string equals/hash functors to a new header common/hash-str.h; removed Hash functor specialization for String and char pointers; changed all code using hashmaps with string keys to explicitly specify whether they honor or ignore case
svn-id: r23634
2006-07-30 12:21:54 +00:00
Max Horn
bd49091afd Added new equals(IgnoreCase) and compareTo(IgnoreCase) methods to class String
svn-id: r23633
2006-07-30 12:17:51 +00:00
Paul Gilbert
1f8066c333 Added proper item selection handling for the ASK action
svn-id: r23632
2006-07-30 12:15:52 +00:00
Paul Gilbert
0849e46541 Added a popup menu method for listing the items presented in response to an ASK action
svn-id: r23631
2006-07-30 12:13:26 +00:00
Paul Gilbert
6fa9819377 Added constants for known hotspot flags, and added line to flag hotspots that have been highlighted with the cursor
svn-id: r23630
2006-07-30 12:12:18 +00:00
Paul Gilbert
906f36a323 Added script method for changing the current hotspot header flags mask byte
svn-id: r23629
2006-07-30 12:10:44 +00:00
Paul Gilbert
2b4518d8a9 Added a field value for the current hotspot header flags mask byte
svn-id: r23628
2006-07-30 12:09:51 +00:00
Max Horn
b3a66e817f Rename BaseNodeFunc to BaseNodeType
svn-id: r23627
2006-07-30 10:48:44 +00:00
Torbjörn Andersson
066aa14f97 It's play(), not open(), that encounters the CMDS tag. At least in the intro
movie, which is the only one we currently play.

svn-id: r23626
2006-07-30 09:10:54 +00:00
Kostas Nakos
c1a24c9cdb CinE Engine support (backport)
svn-id: r23625
2006-07-30 09:03:10 +00:00
Johannes Schickel
6cc1a57d3b - fixes bug in fileData (introduced with last commit)
- show mouse cursor in Screen::setMouseCursor if it's allready shown
- a little bit more kyra3 init stuff

svn-id: r23623
2006-07-30 08:22:39 +00:00
Johannes Schickel
92649de672 - fixes copyright of kyra3.h
- implements a bit more init functions for kyra3
- removes hacked mouse cursor
- changes Resource::fileData to accept a null pointer for size

svn-id: r23622
2006-07-30 07:51:11 +00:00
Johannes Schickel
8d453f2267 Another little formatting and a typo fix.
svn-id: r23621
2006-07-29 23:51:43 +00:00
Johannes Schickel
43fbc9eb81 Adding comment about forced MQ on small devices.
svn-id: r23620
2006-07-29 23:44:09 +00:00
Johannes Schickel
1d52f836dc Some formatting 'fixes'
svn-id: r23619
2006-07-29 23:42:27 +00:00
Max Horn
29b64b4aab Small fix for the symbian port
svn-id: r23618
2006-07-29 20:20:01 +00:00
Torbjörn Andersson
f51fc44e66 Added _quitFlag test to Kyra 2 animation and to waitForEvent().
svn-id: r23617
2006-07-29 05:59:44 +00:00
Johannes Schickel
f8d4994dc2 Little cleanup.
svn-id: r23616
2006-07-28 17:42:33 +00:00
Johannes Schickel
b17c895ea9 Updating msvc8 project files.
svn-id: r23615
2006-07-28 17:35:04 +00:00
Oystein Eftevaag
3c4b13ed33 Moves the kyra2 code to kyra2.cpp and kyra2.h, renames WSAMovieV3 to WSAMovie2 (kyra2 uses the same format), renames a define in kyra3.h for consistency, and adds a case for CMDS in the VQA player to avoid the constant warning (the tag is always present and empty). Credit/blame for the last one goes to Clemmy :). Starting kyra2 will now show the title animation.
svn-id: r23614
2006-07-28 11:42:53 +00:00
Johannes Schickel
a69ac7717d Oops it should never be renamed to c1_* but to o1_* changing this now.
svn-id: r23613
2006-07-27 20:39:52 +00:00
Johannes Schickel
ee5621137f - renaming all opcodes from cmd_* to c1_*
- changing ScriptHelper functions so it will be useable for kyra2 and kyra3 too
- unbreaking savegames (increasing the VERSION number since the game flags table got resized to be useable for kyra3)

svn-id: r23612
2006-07-27 20:30:51 +00:00
Johannes Schickel
8a0ec2a3e5 - moving KyraEngine_v3 declaration to newly added kyra3.h
- implements a little bit init stuff
- implements some music handling

svn-id: r23610
2006-07-27 18:29:14 +00:00
Johannes Schickel
d9e5134919 Workaround for bug #1498221 ("KYRA1: Glitches when meeting Zanthia").
svn-id: r23608
2006-07-27 00:09:13 +00:00
Johannes Schickel
bcc892ec81 Make the midi player threadsafe (this should fix bug #1506583 "KYRA1: Crash on exceeded polyphony").
svn-id: r23605
2006-07-26 22:24:33 +00:00
Torbjörn Andersson
eb7cda50aa Fade out the music when using the Kyra 3 menu to exit. (The original does, and
it might make a useful test case for the fade-out code.)

svn-id: r23604
2006-07-26 20:39:27 +00:00
Torbjörn Andersson
e9f1323221 End the Kyra 3 menu screen if _quitFlag is set.
svn-id: r23603
2006-07-26 20:30:57 +00:00
Kostas Nakos
fcb7fe3e63 hotfix for bug #1519449 (scaling/crash issue) (backport)
svn-id: r23602
2006-07-26 20:09:12 +00:00
Kostas Nakos
c11a5c939d fix bug 1521718 (dpad mouse emulation) (backport)
svn-id: r23600
2006-07-26 17:25:14 +00:00
Torbjörn Andersson
ec6a9b0071 Removed unnecessary #include
svn-id: r23598
2006-07-26 06:36:58 +00:00
Johannes Schickel
d2befe0c6f Skips scroll down sequence then the user wishes to skip the intro.
svn-id: r23596
2006-07-26 05:33:48 +00:00
Johannes Schickel
5ccb436cad Nicer quit handling in the intro sequences.
svn-id: r23594
2006-07-26 05:27:34 +00:00
Johannes Schickel
37d050e9da Add support for looping the kyra3 main menu.
svn-id: r23593
2006-07-25 15:11:42 +00:00
Travis Howell
bb5280bb2f Check uppercase and lowercase, when confirming quit in Simon the Sorcerer 1/2
svn-id: r23591
2006-07-25 03:46:56 +00:00
Travis Howell
7fe844cac6 Fix bug #1496523 - MM: Weird Ed appears backwards at door
svn-id: r23589
2006-07-24 12:49:58 +00:00
Johannes Schickel
f464830a17 Documenting Common::File a bit.
svn-id: r23588
2006-07-24 12:10:32 +00:00
Travis Howell
100b809836 Fix bug #1527630 - ZAK FM-TOWNS: Actor (Caponian) picks wrong line
svn-id: r23586
2006-07-24 10:52:14 +00:00
Torbjörn Andersson
c32076e5d0 Use #include "..." instead of #include <...> for pack-start.h and pack-end.h
for consistency with other #includes.

svn-id: r23585
2006-07-23 16:13:26 +00:00
Torbjörn Andersson
eabe720a0e Changed __lure_res_h__ to LURE_RES_H etc for consistency.
svn-id: r23584
2006-07-23 15:32:14 +00:00
Torbjörn Andersson
6050989bd8 Changed SAGA_ACTOR_H__ to SAGA_ACTOR_H etc for consistency.
svn-id: r23583
2006-07-23 15:16:50 +00:00
Max Horn
4fcdbb9349 String class usage cleanup
svn-id: r23582
2006-07-23 15:08:48 +00:00
Torbjörn Andersson
602548cea3 Removed GCC_PACK that must have been re-added by accident.
svn-id: r23581
2006-07-23 15:01:21 +00:00
Paul Gilbert
6585033705 Added extra hotspot flags bytes needed for asking Ratpouch for an object, and changed differing word read macros to use a single standard
svn-id: r23579
2006-07-23 13:19:33 +00:00
Paul Gilbert
9780117a77 Initial commit of tool to create lure.dat file
svn-id: r23578
2006-07-23 13:08:22 +00:00
Kostas Nakos
1ec5d56780 Add kyra skip intro key (backport).
svn-id: r23577
2006-07-23 09:36:34 +00:00
Torbjörn Andersson
5cb8802699 The GUI now uses the cursor palette for all themes. Therefore, it shouldn't be
necessary to set up a "dummy" palette for the cursor any more. If an engine
wants to display an error message without using the GUI, it can set up its own
palette.

With this change, ScummVM no longer sets a palette before _screen is created in
the SDL backend.

svn-id: r23575
2006-07-23 07:18:37 +00:00
Torbjörn Andersson
b845eb9b99 Initialise the screen before creating the music driver. The MT-32 driver wants
to draw to the screen.

svn-id: r23574
2006-07-23 07:06:26 +00:00
Torbjörn Andersson
15f08bf268 Warn if copyRectToScreen() is called before _screen is created, since it's
almost certainly a programming error. (Used to be silently ignored.)

Warn if setPalette() is called before _screen is created, but allow it (for
now) since we don't actually set the palette until later. It could still be a
programming error, though.

Don't crash if updateScreen() is called with a "dirty" palette before _screen
is created.

svn-id: r23573
2006-07-23 06:50:49 +00:00