aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMax Horn2009-02-15 23:59:29 +0000
committerMax Horn2009-02-15 23:59:29 +0000
commit87bfde321f7ac505b797efa7ed72f087fd5e9b42 (patch)
tree28e8eacf79c4415db5ecaa98cd3997a135e34825 /engines/sci/engine
parent033ade4f5cb954cd3af870136859ccf7ec6ac8aa (diff)
downloadscummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.tar.gz
scummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.tar.bz2
scummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.zip
Fixed more warnings
svn-id: r38332
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kgraphics.cpp4
-rw-r--r--engines/sci/engine/vm.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index a44e71637a..b3f1c3b871 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -3378,7 +3378,7 @@ kDisplay(state_t *s, int funct_nr, int argc, reg_t *argv) {
int index = UKPV_OR_ALT(1, 0);
int temp;
int save_under = 0;
- gfx_color_t transparent;
+ gfx_color_t transparent = { { 0, 0, 0, 0 }, 0, 0, 0, 0 };
char *text;
gfxw_port_t *port = (s->port) ? s->port : s->picture_port;
int update_immediately = 1;
@@ -3391,8 +3391,6 @@ kDisplay(state_t *s, int funct_nr, int argc, reg_t *argv) {
int font_nr = port->font_nr;
gfxw_text_t *text_handle;
- transparent.mask = 0;
-
color0 = port->color;
bg_color = port->bgcolor;
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index a66ab70f7e..edcabedcaf 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -61,9 +61,8 @@ int send_calls_allocated = 0;
int bp_flag = 0;
static reg_t _dummy_register = NULL_REG_INITIALIZER;
-
-static int jump_initialized = 0;
#ifdef HAVE_SETJMP_H
+static int jump_initialized = 0;
static jmp_buf vm_error_address;
#endif