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

72 commits

Author SHA1 Message Date
Walter van Niftrik
c0805599ca SCI: Fixed mouse cursor hotspots in ECO1. 
svn-id: r40110
 2009-04-24 12:30:57 +00:00
Max Horn
6fef323ec7 SCI: Changed GFXERROR to be fatal 
svn-id: r40102
 2009-04-24 10:44:10 +00:00
Filippos Karapetis
78f892f87c The mouse cursor is now working in Eco Quest 1, though the hotspot is still wrong. Many thanks to waltervn for his findings on this. 
svn-id: r40095
 2009-04-23 20:37:41 +00:00
Filippos Karapetis
20cc4f3dd7 Restored the ability to change the active port bound, by moving it inside gfx_state_t (it makes much more sense for it to be there, instead of inside user-defined settings). Placed notes inside gfxr_draw_pic01() and gfxr_draw_pic11() for the usage of the current titlebar size in there 
svn-id: r40057
 2009-04-21 19:57:11 +00:00
Filippos Karapetis
1e8bd16c1e - Wrapped all the code for custom graphics options around a CUSTOM_GRAPHICS_OPTIONS define. Most of these options don't work in 256-color mode, plus there is currently no way to actually set/change them somehow (other than modifying the code) 
- Added a FIXME for the abuse of the pic_port_bounds graphics option - it's actually set by the game itself in kSetPort()
- Added some test code for setting palette intensity in KPalette() (currently disabled)

svn-id: r39794
 2009-04-01 20:32:45 +00:00
Filippos Karapetis
a3a7893f16 Changed the font flag defines to an enumeration 
svn-id: r39690
 2009-03-25 17:51:22 +00:00
Filippos Karapetis
a6f49a636b - Moved palette initialization inside the graphics resource manager 
- The static palette is no longer needlessly referenced directly outside the graphics resource manager
- Moved the SCI interpreter version inside the graphics resource manager, instead of gfx_state_t

svn-id: r39626
 2009-03-23 08:43:53 +00:00
Filippos Karapetis
e3f9acc3e6 Further objectification of the graphics resource manager 
svn-id: r39621
 2009-03-22 23:11:43 +00:00
Max Horn
277b8e6190 SCI: Fixed nasty bug in simulate_stippled_line_draw, caught only thanks to warnings by the Wii compiler. 
svn-id: r39616
 2009-03-22 22:02:25 +00:00
Filippos Karapetis
3d5ad1e6a3 Cleaned up gfxop_draw_rectangle(). Also, removed a check insode BASIC_CHECKS() which is impossible to occur 
svn-id: r39540
 2009-03-19 21:27:01 +00:00
Filippos Karapetis
11601f88e1 Fixed issues with commit #39449, fixing some graphical glitches with the GUI widgets 
svn-id: r39534
 2009-03-19 19:52:05 +00:00
Filippos Karapetis
c9eff6e1f8 Cleaned up graphics initialization a bit 
svn-id: r39513
 2009-03-18 11:07:29 +00:00
Filippos Karapetis
b670070c6c Cleanup 
svn-id: r39506
 2009-03-18 07:59:46 +00:00
Filippos Karapetis
e546c60948 Further objectification of the graphics resource manager 
svn-id: r39499
 2009-03-17 23:30:57 +00:00
Johannes Schickel
4edee56b3f Fix warning. 
svn-id: r39498
 2009-03-17 22:56:20 +00:00
