libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings.

Browse Source 
svn-id: r38972
This commit is contained in:
Johannes Schickel 2009-02-28 16:06:32 +00:00
parent 1befd93475
commit 9cc4f5630e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/gfx/gfx_widgets.cpp
View File

@ -676,7 +676,7 @@ static int _w_gfxwop_view_print(gfxw_widget_t *widget, const char *name, int ind
gfxw_view_t *view = (gfxw_view_t *)widget;
_gfxw_print_widget(widget, indentation);
sciprintf(name);
sciprintf("%s", name);
sciprintf("(%d/%d/%d)@(%d,%d)[p:%d,c:%d]", view->view, view->loop, view->cel, view->pos.x, view->pos.y,
(view->color.mask & GFX_MASK_PRIORITY) ? view->color.priority : -1,
(view->color.mask & GFX_MASK_CONTROL) ? view->color.control : -1);
@ -767,7 +767,7 @@ static int _gfxwop_some_view_print(gfxw_widget_t *widget, int indentation, const
_gfxw_print_widget(widget, indentation);
sciprintf(type_string);
sciprintf("%s", type_string);
sciprintf(" SORT=%d z=%d seq=%d (%d/%d/%d)@(%d,%d)[p:%d,c:%d]; sig[%04x@%p]", view->force_precedence, view->z,
view->sequence, view->view, view->loop, view->cel, view->pos.x, view->pos.y,
(view->color.mask & GFX_MASK_PRIORITY) ? view->color.priority : -1,
@ -1388,7 +1388,7 @@ static int _gfxwop_sorted_list_draw(gfxw_widget_t *list, Common::Point pos) {
static inline int _w_gfxwop_list_print(gfxw_widget_t *list, const char *name, int indentation) {
_gfxw_print_widget(list, indentation);
sciprintf(name);
sciprintf("%s", name);
return _w_gfxwop_container_print(list, indentation);
}

5
engines/sci/gfx/resmgr.cpp
View File

@ -161,7 +161,10 @@ void *gfxr_sbtree_free_tagged_func(sbtree_t *tree, const int key, const void *va
resource->lock_sequence_nr = 0;
else
(resource->lock_sequence_nr)--;
return (void *) value;
// FIXME: const_cast does not sound like a good idea,
// maybe we should just make the value parameter
// non const instead?
return const_cast<void *>(value);
}
} else
return NULL;