Commit graph

249 commits

Author SHA1 Message Date
Filippos Karapetis
b400e142af SCI: Break the huge kernelFrameOut function into several smaller ones
Also, prefix more class variables with underscores
2011-11-17 22:09:17 +02:00
Filippos Karapetis
9c9ffc45d7 SCI: Do not add 1 pixel to rect dimensions in SCI32 2011-11-10 11:39:37 +02:00
Filippos Karapetis
ec7b5a79c2 SCI: Some fixes for text positioning in SCI32 games (still WIP)
Also, removed duplicate code
2011-10-29 01:39:37 +03:00
Filippos Karapetis
d8db7b11c1 SCI: Use the original text buffer width/height when drawing it
Fixes the display of overlay text
2011-10-28 22:20:33 +03:00
Filippos Karapetis
1ee923f8d2 SCI: Draw overlay text, if it exists (e.g. on buttons) 2011-10-28 22:20:32 +03:00
Filippos Karapetis
513d0be106 SCI: Merged all the code to get/set the NS rect 2011-10-19 20:29:05 +03:00
Filippos Karapetis
7708a4ddbb SCI: Added some hacks related to new functionality in Phantasmagoria 2
The game will now start (but won't do anything exciting - it'll display
its main menu, which doesn't work yet)
2011-10-18 03:10:19 +03:00
Filippos Karapetis
d39cdd8e1c SCI: More work on the vertical plane offset for SCI32. Still WIP.
Vertical clipping is still not finished. This fixes the display in the
Torin demo (which uses a scene with loads of items with a vertical
offset).
2011-10-14 14:07:00 +03:00
Filippos Karapetis
4af034a7a9 SCI: Added proper handling of duplicate items in kAddScreenItem
- Items that are being readded to the scene should be updated instead
- Added a findScreenItem() call to simplify the code slightly
2011-10-12 02:44:16 +03:00
Filippos Karapetis
96ce226967 SCI: Proper implementation of text drawing for SCI2+ 2011-10-11 01:25:08 +03:00
Filippos Karapetis
32b4ef8199 SCI: SCI32 kernel functions kRepaintPlane and kInputText are unused 2011-10-10 12:18:12 +03:00
Filippos Karapetis
4ad2ebd995 SCI2+: Some groundwork for kTextSize()
The old behavior is currently hacked in inside kernelTextSize(), as the
top of the subtitles frame is wrong if kTextWidth() is properly working...
2011-10-08 17:19:00 +03:00
Lars Skovlund
d88827b13f SCI: Fix black screen in LSL7 intro 2011-10-08 12:25:32 +02:00
Filippos Karapetis
75fb3b4ef8 SCI21: Added some skeleton code for offsetting pictures vertically (not working yet). Some cleanup 2011-09-23 18:55:30 +03:00
Filippos Karapetis
41cc1932d2 SCI32: Added an initial skeleton structure for the SCI2 text drawing code
This includes kCreateTextBitmap, and moves all of the text drawing code
into the new GfxText32 class
2011-09-03 14:51:51 +03:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Max Horn
a4eea36b84 SCI: Initialize newPlane fully before adding it to _planes 2011-04-04 09:53:26 +02:00
Lars Skovlund
40d922206b SCI32: Support for views with 640x400 native resolution
(fixes Wolfgang closeup, room 720)
2011-03-30 21:30:51 +02:00
md5
c2274e9065 SCI: Make sure that planeOffsetX is always correctly initialized
Fixes several issues with the menu in KQ7. Thanks to vakons for his patch.
Fixes bug #3231867 - "KQ7 scrolling bug"
2011-03-25 07:41:55 +02:00
md5
b1055a3c86 SCI: Fixed bug #3040161 - "LONGBOW: Textbox glitch"
GetLongest() could exceed the maximum width with the very last
character of a word. The same fix has been applied to the SCI32 code.
2011-03-02 20:38:21 +02:00
md5
8571083700 SCI2+: Mention that the actual problem with text wrapping happens because of the unimplemented kTextSize kernel call in SCI32 2011-02-26 06:13:08 +02:00
Matthew Hoops
ee09af6a12 SCI: Fix loading SCI32 games
The frames/items in GfxFrameout need to be cleared upon loading
2011-02-14 22:38:12 -05:00
md5
0da6b15539 SCI2+: Point out that there is a hack in the text splitting code
This particular hack causes issues in GK1, when talking with Grace, because the
width of the associated plane isn't set correctly.
2011-02-14 18:16:35 +02:00
Filippos Karapetis
6f9ac84f77 SCI: Converted the robot decoder into a regular video decoder, and decoupled it from the
SciEngine class

- Robot videos are now shown in frameOut(), like they should, and kRobot(sync) is only
used for syncing with the game scripts
- Hooked video playing into the "play_video" console command

svn-id: r55801
2011-02-07 12:24:09 +00:00
Matthew Hoops
4d088332a2 SCI: Add support for GK1 Mac high-res fonts
svn-id: r55754
2011-02-03 15:51:51 +00:00
Matthew Hoops
c62e507890 SCI: Fix GK1 Mac scaling
svn-id: r55744
2011-02-02 22:29:14 +00:00
Filippos Karapetis
89087b18c7 SCI21: Allow the game scripts to sync robot videos, like in SSCI. Also, references of the SciEngine class to itself via g_sci have been removed
svn-id: r55422
2011-01-22 13:01:10 +00:00
Filippos Karapetis
db11b626c7 SCI2: Implemented proper text splitting
svn-id: r55184
2011-01-09 13:28:34 +00:00
Filippos Karapetis
166f3f2dfd SCI2+: Set pictureCels to 0 after deleting them
svn-id: r55004
2010-12-22 13:52:25 +00:00
Matthew Hoops
c2ec6020e3 SCI: Fix uninitialized reads (and therefore, GK1)
svn-id: r54799
2010-12-06 19:37:19 +00:00
Filippos Karapetis
c8ef70ea1c SCI: Some minor fixes for Phantasmagoria 2 (which doesn't work at all, since it has some differences in its views)
svn-id: r54390
2010-11-20 00:20:05 +00:00
Filippos Karapetis
dca3c8d8bf SCI: Play time related changes
- Added support for savegame play time
- Removed obsolete variables for calculating the play time (EngineState::gameStartTime and Console::_enterTime)
- Renamed some variables to camelCase

svn-id: r53974
2010-10-31 01:45:24 +00:00
Filippos Karapetis
6c47ca8253 SCI2/SCI2.1: Some changes to the screen drawing code.
- Implemented kernelUpdateScreenITem
- Changed the list of screen items to be a list of FrameoutEntry entries,
so that it doesn't get recreated on every frame

svn-id: r53744
2010-10-23 19:23:07 +00:00
Filippos Karapetis
4edce6d860 SCI2/2.1: Changes to the plane code
Moved some plane related functions inside updatePlane() instead of frameOut(). Cleanup.

svn-id: r52804
2010-09-19 14:50:28 +00:00
Martin Kiewitz
975e3bf83e SCI: fixing a scrolling issue in sci32
svn-id: r51729
2010-08-04 10:11:06 +00:00
Matthew Hoops
cbe07a07b7 SCI: Fix SCI32 texts that are in Str objects
The text selector of the text bitmap object can contain either a Str object or a raw string. Handling the Str object case fixes the Torin demo. Oooh! Vertical scrolling!

svn-id: r51722
2010-08-04 05:06:41 +00:00
Martin Kiewitz
65e215628d SCI: dont clip plane during frameout.cpp
disables scrolling capability
(regression of r51615)

svn-id: r51697
2010-08-03 15:04:56 +00:00
Martin Kiewitz
50b8073bab SCI: clipping plane rects for sci32
fixes crash in hires gk1 on cemetary

svn-id: r51615
2010-08-02 13:41:58 +00:00
Martin Kiewitz
68f7b9be4c SCI: reading the actual priority instead of guessing
svn-id: r51569
2010-08-01 09:20:21 +00:00
Johannes Schickel
8851c2016f SCI: Fix uninitialized variable warning in g++.
Thanks to clone2727 for suggestion to initialize the default new plane
priority to 0xFFFF, which means that the plane should be invisible. I added a
FIXME there though. So please re check this change. In case that is fine just
remove the FIXME, in case some other default value should be chosen, please
change the value and also remove the FIXME.

svn-id: r51561
2010-08-01 01:00:30 +00:00
Matthew Hoops
b19433e6d3 SCI: Re-enable the throttle for kFrameout, I must have been asleep that day
svn-id: r51451
2010-07-29 01:05:11 +00:00
Martin Kiewitz
4fb7b06570 SCI: translating nsRect back to actual plane coordinate
on scrollable planes

svn-id: r51350
2010-07-27 09:17:57 +00:00
Martin Kiewitz
31828d093c SCI: commenting out picture cel debug msg
svn-id: r51315
2010-07-26 14:44:28 +00:00
Martin Kiewitz
e3e2ae799e SCI: adding scrollcapability to sci32
svn-id: r51313
2010-07-26 14:41:19 +00:00
Martin Kiewitz
c0d915b616 SCI: some scrolling support for sci32
not fully done yet

svn-id: r51308
2010-07-26 12:20:07 +00:00
Martin Kiewitz
e3866046af SCI: adding kAddPicAt dummy
svn-id: r51283
2010-07-25 20:41:23 +00:00
Martin Kiewitz
9b1d691594 SCI: blacking out planes that got deleted
svn-id: r51282
2010-07-25 19:56:44 +00:00
Martin Kiewitz
c721b4d612 SCI: some changes for kq7
- resetting negative plane left/top
- kSave(0) returns SIGNAL

svn-id: r51281
2010-07-25 19:47:12 +00:00
Martin Kiewitz
da5f1506e3 SCI: adjust z coordinate for views (sci32)
fixes gk1 newspaper

svn-id: r51272
2010-07-25 12:48:48 +00:00