thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed more warnings

Browse source 
svn-id: r38332
This commit is contained in:
Max Horn 2009-02-15 23:59:29 +00:00
parent 033ade4f5c
commit 87bfde321f
5 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/engine/kgraphics.cpp
View file

@ -3378,7 +3378,7 @@ kDisplay(state_t *s, int funct_nr, int argc, reg_t *argv) {
int index = UKPV_OR_ALT(1, 0); int index = UKPV_OR_ALT(1, 0);
int temp; int temp;
int save_under = 0; int save_under = 0;
gfx_color_t transparent; gfx_color_t transparent = { { 0, 0, 0, 0 }, 0, 0, 0, 0 };
char *text; char *text;
gfxw_port_t *port = (s->port) ? s->port : s->picture_port; gfxw_port_t *port = (s->port) ? s->port : s->picture_port;
int update_immediately = 1; 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; int font_nr = port->font_nr;
gfxw_text_t *text_handle; gfxw_text_t *text_handle;
transparent.mask = 0;
color0 = port->color; color0 = port->color;
bg_color = port->bgcolor; bg_color = port->bgcolor;

3
engines/sci/engine/vm.cpp
View file

@ -61,9 +61,8 @@ int send_calls_allocated = 0;
int bp_flag = 0; int bp_flag = 0;
static reg_t _dummy_register = NULL_REG_INITIALIZER; static reg_t _dummy_register = NULL_REG_INITIALIZER;
static int jump_initialized = 0;
#ifdef HAVE_SETJMP_H #ifdef HAVE_SETJMP_H
static int jump_initialized = 0;
static jmp_buf vm_error_address; static jmp_buf vm_error_address;
#endif #endif

2
engines/sci/gfx/antialias.cpp
View file

@ -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++) { for (y = 0; y < pixmap->yl; y++) {
int visimode = (y > 0 && y + 1 < pixmap->yl) ? 1 : 0; 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); memcpy(lastline[y & 1], data_p, line_size);
lastline_p = lastline[(y & 1)^1]; lastline_p = lastline[(y & 1)^1];

3
engines/sci/gfx/gfx_driver.cpp
View file

@ -351,8 +351,7 @@ scummvm_set_palette(struct _gfx_driver *drv, int index, byte red, byte green, by
static sci_event_t static sci_event_t
scummvm_get_event(struct _gfx_driver *drv) { scummvm_get_event(struct _gfx_driver *drv) {
sci_event_t input; sci_event_t input = { SCI_EVT_NONE, 0, 0, 0 };
input.type = SCI_EVT_NONE;
Common::EventManager *em = g_system->getEventManager(); Common::EventManager *em = g_system->getEventManager();
Common::Event ev; Common::Event ev;

4
engines/sci/gfx/operations.cpp
View file

@ -1819,9 +1819,7 @@ _gfxop_numlockify(int c) {
sci_event_t sci_event_t
gfxop_get_event(gfx_state_t *state, unsigned int mask) { gfxop_get_event(gfx_state_t *state, unsigned int mask) {
sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 }; sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 };
sci_event_t event; sci_event_t event = { 0, 0, 0, 0 };;
event.data = 0;
event.buckybits = 0;
gfx_input_event_t **seekerp = &(state->events); gfx_input_event_t **seekerp = &(state->events);
BASIC_CHECKS(error_event); BASIC_CHECKS(error_event);