Commit graph

61 commits

Author SHA1 Message Date
Martin Kiewitz
a20f4ef1fc SCI: implemented reset for GfxMenu, not recreating object anymore
svn-id: r47793
2010-02-01 10:16:45 +00:00
Martin Kiewitz
845c245ff3 SCI: class menu renamed to GfxMenu - now getting called directly, also fix for loading savedgames
svn-id: r47792
2010-02-01 09:53:42 +00:00
Martin Kiewitz
d31f696d1f SCI: rename Controls to GfxControls, gets directly called now
svn-id: r47783
2010-01-31 22:20:55 +00:00
Martin Kiewitz
5cf510648a SCI: syncWithFramebuffer() is now called directly w/o SciGui/SciGui32
svn-id: r47781
2010-01-31 21:59:37 +00:00
Martin Kiewitz
19bca95905 SCI: renamed Text class to GfxText16
svn-id: r47780
2010-01-31 21:54:43 +00:00
Martin Kiewitz
aaf756e736 SCI: implemented font caching
svn-id: r47762
2010-01-31 17:45:22 +00:00
Martin Kiewitz
66c88b98f5 SCI: GfxCache is now also called directly w/o SciGui nor SciGui32
svn-id: r47759
2010-01-31 17:14:58 +00:00
Martin Kiewitz
72c2d360f7 SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui
svn-id: r47752
2010-01-31 16:21:11 +00:00
Martin Kiewitz
c991a5bceb SCI: renamed SciGuiAnimate to GfxAnimate, moved code from SciGui into this class, now getting called directly
svn-id: r47751
2010-01-31 15:07:36 +00:00
Martin Kiewitz
7929255cd9 SCI: cleaned up graphics classes, removed gfx&windowmgr, added gfxports, gfxcompare, gfxpaint16, gfxcache. kernel uses gfxports directly w/o going through SciGui
svn-id: r47745
2010-01-31 12:35:15 +00:00
Martin Kiewitz
a800855bf4 SCI: added new SciGui32 class, Gfx class needs some work though and hopefully i didnt overlook some kernel function that is also used by sci32. now using plane left/top
svn-id: r47679
2010-01-29 21:30:46 +00:00
Martin Kiewitz
69b7497cf7 SCI: calculating celRect the right way for sci32
svn-id: r47672
2010-01-29 16:20:22 +00:00
Martin Kiewitz
01fd01122a SCI: fixing cursor in sci32 for clone ;)
svn-id: r47671
2010-01-29 15:46:22 +00:00
Martin Kiewitz
1bcbd71c97 SCI: hacked up a bit sci32 graphics to support (theoretically) scaling
svn-id: r47668
2010-01-29 14:05:21 +00:00
Martin Kiewitz
caeafb29ff SCI: little hack so that old views are erased in sci32
svn-id: r47667
2010-01-29 13:48:02 +00:00
Max Horn
4ffec28103 SCI: Move selector stuff to new header; reorder k_argc & k_argp param of invoke_selector
svn-id: r47665
2010-01-29 11:03:54 +00:00
Martin Kiewitz
f7692e724f SCI: some progress on REing robot files (99% comments only)
svn-id: r47647
2010-01-28 19:28:56 +00:00
Filippos Karapetis
08006eef1e Made the code inside SciGui::display() a bit more readable
svn-id: r47615
2010-01-27 22:56:00 +00:00
Martin Kiewitz
dfae4f7e99 SCI: fix for clipping code inside kGraph
svn-id: r47613
2010-01-27 22:53:09 +00:00
Matthew Hoops
12569a5f32 Only reshow the cursor after playing a video if it was originally showing beforehand. This fixes the GK1 demo menu.
svn-id: r47602
2010-01-27 16:54:58 +00:00
Martin Kiewitz
e0d05a482c SCI: changed flags (uint16) to force (bool) for set/merge palette methods
svn-id: r47578
2010-01-26 22:45:52 +00:00
Martin Kiewitz
ba7eb79074 SCI: removed EGA mapping for amiga games, cause changing K_GRAPH_GET_COLORS_NR to support amiga also fixes it - also fixes other odd issues like the ones in kq5 and castle of dr. brain/sq1 (thx. to waltervn for finding this out)
svn-id: r47560
2010-01-25 20:44:13 +00:00
Martin Kiewitz
5fa0718356 SCI: created isAmiga32color(), using this method instead of comparing against viewType
svn-id: r47554
2010-01-25 12:34:40 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Martin Kiewitz
b4ecf7f0e1 SCI: self drawn stuff on amiga uses ega palette, we need to match it onto currently used amiga palette (fixes user interface colors for amiga sci1 games)
svn-id: r47520
2010-01-24 20:31:01 +00:00
Martin Kiewitz
e51721f7b1 SCI: handle intensity calls for amiga the same way as we handle palette animation (abort instead of process)
svn-id: r47514
2010-01-24 19:42:12 +00:00
Filippos Karapetis
5b4fcfdbcb Added some skeleton code for kPalVary()
svn-id: r47485
2010-01-23 21:33:24 +00:00
Martin Kiewitz
fa80444a12 SCI: restoring r47412, we were right all along but this "hack" was done on the sierra sci interpreter for jones ega/vga only (talkie NOT included). So this restore does it game specific now, causing no regressions anywhere else. We detect jones/talkie as "jones" as well, may cause regressions for talkie
svn-id: r47445
2010-01-22 22:34:14 +00:00
Martin Kiewitz
4500910b49 SCI: reverting r47412, change was incorrect and also resulted in broken animations inside text boxes in kq5. jones also uses hardcoded -1 priority for control icons.
svn-id: r47444
2010-01-22 19:25:48 +00:00
Martin Kiewitz
e85d2a023d SCI: control icons now use objects priority selector instead of hardcoded priority 255. fixes jones speech bubbles
svn-id: r47412
2010-01-20 21:59:12 +00:00
Martin Kiewitz
adc6e33f5b SCI: also fix statusbar
svn-id: r47389
2010-01-19 19:28:54 +00:00
Martin Kiewitz
425d0f7da3 SCI: fixed displaying of menubar (fixes all sorts of ega games)
svn-id: r47387
2010-01-19 19:20:33 +00:00
Martin Kiewitz
7b5a55a6a2 SCI: use reanimate instead of BitsShow() when removing menus
svn-id: r47386
2010-01-19 18:11:09 +00:00
Martin Kiewitz
d17e80f214 SCI: Still limit lower boundary in SCI1.1, moved upper priority boundary limit removal for SCI1.1 into init
svn-id: r47382
2010-01-19 15:20:29 +00:00
Martin Kiewitz
cf57f817b2 SCI: implemented priority bands support for sci1.1 picture resources, fixed lb2, kq6
svn-id: r47380
2010-01-19 14:26:21 +00:00
Martin Kiewitz
3e44180e47 SCI: speed throttler changed, now gets triggered by kAnimate, removed initial no-delay, i'm still getting animation now in iceman and sq3, slow palette animation in longbow fixed
svn-id: r47343
2010-01-17 18:41:28 +00:00
Martin Kiewitz
4122e411d0 SCI: kPortrait - mouse click now aborts portrait
svn-id: r47224
2010-01-10 13:11:53 +00:00
Martin Kiewitz
7a5c119930 SCI: ignore hiresMode when not being upscaledHires for kDrawCel and updateBox on kGraph - fixes kq6 dos
svn-id: r47221
2010-01-10 11:21:55 +00:00
Martin Kiewitz
231e122c63 SCI: updateBox now also supports hires mode
svn-id: r47219
2010-01-10 09:42:55 +00:00
Martin Kiewitz
7d16dbeb35 SCI: changed location of hack inside kDrawCel, coordinates of savedhiresbox may not get port adjusted
svn-id: r47218
2010-01-10 09:07:09 +00:00
Martin Kiewitz
da09ee6732 SCI: switching to hires kDrawCel when 8th parameter is passed, fixed kDrawCel port adjust - fixes kq6 hires inventory
svn-id: r47217
2010-01-10 08:55:19 +00:00
Martin Kiewitz
2c1ef90b87 SCI: kPortrait - now drawing after wait, also using gui wait so mouse cursor still works during execution, makes lip sync perfect (thx to the other fix by fingolfin)
svn-id: r47214
2010-01-09 23:01:38 +00:00
Martin Kiewitz
7f78815e0e SCI: kPortrait almost fully implemented (animation bitmaps still missing)
svn-id: r47204
2010-01-09 19:12:53 +00:00
Martin Kiewitz
30d787a829 SCI: adding audio support to kPortrait, audio is now playing when portraits are shown
svn-id: r47202
2010-01-09 18:18:52 +00:00
Martin Kiewitz
a815d0e12a SCI: added new debug command "picture_visualize", which enables visualization of the drawing process of EGA pictures
svn-id: r47201
2010-01-09 14:09:45 +00:00
Martin Kiewitz
8a1583da9b SCI: kPortrait actually gets lowres coordinates that need to get adjusted according to curPort (does this make sense? noooo), fixes portrait coordinates in kq6
svn-id: r47142
2010-01-07 20:41:52 +00:00
Martin Kiewitz
140b22a374 SCI: implement crazy hack that fixes coordinates of some cel placements. I'm not sure if thats what sierra sci actually does or if we get coordinates 0,0 due some error somewhere. Fixes portrait window placement in kq6 - strangely they are still not at the correct height perhaps related to not adjusting "correctly" (whatever this means in this ugly mess that hires was implemented) inside BitsSave()
svn-id: r47140
2010-01-07 20:29:48 +00:00
Martin Kiewitz
7f358e3bbd SCI: changed kernel signature for kDrawCel, enabled upscaled hires savebox code ("crashed" before because afterwards kDrawCel will get the handle from the savebox call)
svn-id: r47121
2010-01-07 15:25:03 +00:00
Martin Kiewitz
519e80ca8b SCI: implemented additional drawCel for hires views, fixes menu bar of kq6 - still need to fix coordinates and implement save/restoreBits for hires
svn-id: r47116
2010-01-07 14:46:29 +00:00
Martin Kiewitz
58aab46f06 SCI: some portrait work (kq6 now shows the main bitmap as portrait, coordinates still messed up)
svn-id: r47105
2010-01-07 10:31:29 +00:00