Commit Graph
86814 Commits
Author SHA1 Message Date
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 7d15c60ab9 Don't crash if drawMouse() is called before _mouseSurface is created.
svn-id: r22562
2006-05-21 18:49:26 +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
Torbjörn Andersson d7296ae666 Make it so that if the new cursor palette to be set has zero colours, the
cursor palette is disabled.

Also, when replacing a cursor palette, try to re-use the old palette buffer, as
a minor optimization. (Not that these functions should need any optimization,
but it's simple and shouldn't hurt.)

svn-id: r22554
2006-05-21 13:27:18 +00:00
Paul Gilbert 1920cc0fa8 Added two lines for the Lure engine progress
svn-id: r22553
2006-05-21 13:04:49 +00:00
Torbjörn Andersson 75f226953a Oops, I guess I never got around to fully implement replaceCursorPalette().
svn-id: r22552
2006-05-21 12:32:39 +00:00
Paweł Kołodziejski e7a4b46479 fixed compilation when DISABLE_SCALERS
svn-id: r22551
2006-05-20 15:43:27 +00:00
Paweł Kołodziejski da9bf4dd71 fix compilation, that variable no longer exists
svn-id: r22550
2006-05-20 15:22:17 +00:00
Max Horn 4d1f4ffb50 Make the copy constructor / assignment operator of class File private to prevent accidental copying of File objects
svn-id: r22549
2006-05-20 15:10:04 +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 3e973d2a91 Forgot to set g_initialized to true.
svn-id: r22544
2006-05-20 11:24:45 +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 1c7c0039b5 Removed stray printf() from earlier commit.
svn-id: r22542
2006-05-20 10:57:15 +00:00
Torbjörn Andersson 407cb66502 Re-render the cursor when enabling/disabling cursor palette. Also, I don't
think _cursorHasOwnPalette is needed any more, so I've removed it.

svn-id: r22541
2006-05-20 09:27:56 +00:00
Torbjörn Andersson 22fb1e48ef Set a cursor palette for the classic theme, as well. Otherwise we'll get the
wrong colours in many games.

svn-id: r22540
2006-05-20 08:29:50 +00:00
Torbjörn Andersson 87ee8db10d Our GUI uses the "cursor palette" feature, but the SDL backend did not use the
cursor palette in overlay mode. Now it does, which fixes bug #1476666. The
reason it worked at all before was that blitCursor() was called while still not
in overlay mode.

This, of course, means that the GUI can corrupt the in-game cursor palette. I
don't have any game that uses this feature, so I don't know if it's properly
restored again afterwards. But if it isn't, that should be fairly easy to fix.

svn-id: r22539
2006-05-20 08:06:21 +00:00
Torbjörn Andersson 80eb6e4f5e Fixed cursor drawing in the classic theme.
svn-id: r22538
2006-05-20 07:31:03 +00:00
Torbjörn Andersson 71d07416cd Call the inherited handleScreenChanged() method, so that the widget can resize
itself on scaler changes.

svn-id: r22537
2006-05-19 22:49:23 +00:00
Torbjörn Andersson ce749cd44c Call handleScreenChanged() *before* calling setEditString(). Otherwise
_leftPadding may be wrong, or even undefined, when getEditRect() is called,
which may cause ScummVM to trigger an "invalid rect" assertion.

svn-id: r22536
2006-05-19 22:41:51 +00:00
Eugene Sandulenko 84c649c4a9 Slighty modified patch #1491859: "Possible fix for recent cursor regressions"
svn-id: r22535
2006-05-19 22:26:07 +00:00
Eugene Sandulenko 23498c5974 Minor GUI tweaks
svn-id: r22534
2006-05-19 22:25:14 +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
Torbjörn Andersson bafa215e5f Added some BS2 and Simon notes.
svn-id: r22532
2006-05-19 07:32:00 +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
Eugene Sandulenko fac7a13cf5 Proper rendering of slider widget.
svn-id: r22527
2006-05-18 21:48:47 +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 4ead8dff26 - Fix spelling in theme config
- Introduce embossing shadow
- Less round corners in popup widget
- Custom border in editable text widget
- Matched color in popup widget and editable text widget with mock-ups
- Less round corners in editable text widget
- Text padding in editable text widget

svn-id: r22525
2006-05-18 20:53:28 +00:00
Eugene Sandulenko 63d7895500 Oops. Break indefinite loop.
svn-id: r22524
2006-05-18 19:38:54 +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
Eugene Sandulenko e950d171f5 Properly set GFX mode selected in GUI. Fixes selection of 1x scaler.
svn-id: r22521
2006-05-18 15:40: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