thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45684 commits 35 branches 0 tags 1.4 GiB
Commit graph

48 commits

Author SHA1 Message Date
Walter van Niftrik
952d1a084c SCI: Implement Mac iconbar event handling. 2011-03-09 21:05:19 +01:00
Matthew Hoops
e815102659 Merge branch 'pe_exe' of https://github.com/clone2727/scummvm into clone2727-pe_exe 2011-03-07 17:07:59 -05:00
Matthew Hoops
6582b77f1c SCUMM: Use the new WinCursor code in SCUMM HE 
Also, updated the MacResManager cursor code to reflect the SCUMM resource extractor code changes
 2011-03-06 19:57:18 -05:00
Matthew Hoops
df1a800d01 SCI: Fix KQ6 Mac inventory cursors 2011-03-06 18:36:45 -05:00
Johannes Schickel
bba430eebc SCI: Adapt to setPalette/grabPalette RGBA->RGB change. 2011-02-14 17:08:33 +01:00
Matthew Hoops
80347e9630 SCI: Don't fallback to views in SCI1.1+ Mac games 
svn-id: r55871
 2011-02-10 15:56:35 +00:00
Matthew Hoops
85f8dc5dee SCI: Add detection for Freddy Pharkas Mac 
svn-id: r55828
 2011-02-08 15:03:23 +00:00
Matthew Hoops
46404940b5 SCI: Improve Mac SCI1.1+ cursor support 
The scripts can pass a list of view id's from the DOS version that get remapped to CURS/crsr id's. GK1 cursors now work and Phantasmagoria uses the correct ones.

svn-id: r55791
 2011-02-06 00:05:27 +00:00
Filippos Karapetis
d3b14e1445 SCI: Implemented FR #3101338: "King's Quest 6 Windows Mouse Icons" 
Added an option to use the original Windows cursors in the Windows version of KQ6
Also, added an update on how the Mac cursors are handled (perhaps the handling is
the same)

svn-id: r54495
 2010-11-26 12:37:24 +00:00
Max Horn
3534cff8ef ALL: Fix indention (whitespaces -> tabs) 
svn-id: r53738
 2010-10-23 15:46:50 +00:00
Filippos Karapetis
744a1829ac SCI: Added a check for magnifier cursor multipliers 
Sierra SCI only allowed multipliers 1, 2 and 4, and errored out on unexpected
values, thus we do the same

svn-id: r53072
 2010-10-08 13:33:54 +00:00
Martin Kiewitz
6dcf366b7d SCI: fixing mag cursor as far as possible 
added TODO for real proper implementation
at least the alignment and content shown is now correct

svn-id: r53071
 2010-10-08 12:41:03 +00:00
Filippos Karapetis
cacfefa699 SCI: bugfix for magnifier cursors 
When deleting the resources related to magnifier cursors, zero them out
as well. Fixes crash when exiting a game after using a magnifier cursor

svn-id: r53054
 2010-10-07 20:00:32 +00:00
Filippos Karapetis
c8fd37c9f0 SCI: Some fixes for zoom cursors 
- Now the cursor buffer is initialized outside the mouse movement code, thus saving
a memcpy there
- Plugged some memory leaks
- Removed an obsolete check

svn-id: r53028
 2010-10-05 10:30:26 +00:00
Martin Kiewitz
04a8ff06a2 SCI: fixing crash in mag cursor code for pharkas 
svn-id: r53014
 2010-10-04 09:23:06 +00:00
Filippos Karapetis
165432ad19 SCI: Several corrections for magnifier cursors 
svn-id: r53010
 2010-10-04 06:05:34 +00:00
Filippos Karapetis
27745c2143 SCI: Added missing initialization of _zoomBitmap 
svn-id: r53007
 2010-10-03 23:55:28 +00:00
