1137 Commits

Author SHA1 Message Date
Torbjörn Andersson
7090f051a0 Fix debug messages.
svn-id: r22570
2006-05-22 07:52:10 +00:00
Torbjörn Andersson
c40a8b48a1 Cleanup.
svn-id: r22569
2006-05-22 07:27:20 +00:00
Willem Jan Palenstijn
35d242b74b make printExpr, skipExpr accept both gob1 and gob2 expressions
svn-id: r22568
2006-05-21 21:18:23 +00:00
Torbjörn Andersson
57efbacb9a Palette handling simplification, suggested by LordHoto.
svn-id: r22567
2006-05-21 20:41:53 +00:00
Torbjörn Andersson
a1f5bddaa8 If possible, sync the frame to getSoundElapsedTime().
svn-id: r22566
2006-05-21 20:25:22 +00:00
Torbjörn Andersson
71ba5c0f58 Grotesque hack to support the jung2.vqa movie. Either the VQA is less well
understood than I hoped, or the offset to the first frame of the movie is
completely out to lunch. Scan the file for the first VQFR chunk and use that
offset instead.

svn-id: r22565
2006-05-21 20:08:14 +00:00
Torbjörn Andersson
bda33949e4 The unsupported cutscene is called "jung", not "junk". (It just happens to look
like junk at the moment.)

svn-id: r22564
2006-05-21 19:08:10 +00:00
Torbjörn Andersson
b98a67d1eb More VQA fixes:
* Use setScreenPalette() rather than calling the backend directly. (As an extra
  bonus, the VQA player now only needs to store 3 bytes per colour.)

* Hide the mouse cursor while the movie is playing.

svn-id: r22563
2006-05-21 19:03:27 +00:00
Torbjörn Andersson
9fad465cf6 At LordHoto's request...
* The VQA move player isn't as similar to the WSA movie player as we first
  envisioned, so the VQA player no longer inherits from Movie. It does retain
  a fairly similar calling interface, though.

* Use the Kyra engine's idea of screen dimensions, rather than the backend's.

svn-id: r22561
2006-05-21 18:16:34 +00:00
Torbjörn Andersson
b2d8f804cd Some minor VQA player fixes:
* The playVQA() function now takes the name of the cutscene, rather than the
  filename. This is so that playVQA("FOO") will be able to play FOO0.VQA,
  FOO1.VQA or FOO2.VQA, depending on which movie size is selected.

* The VQA player centers movies by default, so don't set the position to 0,0.

* Ask the backend for screen dimensions (for centering the movie) rather than
  hard-coding them.

svn-id: r22560
2006-05-21 17:28:03 +00:00
Johannes Schickel
344cc2f475 - allows kyra3 to exit again
- implements language selection for kyra3

svn-id: r22559
2006-05-21 16:06:29 +00:00
Johannes Schickel
ef6645c5ba - reworks quit handling (no _system->quit() anymore)
- fixes some deinitalization problems

svn-id: r22558
2006-05-21 15:41:32 +00:00
Johannes Schickel
c47dadeb1f - adds debugC calls to KyraEngine_v3 functions
- finishes KyraEngine_v3::gui_printString

svn-id: r22557
2006-05-21 15:20:12 +00:00
Johannes Schickel
3af8e4ea4a Implements kyra3 main menu drawing.
svn-id: r22556
2006-05-21 15:02:12 +00:00
Max Horn
e4ab8000f0 Pass values by-reference, using C++ references, and not by using pointers
svn-id: r22548
2006-05-20 15:09:15 +00:00
Johannes Schickel
dce7af1f5c makes destructor of KyraEngine virtual
svn-id: r22547
2006-05-20 15:02:39 +00:00
Torbjörn Andersson
05814a1458 Apparently, passing a file handle directly to a function causes that file
handle (a copy of the original?) to be destroyed at the end of the function,
and that closes the internal file handle, even though we want it to stay open.

Who am I to argue with how C++ handles its parameters? I've simply changed the
functions to take pointers to file handles instead. Seems to fix crashes in the
Macintosh resource extractor for me.

svn-id: r22546
2006-05-20 13:59:31 +00:00
Torbjörn Andersson
6cdd98b617 After the GUI has finished, restore the old cursor palette (if any). For this
to work, cursor palette now has to be set using the new "palette manager". See
graphics/paletteman.cpp

svn-id: r22543
2006-05-20 10:59:25 +00:00
Torbjörn Andersson
3a028875a1 Using assert(_something->init()) is a bad idea. Assertions can be disabled.
svn-id: r22533
2006-05-19 07:34:24 +00:00
Max Horn
909cd8c93a Added some FIXMEs to the kyra engine
svn-id: r22531
2006-05-19 07:20:27 +00:00
Max Horn
d113bf3a08 Fix warning
svn-id: r22530
2006-05-19 07:12:38 +00:00
Travis Howell
9bc90636f2 Update HE version for another English version of socks
svn-id: r22529
2006-05-19 00:35:13 +00:00
Johannes Schickel
570b9e2c9d - load fonts for kyra3
- adds screen dim tables for kyra3
- adds palette / screen backup for the vqa player
- small changes in the vqa player to use the Kyra::Screen functions
- adds (partially implemented/unimplemented) main menu drawing/handling functions (nothing to see yet)