Filippos Karapetis
063ce3938d Started objectifying the graphics resource manager (refer to patch #2689887) 
svn-id: r39492
 2009-03-17 21:08:33 +00:00
Filippos Karapetis
0e8dfe09c9 Replaced some rect_t operations with our common ones. For now, two helper functions are used to easily change types between Common::Rect and rect_t, until rect_t is removed 
svn-id: r39449
 2009-03-16 15:36:09 +00:00
Filippos Karapetis
4bd84b7311 Replaced "xl" with "width" and "y1" with "height" in places where rectangles are used 
svn-id: r39435
 2009-03-16 00:07:12 +00:00
Filippos Karapetis
b78001f7ca Changed the "internal" variable inside gfxr_pic_t to priorityTable (cause that's what it is), and changed its type to int * to avoid unneeded casts 
svn-id: r39375
 2009-03-14 00:05:01 +00:00
Filippos Karapetis
90df1b4be1 Commited syke's patch as-is 
svn-id: r39366
 2009-03-12 23:23:46 +00:00
Max Horn
642bad22d8 SCI: Removed most uses of the 'inline' keyword. It is usually better to let the compiler figure out what to inline. As it is, most of these looked as if they were randomly placed ;) 
svn-id: r39352
 2009-03-12 03:26:47 +00:00
Filippos Karapetis
aacb916e5e Got rid of misc_payload and stopped passing the whole graphics state structure in places where it's not necessary 
svn-id: r39331
 2009-03-11 16:50:12 +00:00
Max Horn
b52025ec82 ... 
svn-id: r39327
 2009-03-11 02:16:21 +00:00
Max Horn
e3b5e5a74c SCI: Restored code to triger debugger console by Ctrl-d (accidentally removed it in rev 39201) 
svn-id: r39326
 2009-03-11 02:05:49 +00:00
Willem Jan Palenstijn
77d056654f Fix missing return. 
svn-id: r39243
 2009-03-08 20:43:36 +00:00
Willem Jan Palenstijn
ced40b2266 Use new Palette class to manager pixmap palettes. 
There are some remaining regressions with text colour in SCI1 games,
but overall it should fix more than it breaks.

svn-id: r39242
 2009-03-08 20:17:01 +00:00
Willem Jan Palenstijn
feabf9d33f Fix boxes not blocking control/priority map. 
This is a regression from r39089 and caused text to be hidden behind
trees in the KQ5 introduction and missing text in longbow.

svn-id: r39226
 2009-03-08 13:43:11 +00:00
Max Horn
aad0ad3fa6 SCI: Added new header gfx/font.h and removed some dead code 
svn-id: r39211
 2009-03-08 08:15:56 +00:00
Max Horn
f9ecd95d69 Whitespace cleanup: Convert space followed by tab to just tab 
svn-id: r39203
 2009-03-07 19:24:31 +00:00
Max Horn
0a99cfb4ed SCI: Moved scummvm_get_event to operations.cpp (the only place where it is used), to ease future refactoring of the event handling code 
svn-id: r39201
 2009-03-07 19:23:32 +00:00
Greg Frieger
cbb6f91967 SCI1: Improved color mapping when drawing line/box/text. Text with transparent background now displays correctly. 
svn-id: r39089
 2009-03-03 14:27:49 +00:00
Greg Frieger
6742caa87a Text/window color matching improved by using an existing gfxop_set_color() instead of mine _gfxop_matchColor() 
svn-id: r39004
 2009-03-01 05:15:51 +00:00
Max Horn
d0c2484502 SCI: pass gfx_pixmap_color_t instead of r,g,b triple, makes calling code a bit easier to read :) 
svn-id: r39001
 2009-03-01 04:29:09 +00:00
Greg Frieger
ce42d6e538 Fixed windows and text drawing problem in SCI1 
svn-id: r39000
 2009-03-01 04:07:04 +00:00
Willem Jan Palenstijn
1377a4b64c Clarify behaviour of gfxop_get_event(). 
svn-id: r38900
 2009-02-26 12:10:11 +00:00
Filippos Karapetis
71ae2d3aba Reverted my wrong commit #38870. Most of the key codes are handled by the engine itself, however there are cases where they are handled by the game scripts, e.g. in save/load dialogs. The arrow keys in the save/load dialogs should work properly again. The numpad keys still look to be broken by some other commit 
svn-id: r38886
 2009-02-25 19:52:17 +00:00
Max Horn
b990add13e SCI: Restored ability to warp the mouse cursor 
svn-id: r38884
 2009-02-25 19:28:46 +00:00
Max Horn
ec26d4f24b SCI: Removed code for software rendered mouse cursor 
svn-id: r38883
 2009-02-25 19:28:20 +00:00
Max Horn
3a000f3d84 SCI: Simplify event polling code a little bit 
svn-id: r38881
 2009-02-25 18:59:00 +00:00
Willem Jan Palenstijn
9ed544679a Interpret NONBLOCK as PEEK; poll while sleeping. 
Also use Common::List for internal event queue.

svn-id: r38880
 2009-02-25 18:23:28 +00:00
Willem Jan Palenstijn
98a7ba4ec3 Don't truncate keycode in queued events. 
svn-id: r38878
 2009-02-25 17:36:38 +00:00
Filippos Karapetis
5618a81cff Replaced some of the internal SCI scan codes with the ones from ScummVM 
svn-id: r38870
 2009-02-24 22:58:44 +00:00
Max Horn
7d2a2ece38 SCI: Replaced gfxop_usleep by gfxop_sleep (taking millisecs instead of microsecs) 
svn-id: r38854
 2009-02-24 20:50:09 +00:00
Max Horn
0be30cdc5d SCI: Renamed gfx/gfx_operations.h to gfx/operations.h (matching the source file); moved include/sci_widgets.h to gfx/ (matching location of source file); renamed gfx/widgets.cpp to gfx/gfx_widgets.cpp (matching the header) 
svn-id: r38852
 2009-02-24 20:39:34 +00:00
Max Horn
220270586c SCI: Removed usec_sleep from gfx_driver_t (call OSystem::delayMillis directly instead); added remarks that busy-waiting like this with delayMillis is maybe not the best way, and that gfx_driver_t should be either removed or turned into a class 
svn-id: r38851
 2009-02-24 20:33:31 +00:00
Andre Heider
357299c570 substitute all time related functions, removing sci_gettime sci_get_current_time altogether. 
svn-id: r38845
 2009-02-24 18:31:05 +00:00
Max Horn
1e4db221e5 SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file 
svn-id: r38832
 2009-02-24 05:39:10 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup 
svn-id: r38783
 2009-02-22 13:11:43 +00:00
Willem Jan Palenstijn
145d5c4493 fix hang on 64bit platforms 
svn-id: r38756
 2009-02-21 22:35:35 +00:00
Max Horn
8430b662a9 SCI: Changed typedef struct -> struct 
svn-id: r38752
 2009-02-21 22:06:42 +00:00