[Scummvm-cvs-logs] SF.net SVN: scummvm:[38332] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 16 00:59:29 CET 2009
Revision: 38332
http://scummvm.svn.sourceforge.net/scummvm/?rev=38332&view=rev
Author: fingolfin
Date: 2009-02-15 23:59:29 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Fixed more warnings
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/sci/gfx/antialias.cpp
scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-15 23:49:42 UTC (rev 38331)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-15 23:59:29 UTC (rev 38332)
@@ -3378,7 +3378,7 @@
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 @@
int font_nr = port->font_nr;
gfxw_text_t *text_handle;
- transparent.mask = 0;
-
color0 = port->color;
bg_color = port->bgcolor;
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-02-15 23:49:42 UTC (rev 38331)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-02-15 23:59:29 UTC (rev 38332)
@@ -61,9 +61,8 @@
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
Modified: scummvm/trunk/engines/sci/gfx/antialias.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-15 23:49:42 UTC (rev 38331)
+++ scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-15 23:59:29 UTC (rev 38332)
@@ -44,7 +44,7 @@
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];
Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-15 23:49:42 UTC (rev 38331)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-15 23:59:29 UTC (rev 38332)
@@ -351,8 +351,7 @@
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;
Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-15 23:49:42 UTC (rev 38331)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-15 23:59:29 UTC (rev 38332)
@@ -1819,9 +1819,7 @@
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);
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