aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx
diff options
context:
space:
mode:
authorFilippos Karapetis2009-05-29 17:19:39 +0000
committerFilippos Karapetis2009-05-29 17:19:39 +0000
commitb1997801dad7f5ec30b6cb3c4a2e7574ed0cf590 (patch)
tree0b45674ae814c0053b85630098d455c596fe3763 /engines/sci/gfx
parent797c35876b32988841f84318f1ef0f998f4926c9 (diff)
downloadscummvm-rg350-b1997801dad7f5ec30b6cb3c4a2e7574ed0cf590.tar.gz
scummvm-rg350-b1997801dad7f5ec30b6cb3c4a2e7574ed0cf590.tar.bz2
scummvm-rg350-b1997801dad7f5ec30b6cb3c4a2e7574ed0cf590.zip
- Moved some debug code into console.cpp, adding 3 console commands: resource_types, sci0_palette and exit
- Removed the "man" command - Removed the commands which set the SCI01 priority table flags and the crossblit alpha threshold (they're too specific, and not really useful anymore) - Removed some leftover debug code from gfxop_clear_box() svn-id: r41010
Diffstat (limited to 'engines/sci/gfx')
-rw-r--r--engines/sci/gfx/gfx_support.cpp9
-rw-r--r--engines/sci/gfx/gfx_tools.h7
-rw-r--r--engines/sci/gfx/operations.cpp3
3 files changed, 6 insertions, 13 deletions
diff --git a/engines/sci/gfx/gfx_support.cpp b/engines/sci/gfx/gfx_support.cpp
index fd62cf8e73..3a32752b9a 100644
--- a/engines/sci/gfx/gfx_support.cpp
+++ b/engines/sci/gfx/gfx_support.cpp
@@ -32,9 +32,6 @@
namespace Sci {
-int gfx_crossblit_alpha_threshold = 128;
-
-
#define LINEMACRO(startx, starty, deltalinear, deltanonlinear, linearvar, nonlinearvar, \
linearend, nonlinearstart, linearmod, nonlinearmod) \
incrNE = ((deltalinear) > 0) ? (deltalinear) : -(deltalinear); \
@@ -314,6 +311,12 @@ int gfx_crossblit_pixmap(gfx_mode_t *mode, gfx_pixmap_t *pxm, int priority, rect
#endif
}
+ /**
+ * Crossblitting functions use this value as threshold for distinguishing
+ * between transparent and opaque wrt alpha values.
+ */
+ int gfx_crossblit_alpha_threshold = 0x90; // was 128
+
if (alpha_mask & 0xff)
alpha_min = ((alpha_mask * gfx_crossblit_alpha_threshold) >> 8) & alpha_mask;
else
diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h
index 50ecb70783..8582dfa565 100644
--- a/engines/sci/gfx/gfx_tools.h
+++ b/engines/sci/gfx/gfx_tools.h
@@ -42,13 +42,6 @@ enum gfx_xlate_filter_t {
GFX_XLATE_FILTER_TRILINEAR
};
-
-/**
- * Crossblitting functions use this value as threshold for distinguishing
- * between transparent and opaque wrt alpha values.
- */
-extern int gfx_crossblit_alpha_threshold;
-
gfx_mode_t *gfx_new_mode(int xfact, int yfact, const Graphics::PixelFormat &format, Palette *palette, int flags);
/* Allocates a new gfx_mode_t structure with the specified parameters
** Parameters: (int x int) xfact x yfact: Horizontal and vertical scaling factors
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index ad1265316a..46f0bb4332 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1049,9 +1049,6 @@ int gfxop_clear_box(GfxState *state, rect_t box) {
_gfxop_full_pointer_refresh(state);
_gfxop_add_dirty(state, box);
DDIRTY(stderr, "[] clearing box %d %d %d %d\n", GFX_PRINT_RECT(box));
- if (box.x == 29 && box.y == 77 && (sci0_palette == 1)) {
- BREAKPOINT();
- }
_gfxop_clip(&box, gfx_rect(0, 0, 320, 200));
#ifdef PRECISE_PRIORITY_MAP