diff options
| author | Max Horn | 2009-02-15 23:59:29 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 23:59:29 +0000 |
| commit | 87bfde321f7ac505b797efa7ed72f087fd5e9b42 (patch) | |
| tree | 28e8eacf79c4415db5ecaa98cd3997a135e34825 | |
| parent | 033ade4f5cb954cd3af870136859ccf7ec6ac8aa (diff) | |
| download | scummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.tar.gz scummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.tar.bz2 scummvm-rg350-87bfde321f7ac505b797efa7ed72f087fd5e9b42.zip | |
Fixed more warnings
svn-id: r38332
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/gfx/antialias.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_driver.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 4 |
5 files changed, 5 insertions, 11 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 diff --git a/engines/sci/gfx/antialias.cpp b/engines/sci/gfx/antialias.cpp index a9468420f6..059c0a390e 100644 --- a/engines/sci/gfx/antialias.cpp +++ b/engines/sci/gfx/antialias.cpp @@ -44,7 +44,7 @@ antialiase_simple(gfx_pixmap_t *pixmap, int mask[], int shift_const, gfx_mode_t for (y = 0; y < pixmap->yl; y++) { int visimode = (y > 0 && y + 1 < pixmap->yl) ? 1 : 0; - unsigned long last_pixel; + unsigned long last_pixel = 0; memcpy(lastline[y & 1], data_p, line_size); lastline_p = lastline[(y & 1)^1]; diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp index 65acbe9cc8..e96caa19e8 100644 --- a/engines/sci/gfx/gfx_driver.cpp +++ b/engines/sci/gfx/gfx_driver.cpp @@ -351,8 +351,7 @@ scummvm_set_palette(struct _gfx_driver *drv, int index, byte red, byte green, by static sci_event_t scummvm_get_event(struct _gfx_driver *drv) { - sci_event_t input; - input.type = SCI_EVT_NONE; + sci_event_t input = { SCI_EVT_NONE, 0, 0, 0 }; Common::EventManager *em = g_system->getEventManager(); Common::Event ev; diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 6dfe857815..dca514c2f4 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1819,9 +1819,7 @@ _gfxop_numlockify(int c) { sci_event_t gfxop_get_event(gfx_state_t *state, unsigned int mask) { sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 }; - sci_event_t event; - event.data = 0; - event.buckybits = 0; + sci_event_t event = { 0, 0, 0, 0 };; gfx_input_event_t **seekerp = &(state->events); BASIC_CHECKS(error_event); |