Filippos Karapetis
ce8a2fbbbc SCI: Added support for SCI1.1+ magnifier cursors (bug #3034973). 
These are special cursors which zoom parts of a view dynamically. Examples
are Freddy Pharkas, when reading the prescription with the whiskey and LB2,
when using the magnifying glass on the Rosetta Stone

svn-id: r53003
 2010-10-03 22:41:35 +00:00
Martin Kiewitz
fa7c6a9969 SCI: adding workaround for platform-specific 
incompatibility with some sierra games. Some games open a new menu, set mouse cursor within that menu and expect the mouse cursor to be in there and will close it, if it's outside. In case of Wiimote/touch interfaces this logic won't work of course. Fixes island of dr. brain and QfG1VGA on Wii and touch-interface platforms

svn-id: r52474
 2010-08-31 15:50:46 +00:00
Matthew Hoops
f252c0b67e SCI: Add support for Mac 'crsr' cursors used in SCI2+ games 
svn-id: r52076
 2010-08-14 04:21:09 +00:00
Martin Kiewitz
8e04d25be6 SCI: support kSetCursorSci11(-2) 
svn-id: r51202
 2010-07-23 10:58:06 +00:00
Martin Kiewitz
1287e6f252 SCI: adjust brRect and nsRect, if sci2 hires views are used, fixes hotspots in gk1 
svn-id: r50536
 2010-06-30 15:44:26 +00:00
Max Horn
8db0f726c0 SCI: Rewrap more comments 
svn-id: r50500
 2010-06-29 14:55:32 +00:00
Max Horn
7e0240ab14 SCI: Comment cleanup 
svn-id: r50423
 2010-06-28 11:20:51 +00:00
Max Horn
9f48a37671 SCI: Add const qualifiers to many GfxView methods and their return values. 
This helps to ensure proper data encapsulation.
Also reformatted some overlong comments to 80 chars per line, and
fixed some other code formatting issues.

svn-id: r50421
 2010-06-28 11:20:14 +00:00
Martin Kiewitz
871c9bddde SCI: removing unneeded parameters inside SciPalette, cleanup of SciPalette 
svn-id: r50076
 2010-06-20 13:15:45 +00:00
Max Horn
8e07a1e167 SCI: Moved the event code a little bit around. 
* Move sleep() from EventManager to SciEngine
* Rename EventManager methods: get -> getSciEvent, and
  getFromScummVM -> getScummVMEvent
* Make scancode_rows static const
* Turn altify & numlockify from EventManager methods into static
  functions (and comment out the currently unused numlockify)

svn-id: r49959
 2010-06-17 23:10:37 +00:00
Matthew Hoops
6ee4bf06ad Fix a valgrind warning in GfxCursor. Thanks to digitall for finding it. 
svn-id: r49917
 2010-06-17 03:53:13 +00:00
Martin Kiewitz
c9ba23f2b4 SCI: only set mouse position, when cursor is visible (fixes non-stop, but escapeable mouse position setting to 0, 0 in eco quest 1 floppy during intro) 
svn-id: r49874
 2010-06-15 17:41:33 +00:00
Martin Kiewitz
831e626ccd SDL: only change mouse cursor, when mouse is currently within our window, also enable mouse position changing again for SCI 
svn-id: r49866
 2010-06-15 16:58:03 +00:00
Filippos Karapetis
32d7f7ddb0 Disabled the mouse warping code, as it can be annoying in windowed mode 
svn-id: r49542
 2010-06-09 14:16:00 +00:00
Filippos Karapetis
5cb311ee2c Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state 
svn-id: r49534
 2010-06-09 07:59:42 +00:00
Matthew Hoops
3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression. 
svn-id: r49070
 2010-05-18 04:17:58 +00:00
Martin Kiewitz
f3b2627179 SCI: adding special 640x440 upscaling mode for kq6, finally hires portraits are drawn at the right position 
svn-id: r49041
 2010-05-15 15:16:32 +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
7c26675ec1 SCI: fix regression from r48720, upscaled games that use view cursors crashed 
svn-id: r48810
 2010-04-26 21:01:05 +00:00
Martin Kiewitz
88af84514b SCI: added comments about sierra not upscaling cursors for shape and view cursors 
svn-id: r48721
 2010-04-19 16:38:36 +00:00
Martin Kiewitz
5e472b1ba2 SCI: added upscaling for shape cursors in upscaled hires games (will make the cursor "normal" sized in japanese sci01 games) 
svn-id: r48720
 2010-04-19 16:36:47 +00:00
Max Horn
903b694574 SCI: Cleanup resource.h 
svn-id: r48084
 2010-02-17 23:37:32 +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
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
Martin Kiewitz
cabd18da9e SCI: renaming class View to GfxView 
svn-id: r47891
 2010-02-04 22:17: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
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Martin Kiewitz
dbe665908e SCI: dont directly set mouse cursor to visible state but call show() instead thus updating _isVisible so cursor wont get lost in sci0 games 
svn-id: r47391
 2010-01-19 19:58:36 +00:00
Martin Kiewitz
7d7d23ce2b SCI: making most of the variables in screen class private (some of it was needed for old gui) 
svn-id: r47075
 2010-01-06 13:05:14 +00:00
Filippos Karapetis
d99aa0f126 More renaming 
svn-id: r47009
 2010-01-05 01:37:57 +00:00
Renamed from engines/sci/graphics/gui_cursor.cpp (Browse further)