Commit graph

320 commits

Author SHA1 Message Date
Max Horn
80794a6b5a SCI: font_nr -> _font
svn-id: r40106
2009-04-24 10:47:38 +00:00
Max Horn
22a803cc69 SCI: Rewrote the port_refs code (fixing at least three serious bugs in it. Wow, crappy)
svn-id: r40105
2009-04-24 10:46:46 +00:00
Max Horn
9445439c4f SCI: Renamed gfxw_widget_t and subtypes to GfxWidget etc.
svn-id: r40104
2009-04-24 10:46:20 +00:00
Max Horn
86b3657476 SCI: Started to C++ify the gfxw_widget_t codebase
svn-id: r40103
2009-04-24 10:45:09 +00:00
Max Horn
eb0710c2cd SCI: Some const corrections, removed dead stuff, cleanup
svn-id: r40101
2009-04-24 10:43:42 +00:00
Filippos Karapetis
f2bd65339c Changed the "Intersections" opcode to "MoveCursor", after verifying it with Greg's SCI implementation and discussing it with waltervn. Also, the cursor hotspot is now fixed for Eco Quest 1 and probably SCI11 games as well (e.g. the game menu in KQ6 is now working)
svn-id: r40096
2009-04-23 21:06:34 +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
3c58066206 - Fixed some of the GUI graphical glitches in SCI1 games (e.g. the inventory screen in several SCI1 games and the menus in PQ3). It's still not right, but it's better than nothing
- Removed the confusing ADD_TO_CURRENT_BG_WIDGETS and ADD_TO_CURRENT_FG_WIDGETS defines, which had the same functionality

svn-id: r40058
2009-04-21 21:37:03 +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
Max Horn
fadd224285 SCI: Clarify hack in kgraphics.cpp based on what lars wrote on scummvm-devel
svn-id: r39905
2009-04-09 08:49:42 +00:00
Walter van Niftrik
81f7c8b746 SCI: Swapped x and y parameters of IsItSkip. Added IsItSkip to kernel table.
svn-id: r39894
2009-04-07 17:26:42 +00:00
Filippos Karapetis
e03eb7d4ce Removed leftover chrono-related code (refer to commit #37721 for the changes to kgraphics.cpp)
svn-id: r39820
2009-04-03 22:48:55 +00:00
Filippos Karapetis
c3dc501f23 Removed the non-working Chrono port code, after discussing with Lars
svn-id: r39819
2009-04-03 22:03:06 +00:00
Filippos Karapetis
6fe12a0888 pic_port_bounds was only set from command-line parameters it seems, so it's safe to put it together with the rest of the options
svn-id: r39800
2009-04-02 16:38:33 +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
661644f3c1 Added stubs for the missing palette effects in kPalette()
svn-id: r39744
2009-03-29 15:08:50 +00:00
Filippos Karapetis
fbc76a89e1 Added a stub for the palette fadeout/fadein effect, so that we remember it's currently missing
svn-id: r39743
2009-03-29 14:47:57 +00:00
Filippos Karapetis
d883cb209e Fixed the colors of the widgets in KQ5's options menu
svn-id: r39737
2009-03-29 12:28:24 +00:00
Filippos Karapetis
09d96e24f9 Fixed the colors of the window frames in KQ5
svn-id: r39734
2009-03-29 11:56:32 +00:00
Filippos Karapetis
cda1bf5ca9 Eco Quest 1 continues after the intro now
svn-id: r39731
2009-03-29 01:56:03 +00:00
Filippos Karapetis
d75959c354 Added a note about the potential invalid rectangles created when drawing lines
svn-id: r39704
2009-03-26 21:52:04 +00:00
Filippos Karapetis
34d75e455b - Renamed gfx/sci_widgets.* to gfx/gfx_gui.*, as these files contain GUI elements mostly, like windows and status bars
- Moved kWindowAutoRestore from gfx_widgets.h to gfx_gui.h

svn-id: r39687
2009-03-25 12:52:03 +00:00
Filippos Karapetis
006b2d62af Changed some flags to enums
svn-id: r39685
2009-03-25 12:07:10 +00:00
Max Horn
b76f7fea4e SCI: Changed some char* into Common::String
svn-id: r39663
2009-03-24 12:46:48 +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
Filippos Karapetis
723bc879f8 Changed abs_rect_t to Common::Rect
svn-id: r39518
2009-03-18 16:43:12 +00:00
Filippos Karapetis
e546c60948 Further objectification of the graphics resource manager
svn-id: r39499
2009-03-17 23:30:57 +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
80c243e5ca Renamed some defines:
- FREESCI_CURRENT_SAVEGAME_VERSION, FREESCI_MINIMUM_SAVEGAME_VERSION -> CURRENT_SAVEGAME_VERSION, MINIMUM_SAVEGAME_VERSION (saved games are not compatible with FreeSCI's ones anymore)
- _K_VIEW_SIG_FLAG_FREESCI_STOPUPD -> _K_VIEW_SIG_FLAG_STOPUPD (like the rest of the flags)
- Removed FREESCI_KFUNCT_GLUTTON (unused)

svn-id: r39478
2009-03-17 08:03:42 +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
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
Willem Jan Palenstijn
a00559136f Fix uninitialized color meta-values.
This fixes holes in text boxes in Iceman, among other things.

svn-id: r39274
2009-03-09 20:31:43 +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
Max Horn
2dfae035ac SCI: Reduced header interdependencies some more
svn-id: r39202
2009-03-07 19:23:47 +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
ce42d6e538 Fixed windows and text drawing problem in SCI1
svn-id: r39000
2009-03-01 04:07:04 +00:00
Max Horn
d7b06b7d42 SCI: Renamed ResourceManager::sci_version to _sciVersion, to avoid var shadowing warnings; some other tweaks
svn-id: r38984
2009-02-28 22:19:22 +00:00
Jordi Vilalta Prat
501e4bb91a SCI: Renamed some kernel types and general cleanup
svn-id: r38961
2009-02-28 11:12:59 +00:00
Max Horn
479751104f SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
svn-id: r38921
2009-02-27 02:23:40 +00:00
Max Horn
170916201c SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
2009-02-27 02:23:00 +00:00
Max Horn
5093167fde cleanup
svn-id: r38891
2009-02-26 02:21:55 +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
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
b5df97ad2b SCI: Moved kernel.h and kdebug.h from include/ to engine/; untangled header deps some more
svn-id: r38833
2009-02-24 05:51:55 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Jordi Vilalta Prat
817fde6cdd SCI: Convert the segment manager into a class
svn-id: r38767
2009-02-21 23:27:24 +00:00