Commit Graph

154 Commits

Author SHA1 Message Date
Max Horn
f91eaf9f1a SCI: Fixed warning
svn-id: r39381
2009-03-14 01:45:11 +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
f5129b7cb7 Removed the unused struct "internal" inside gfx_pixmap_t
svn-id: r39374
2009-03-14 00:02: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
3e7fe64a22 Untangled the parameters in gfxr_interpreter_get_view() as well. Updated comments
svn-id: r39332
2009-03-11 17:09:30 +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
Filippos Karapetis
d7b767d90c Reverted some of the changes of commit #39192. The cursor reading code has been placed back in a separate file, and not in the resource manager (but it's now 1 function)
svn-id: r39293
2009-03-10 10:55:36 +00:00
Filippos Karapetis
c908f3c332 - Renamed files inside gfx/resource
- Merged sci_picfill_aux.cpp and sci_picfill.cpp into picfill.cpp (as this is the only place where the auxiliary fill functions are used)

svn-id: r39292
2009-03-10 10:36:43 +00:00
Johannes Schickel
9068ae8424 Formatting.
svn-id: r39245
2009-03-08 21:05:39 +00:00
Johannes Schickel
e123621cf9 Fix warning.
svn-id: r39244
2009-03-08 20:51:30 +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
877629cb2e SCI: replaced get_int_16 by READ_LE_UINT16, and got rid of inverse_16
svn-id: r39212
2009-03-08 08:16:08 +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
2dfae035ac SCI: Reduced header interdependencies some more
svn-id: r39202
2009-03-07 19:23:47 +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
Filippos Karapetis
cdb4cdf070 The ScummVM debug console is now working (though only the "version" command is assigned, for now)
svn-id: r39195
2009-03-07 17:32:11 +00:00
Filippos Karapetis
91f2553260 Merged all the different cursor drawing functions inside gfxr_interpreter_get_cursor()
svn-id: r39192
2009-03-07 17:08:31 +00:00
Filippos Karapetis
f7e980b56e Replaced gfxprintf
svn-id: r39190
2009-03-07 16:17:01 +00:00
Filippos Karapetis
1e29983d8e Replaced getInt16, getUInt16 and putInt16
svn-id: r39189
2009-03-07 16:14:20 +00:00
Max Horn
57e0d16112 SCI: Added TODO (rect_t should be replaced by Common::Rect), minor tweaks
svn-id: r39105
2009-03-04 05:09:35 +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
Filippos Karapetis
59e847dc2d Cleanup
svn-id: r39081
2009-03-02 21:45:31 +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
Jordi Vilalta Prat
7050c7b03f SCI: Use the ResourceType enum instead of integers where it makes sense
svn-id: r38988
2009-02-28 23:46:50 +00:00
Greg Frieger
61ab59138a resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
2009-02-28 21:59:49 +00:00
Greg Frieger
4dd1b7dad5 Turned ResourceManager into a class, along with all related functions
svn-id: r38978
2009-02-28 20:45:36 +00:00
Johannes Schickel
26cb1657bc Fix warnings.
svn-id: r38975
2009-02-28 16:17:14 +00:00
Willem Jan Palenstijn
c388d6c455 Increase colour refcount when allocating colour
svn-id: r38974
2009-02-28 16:12:52 +00:00
Willem Jan Palenstijn
2d1a6309f8 Disable xfact/yfact scaling in embedded views.
This inadvertently broke colours in KQ5 as a side effect.

svn-id: r38973
2009-02-28 16:11:02 +00:00
Johannes Schickel
9cc4f5630e Fix warnings.
svn-id: r38972
2009-02-28 16:06:32 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +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
Willem Jan Palenstijn
f8648767e4 fix graphics regression in Iceman caused by r38909
svn-id: r38914
2009-02-26 20:08:04 +00:00
Max Horn
3343dca6dc SCI: Modified gfx_new_mode to take a Graphics::PixelFormat
svn-id: r38909
2009-02-26 16:16:53 +00:00
Max Horn
fde001ce81 SCI: Changed 'typedef enum { } NAME' into C++-style 'enum NAME { }'
svn-id: r38908
2009-02-26 16:16:46 +00:00
Max Horn
900dc048f4 SCI: Turned the crossblit code into a template
svn-id: r38907
2009-02-26 16:16:38 +00:00
Max Horn
9515ae4ddc SCI: Moved gfx_line.cpp to line.h and turned _gfx_draw_line_buffer into a template
svn-id: r38905
2009-02-26 16:16:22 +00:00
Max Horn
edc4e58c9c SCI: Replaced #define hack to fake subclassing in C by regular C++ subclassing
svn-id: r38904
2009-02-26 16:16:13 +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
387fcd101d Cleanup
svn-id: r38898
2009-02-26 10:44:25 +00:00
Filippos Karapetis
2fbf626d09 Cleanup
svn-id: r38896
2009-02-26 10:31:48 +00:00