Commit graph

94 commits

Author SHA1 Message Date
Martin Kiewitz
af5346e7ab SCI: calling wait() directly and removing it from SciGui
svn-id: r49853
2010-06-15 13:14:23 +00:00
Martin Kiewitz
891b568fde SCI: move textSize and textFonts and textColors inside gfxText16
svn-id: r49851
2010-06-15 13:01:07 +00:00
Martin Kiewitz
db4533533a SCI: fix changes from r49806
svn-id: r49839
2010-06-15 12:21:26 +00:00
Martin Kiewitz
59d0035b03 SCI: move portrait methods to gfxPaint16
svn-id: r49806
2010-06-15 12:01:49 +00:00
Filippos Karapetis
5d71ae952f The EngineState is no longer recreated when a game is restored, thus we don't need to refresh pointers to it
svn-id: r49549
2010-06-09 20:12:25 +00:00
Willem Jan Palenstijn
95b080f60b Fix compile errors
svn-id: r49535
2010-06-09 08:49:37 +00:00
Martin Kiewitz
3fa50583a0 SCI: leave console open for pic_visualize/undither commands - also don't use SciGui class for undither anymore
svn-id: r49198
2010-05-24 17:45:00 +00:00
Filippos Karapetis
c874ff15a8 Cleaned up the game ID code:
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
2010-05-23 10:28:03 +00:00
Martin Kiewitz
eb2b3f352e SCI: adding upscaled hires mode 640x480 for kq6 and gk1, fixing valgrind error in GfxPortrait class, not using priority anymore when drawing hires cels (shouldnt be needed for kq6)
svn-id: r49040
2010-05-15 14:17:50 +00:00
Martin Kiewitz
194bdd9b83 SCI: reverting r48787 port updates were actually introduced (heard that before) in SCI1. I used the outdated wiki before and that one lists qfg2 and xmas90ega being SCI01. They are actually SCI1
svn-id: r48789
2010-04-24 21:45:17 +00:00
Martin Kiewitz
cbd8faa82e SCI: r48786 port updates were actually introduced during SCI01, qfg2 and xmas90ega only. We enable port updates only for non-multilingual SCI01 games now - fixes percentage bar for qfg1 japanese as well
svn-id: r48787
2010-04-24 20:41:26 +00:00
Max Horn
02201e937a SCI: Move SciGui::wait to EngineState::wait
svn-id: r48118
2010-02-23 22:44:46 +00:00
Max Horn
e45f0f309a SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead
svn-id: r48050
2010-02-13 17:45:40 +00:00
Max Horn
a82939c9be SCI: Get rid of EngineState::resMan
svn-id: r48048
2010-02-13 17:44:19 +00:00
Max Horn
721a57a661 SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine
svn-id: r48047
2010-02-13 17:43:31 +00:00
Martin Kiewitz
454856b5fd SCI: put kShakeScreen into GfxPaint, called directly now
svn-id: r47936
2010-02-06 17:03:18 +00:00
Martin Kiewitz
25a9df8a81 SCI: moving kDisplay into GfxPaint16, now getting called directly as well
svn-id: r47917
2010-02-05 22:31:48 +00:00
Martin Kiewitz
71fb77a5aa SCI: priority band specific stuff now gets called directly w/o SciGui
svn-id: r47916
2010-02-05 22:20:46 +00:00
Martin Kiewitz
f967318225 SCI: remaining cursor functions now also directly called
svn-id: r47914
2010-02-05 21:09:36 +00:00
Martin Kiewitz
16efee3c0d SCI: drawMenuBar, drawStatus now called directly and w/o SciGui
svn-id: r47913
2010-02-05 20:48:06 +00:00
Martin Kiewitz
248bc560f3 SCI: moved onControl etc. into GfxCompare, now getting called directly. also fixed loading saved games due Gfx* changes
svn-id: r47912
2010-02-05 20:44:03 +00:00
Martin Kiewitz
f3ea96d168 SCI: GfxCoordAdjuster class added, local2Global and global2Local use that class directly, kGraph / RedrawBox is now using GfxPaint16 directly
svn-id: r47908
2010-02-05 18:56:13 +00:00
Martin Kiewitz
03dd0ac7bb SCI: screen specific debug functions are now called directly w/o SciGui/32
svn-id: r47905
2010-02-05 15:53:36 +00:00
Martin Kiewitz
f8f490c565 SCI: calling most of the cursor functions directly via _gfxCursor instead of SciGui/32
svn-id: r47903
2010-02-05 14:48:51 +00:00
Martin Kiewitz
6c204cc890 SCI: renamed class Cursor to GfxCursor
svn-id: r47902
2010-02-05 13:05:26 +00:00
Filippos Karapetis
0d85b39468 Moved the PalVary code inside the GfxPalette class
svn-id: r47893
2010-02-04 23:17:33 +00:00
Martin Kiewitz
cabd18da9e SCI: renaming class View to GfxView
svn-id: r47891
2010-02-04 22:17:58 +00:00
Martin Kiewitz
c336204a3f SCI: renaming Transitions to GfxTransitions
svn-id: r47890
2010-02-04 21:04:47 +00:00
Martin Kiewitz
5f39e3b7b5 SCI: kPicNotValid now uses GfxScreen directly and not SciGui/32
svn-id: r47889
2010-02-04 20:52:56 +00:00
Martin Kiewitz
e74bd30a2e SCI: putting most kGraph functions into GfxPaint16
svn-id: r47887
2010-02-04 20:18:01 +00:00
Martin Kiewitz
fb49449322 SCI: putting kDrawCel info GfxPaint class, debug is using GfxPaint class as well for drawing cels
svn-id: r47885
2010-02-04 20:02:48 +00:00
Martin Kiewitz
21cfb4c0c7 SCI: cleaning up deleting of graphic objects
svn-id: r47884
2010-02-04 19:33:36 +00:00
Martin Kiewitz
3ce2e22978 SCI: adding GfxPaint class, implementing kernelDrawPicture for GfxPaint16 and GfxPaint32, using those classes directly when drawing pictures instead of SciGui/32. Making draw_pic command work in sci32 that way, using _gfxPaint16 for kDrawPic because that command is sci16 exclusive
svn-id: r47883
2010-02-04 19:22:40 +00:00
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