ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,578 Commits 45 Branches 139 Tags
da2027da361109b953c0105ab9700aad3bb5e60e
Commit Graph
402 Commits
Author SHA1 Message Date
Torbjörn Andersson 65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return. 
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
 2010-03-10 06:39:23 +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 b9a11ddb0b SCI: Move language related code from EngineState to SciEngine 
svn-id: r48052
 2010-02-13 17:46:44 +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 9575cc08a2 SCI: Move GameFeatures from EngineState to SciEngine 
svn-id: r48049
 2010-02-13 17:44:58 +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 749b0ea237 SCI: added dummy assertpalette to GfxPalette, setting destination palette immediately on kPalVary(start) call 
svn-id: r47953
 2010-02-07 12:00:06 +00:00
Martin Kiewitz 67870c7dc8 SCI: adding more debug output to kPalVary, fixing loading savedgames (_gfxPaint wasnt copied over) 
svn-id: r47943
 2010-02-06 21:38:58 +00:00
Martin Kiewitz 3255b572ad SCI: added debug code to kPalVary, added warning when calling kPalette(setFromResource) with unsupported parameters 
svn-id: r47941
 2010-02-06 21:22:05 +00:00
Martin Kiewitz 454856b5fd SCI: put kShakeScreen into GfxPaint, called directly now 
svn-id: r47936
 2010-02-06 17:03:18 +00:00
Matthew Hoops dc12437390 Add a missing break. 
svn-id: r47926
 2010-02-06 05:29:08 +00:00
Max Horn f86618f92b SCI: Add a 'SELECTOR' macro 
svn-id: r47918
 2010-02-05 22:55: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 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
Matthew Hoops 779fc7dc19 Cleanup kShowMovie; merge the SCI1.1/SCI2 and SCI2.1 AVI code. 
svn-id: r47911
 2010-02-05 19:41:06 +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 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
Filippos Karapetis 0d85b39468 Moved the PalVary code inside the GfxPalette class 
svn-id: r47893
 2010-02-04 23:17:33 +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 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
Filippos Karapetis 2fb37063a4 Placed all the game feature detection code in a separate class 
svn-id: r47850
 2010-02-03 11:02:43 +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 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 7184fa3bad SCI: renamed kernelFind() to kernelFindColor, so that it isnt that confusing :P 
svn-id: r47753
 2010-01-31 16:26:15 +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
Willem Jan Palenstijn 06bd17ee71 SCI: Remove extra '\n's in debugC messages 
svn-id: r47707
 2010-01-30 11:59:05 +00:00
Matthew Hoops 2f68af90d5 Add the SCI2.1 variant of kShowMovie; KQ7 now shows the opening video. 
svn-id: r47699
 2010-01-30 03:57:58 +00:00
Matthew Hoops 5b9b6b6b70 Fix compile when ENABLE_SCI32 is not set. 
svn-id: r47682
 2010-01-29 22:02:28 +00:00
Martin Kiewitz c6e095715c SCI: adding shakeScreen() for gui32 for lsl6 
svn-id: r47681
 2010-01-29 21:51:21 +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
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
Filippos Karapetis 493350e905 SCI2.1: Added a dummy function for kRobot (with some info on its parameters), assigned IsOnMe to OnMe (needs verification, but seems to be correct) and changed kSave(8) to return nonzero. The menu of the Phantasmagoria demo is now shown, together with its creepy music :) 
svn-id: r47648
 2010-01-28 19:57:14 +00:00
Martin Kiewitz 90712388f8 SCI: added workaround for laura bow 2 game menu (same issue as in pharkas)...sigh 
svn-id: r47611
 2010-01-27 21:33:51 +00:00
Martin Kiewitz 155660c443 SCI: changed the pharkas workaround to also cover pharkas-floppy demo 
svn-id: r47606
 2010-01-27 19:28:13 +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
Walter van Niftrik 473d8b7c2f SCI: Add string support for odd-offset pointers into reg_t-based segments. 
svn-id: r47572
 2010-01-26 19:51:08 +00:00
Martin Kiewitz fd5e26806e SCI: dont fix line color for amiga 32 color 
svn-id: r47561
 2010-01-25 20:46:09 +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
Walter van Niftrik e7e9006122 SCI: Fix list control scrolling in Jones EGA and VGA. 
svn-id: r47511
 2010-01-24 18:57:23 +00:00
Filippos Karapetis 5b4fcfdbcb Added some skeleton code for kPalVary() 
svn-id: r47485
 2010-01-23 21:33:24 +00:00
Martin Kiewitz e99adedac2 SCI: separate fix function for kDrawControl rects 
svn-id: r47462
 2010-01-23 11:00:24 +00:00