svn-id: r22528
2006-05-18 22:46:34 +00:00
Torbjörn Andersson
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
2006-05-18 21:46:07 +00:00
Eugene Sandulenko
8e9db03379 Plug memory leak
svn-id: r22523
2006-05-18 19:37:38 +00:00
Eugene Sandulenko
e982782281 Fix bug #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch". Also
fix same problem in scumm help dialog.

svn-id: r22522
2006-05-18 16:44:44 +00:00
Torbjörn Andersson
6b90c405e8 Initialise _resList to avoid crash (from freeing an invalid pointer) if the
data files are missing.

svn-id: r22520
2006-05-18 14:28:19 +00:00
Eugene Sandulenko
9e3b78e1e9 --force-1x-overlay is no more. Remove leftovers.
svn-id: r22519
2006-05-18 13:59:20 +00:00
Torbjörn Andersson
e563d0c182 Renamed screenChanged() to handleScreenChanged().
svn-id: r22518
2006-05-18 13:58:33 +00:00
Torbjörn Andersson
5c1f91eed4 Allow changing scaler while playing MPEG cutscenes.
svn-id: r22515
2006-05-18 13:18:02 +00:00
Johannes Schickel
c65d45146c fixes kyra2 gameflag init
svn-id: r22514
2006-05-18 11:36:29 +00:00
Torbjörn Andersson
b9206a3e98 Removed leftover printf()
svn-id: r22513
2006-05-18 11:35:08 +00:00
Torbjörn Andersson
a3fc0682f4 Cleanup.
svn-id: r22512
2006-05-18 11:32:59 +00:00
Travis Howell
4d69cfeaa4 Update HE version for another English version of socks
svn-id: r22510
2006-05-18 02:34:55 +00:00
Eugene Sandulenko
9103ddda4e Give more feedback to users who misused our SAN compression tool and ignored
FLU index for cideos which are used by INSANE.

svn-id: r22506
2006-05-18 00:20:53 +00:00
Eugene Sandulenko
14ec3f45fa - Heavily modified patch #1214784: "Disable overlay scaling"
- Eriktorbjorn's patch from same tracker item for scaling sword1/2 cutscenes
  is applied as is. It lacks resolution switch on-the-fly.
- GUI widgets are repositioned on the fly and use most space, even aspect
  ratio corrected screen is used without scaling
- Heavy tesing is required, but works for me in all cases except for bug
  #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch" which needs more
  work.
- I probavly broke some backend or two

svn-id: r22505
2006-05-17 23:52:45 +00:00
Torbjörn Andersson
65091f7370 Added (optional) looping to the digital sound class.
svn-id: r22504
2006-05-17 21:14:19 +00:00
Torbjörn Andersson
6bf1e10768 Fixed two off-by-one errors. One would cause the same frame of the Kyra 3 to be
displayed twice in a row. The other, more serious one, would cause ScummVM to
crash when reaching the end of the music. Now the music loops properly. (It
does fade down before looping, but that's how it is in the original as well.
It's just the way the music is recorded.)

svn-id: r22503
2006-05-17 20:54:51 +00:00
Torbjörn Andersson
0099932d0d Loop the Kyra 3 animation indefinitely.
svn-id: r22502
2006-05-17 20:35:25 +00:00
Torbjörn Andersson
4da20ba369 Maybe the svn:keywords were already set? Maybe this will fix the file headers instead.
svn-id: r22501
2006-05-17 20:25:08 +00:00
Torbjörn Andersson
c27b1201d4 Fixed crackling in Kyra 3 sound. (At least what little of it ScummVM currently
plays before finishing.)

svn-id: r22499
2006-05-17 19:42:55 +00:00
Johannes Schickel
f7c29ccc8b - adds AUD file player (has still some problems with playing)
- adds a new sound class SoundDigital (only used for Kyra3) (needs more work though)

svn-id: r22497
2006-05-17 18:07:02 +00:00
Max Horn
b6b53afe26 Tell people to only report the MD5 if it's a regular version of the game (and not e.g. a fan translation)
svn-id: r22495
2006-05-16 20:00:48 +00:00
Eugene Sandulenko
ba2a6152c7 Set gameflags for kyra3 properly.
svn-id: r22493
2006-05-16 17:38:04 +00:00
Johannes Schickel
3d10ecf1ae Removes ENABLE_KYRA2 and ENABLE_KYRA3.
svn-id: r22492
2006-05-16 16:31:23 +00:00
Johannes Schickel
47a39a8401 Oops forgot some define checks
svn-id: r22491
2006-05-16 16:15:33 +00:00
Johannes Schickel
c8aa32d095 - implements kyrandia 3 wsa loader
- fixes initalisation problems
- adds setX, setY, setDrawPage to Kyra::Movie instead of directly accessing _x, _y and _drawPage

svn-id: r22490
2006-05-16 16:04:24 +00:00
Torbjörn Andersson
076f489107 If the options dialog calls it "Subtitle speed", then so should the indicator
displayed when pressing the + or - keys.

svn-id: r22485
2006-05-16 07:41:48 +00:00
Torbjörn Andersson
e723f7d1eb Ignore unknown SysEx manufacturer IDs, rather than erroring on them. This does
NOT fix bug #1481383, even if that's where I heard about this problem.

svn-id: r22479
2006-05-15 13:19:30 +00:00
Torbjörn Andersson
0191738cce When receiving a "Reset All Controllers" message, the neutral position of the
volume controller should probably be 127, not 100. Actually, there's some
confusion as to whether this message should touch the volume controller at all.
Added some comments to hopefully clarify that a bit.

svn-id: r22478
2006-05-15 12:39:53 +00:00