[Scummvm-cvs-logs] SF.net SVN: scummvm:[40055] scummvm/trunk/engines/sci/gfx
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Apr 21 21:17:39 CEST 2009
Revision: 40055
http://scummvm.svn.sourceforge.net/scummvm/?rev=40055&view=rev
Author: thebluegr
Date: 2009-04-21 19:17:39 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Removed per-picture port bounds, which were set to the global port bounds
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
scummvm/trunk/engines/sci/gfx/gfx_resource.h
scummvm/trunk/engines/sci/gfx/res_pic.cpp
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-04-21 19:14:11 UTC (rev 40054)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-04-21 19:17:39 UTC (rev 40055)
@@ -88,15 +88,11 @@
basic_style.brush_mode = GFX_BRUSH_MODE_SCALED;
#ifdef CUSTOM_GRAPHICS_OPTIONS
- basic_style.pic_port_bounds = _options->pic_port_bounds;
style.line_mode = _options->pic0_line_mode;
style.brush_mode = _options->pic0_brush_mode;
- style.pic_port_bounds = _options->pic_port_bounds;
#else
- basic_style.pic_port_bounds = gfx_rect(0, 10, 320, 190);
style.line_mode = GFX_LINE_MODE_CORRECT;
style.brush_mode = GFX_BRUSH_MODE_RANDOM_ELLIPSES;
- style.pic_port_bounds = gfx_rect(0, 10, 320, 190);
#endif
if (!res || !res->data)
Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.h 2009-04-21 19:14:11 UTC (rev 40054)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.h 2009-04-21 19:17:39 UTC (rev 40055)
@@ -74,7 +74,6 @@
struct gfxr_pic0_params_t {
gfx_line_mode_t line_mode; /* one of GFX_LINE_MODE_* */
gfx_brush_mode_t brush_mode;
- rect_t pic_port_bounds;
};
struct gfxr_pic_t {
Modified: scummvm/trunk/engines/sci/gfx/res_pic.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/res_pic.cpp 2009-04-21 19:14:11 UTC (rev 40054)
+++ scummvm/trunk/engines/sci/gfx/res_pic.cpp 2009-04-21 19:17:39 UTC (rev 40055)
@@ -1314,7 +1314,12 @@
int pal, index;
int temp;
int line_mode = style->line_mode;
- int sci_titlebar_size = style->pic_port_bounds.y;
+ int sci_titlebar_size;
+#ifdef CUSTOM_GRAPHICS_OPTIONS
+ sci_titlebar_size = _options->pic_port_bounds.y;
+#else
+ sci_titlebar_size = 10;
+#endif
byte op, opx;
#ifdef FILL_RECURSIVE_DEBUG
@@ -1784,7 +1789,12 @@
int vector_data_ptr = READ_LE_UINT16(resource + 16);
int palette_data_ptr = READ_LE_UINT16(resource + 28);
int bitmap_data_ptr = READ_LE_UINT16(resource + 32);
- int sci_titlebar_size = style->pic_port_bounds.y;
+ int sci_titlebar_size;
+#ifdef CUSTOM_GRAPHICS_OPTIONS
+ sci_titlebar_size = _options->pic_port_bounds.y;
+#else
+ sci_titlebar_size = 10;
+#endif
gfx_pixmap_t *view = NULL;
if (pic->visual_map->palette) pic->visual_map->palette->free();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list