187 Commits

Author SHA1 Message Date
Filippos Karapetis
a3a7893f16 Changed the font flag defines to an enumeration
svn-id: r39690
2009-03-25 17:51:22 +00:00
Filippos Karapetis
4723f80fe2 Merged sciw_select_item() and sciw_unselect_item()
svn-id: r39689
2009-03-25 16:37:50 +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
df5239e89e Remove superfluous comma
svn-id: r39686
2009-03-25 12:11:49 +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
Max Horn
33895c0220 SCI: Only pass the pointerpos to Menubar::mapPointer, not the full gfx_state_t
svn-id: r39662
2009-03-24 12:14:41 +00:00
Max Horn
608b839720 SCI: moved sci_strndup to menubar.cpp
svn-id: r39661
2009-03-24 12:14:22 +00:00
Max Horn
c1be6e1ed6 SCI: Fixed some leaks introduced by my previous changes
svn-id: r39660
2009-03-24 12:01:54 +00:00
Max Horn
9ea32d4aa1 SCI: C++ify menu code
svn-id: r39659
2009-03-24 11:31:16 +00:00
Filippos Karapetis
3b5a14916d Cleanup
svn-id: r39633
2009-03-23 14:24:10 +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
2ea883adb2 Cleanup
svn-id: r39593
2009-03-21 16:42:45 +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
bc37ec4ce1 Renamed resmgr.cpp -> gfx_resmgr.cpp
Moved all files from gfx/resource/* to gfx/*

svn-id: r39515
2009-03-18 13:24:47 +00:00
Filippos Karapetis
abc842b677 Slight cleanup
svn-id: r39514
2009-03-18 11:25:23 +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
5a77b89f92 Cleanup
svn-id: r39501
2009-03-17 23:43:32 +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
Max Horn
3c0d117dd8 SCI: fix warning
svn-id: r39483
2009-03-17 16:07:18 +00:00
Filippos Karapetis
ebfdd92727 Removed the "About FreeSCI" menu as discussed in -devel, now that the FreeSCI contributors have been moved to the AUTHORS file
svn-id: r39476
2009-03-17 07:57:02 +00:00
Filippos Karapetis
9ec640633d It seems that the SCI GUI code tries to show rectangles with negative height. Added some sanity checks for this, but the *real* problem lies elsewhere
svn-id: r39451
2009-03-16 19:19:59 +00:00
Filippos Karapetis
7cd1ac5231 Changed the temporary helper functions to defines
svn-id: r39450
2009-03-16 17:25:13 +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
Max Horn
c5e8c48c5e SCI: Removed sbtree code by Common::Hashmap
svn-id: r39439
2009-03-16 05:44:20 +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
Max Horn
7df4e2a80f SCI: Indention changes, changed 'songlib_t' params to 'const songlib_t &'
svn-id: r39429
2009-03-15 20:31:15 +00:00
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