From a49d29cf6f7be49895c1c6a846ea93f0be3e0fee Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 15 Feb 2009 19:15:43 +0000 Subject: cleanup, fixed warnings svn-id: r38282 --- engines/sci/engine/kfile.cpp | 6 +----- engines/sci/engine/message.cpp | 2 +- engines/sci/gfx/font.cpp | 2 +- engines/sci/gfx/resource/sci_pic_0.cpp | 14 ++++---------- engines/sci/gfx/widgets.cpp | 2 +- engines/sci/include/game_select.h | 6 +++--- engines/sci/include/list.h | 4 ++-- engines/sci/include/resource.h | 33 ++------------------------------- engines/sci/include/sci_dos.h | 3 --- engines/sci/scicore/decompress01.cpp | 18 +++++++++--------- engines/sci/scicore/resource.cpp | 2 +- engines/sci/sfx/iterator.cpp | 2 +- engines/sci/sfx/player/polled.cpp | 2 ++ 13 files changed, 28 insertions(+), 68 deletions(-) (limited to 'engines/sci') diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 80dd86fba3..b7b2ae92fa 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -31,10 +31,6 @@ #ifdef _WIN32 -#define MAX_PATHLEN MAXPATHLEN -# ifndef PATH_MAX -# define PATH_MAX 255 -# endif # define WIN32_LEAN_AND_MEAN # include # include @@ -414,7 +410,7 @@ delete_savegame(state_t *s, int savedir_nr) reg_t kDeviceInfo_Win32(state_t *s, int funct_nr, int argc, reg_t *argv) { - char dir_buffer [MAXPATHLEN], dir_buffer2 [MAX_PATHLEN]; + char dir_buffer[MAXPATHLEN], dir_buffer2[MAXPATHLEN]; int mode = UKPV(0); diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index 2417e2a38b..a92bafd80c 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -222,7 +222,7 @@ static message_handler_t fixed_handler = {3411, void message_state_initialize(resource_mgr_t *resmgr, message_state_t *state) { - resource_t *tester = scir_find_resource(resmgr, sci_message, 0, 0); +// resource_t *tester = scir_find_resource(resmgr, sci_message, 0, 0); //int version; // if (tester == NULL) return; diff --git a/engines/sci/gfx/font.cpp b/engines/sci/gfx/font.cpp index c047b78f2e..b8d5d5a800 100644 --- a/engines/sci/gfx/font.cpp +++ b/engines/sci/gfx/font.cpp @@ -319,7 +319,7 @@ gfxr_draw_font(gfx_bitmap_font_t *font, const char *stext, int characters, int fore_0, fore_1, back; int i; int hack = 0; - gfx_pixmap_color_t dummy = {0}; + gfx_pixmap_color_t dummy = {0, 0, 0, 0}; byte *offset; for (i = 0; i < characters; i++) { diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp index 335a0e2a41..88553b2c9b 100644 --- a/engines/sci/gfx/resource/sci_pic_0.cpp +++ b/engines/sci/gfx/resource/sci_pic_0.cpp @@ -123,10 +123,8 @@ gfx_pixmap_color_t embedded_view_colors[16] = { void gfxr_init_static_palette() { - int i; - if (!_gfxr_pic0_colors_initialized) { - for (i = 0; i < 256; i++) { + for (int i = 0; i < 256; i++) { gfx_sci0_pic_colors[i].global_index = GFX_COLOR_INDEX_UNMAPPED; gfx_sci0_pic_colors[i].r = INTERCOL(gfx_sci0_image_colors[sci0_palette][i & 0xf].r, gfx_sci0_image_colors[sci0_palette][i >> 4].r); @@ -285,7 +283,6 @@ _gfxr_auxbuf_line_clear(gfxr_pic_t *pic, rect_t line, int color, int sci_titleba int y = line.y + sci_titlebar_size; unsigned char *buffer = pic->aux_map; int linewidth = 320; - int color2 = color; dx = line.xl; dy = line.yl; @@ -341,14 +338,13 @@ _gfxr_auxbuf_propagate_changes(gfxr_pic_t *pic, int bitmask) | (bitmask << (3+8)) | (bitmask << (3+16)) | (bitmask << (3+24)); - int i; if (sizeof(unsigned long) == 8) { /* UltraSparc, Alpha, newer MIPSens, etc */ andmask |= (andmask << 32); clearmask |= (clearmask << 32); } - for (i = 0; i < GFXR_AUX_MAP_SIZE / sizeof(unsigned long); i++) { + for (int i = 0; i < GFXR_AUX_MAP_SIZE / sizeof(unsigned long); i++) { unsigned long temp = *data & andmask; temp >>= 3; *data = (temp | *data) & clearmask; @@ -1396,7 +1392,6 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, }; int palette[GFXR_PIC0_NUM_PALETTES][GFXR_PIC0_PALETTE_SIZE]; int priority_table[GFXR_PIC0_PALETTE_SIZE]; - int i; int drawenable = GFX_MASK_VISUAL | GFX_MASK_PRIORITY; int priority = 0; int color = 0; @@ -1420,7 +1415,7 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, #endif /* FILL_RECURSIVE_DEBUG */ /* Initialize palette */ - for (i = 0; i < GFXR_PIC0_NUM_PALETTES; i++) + for (int i = 0; i < GFXR_PIC0_NUM_PALETTES; i++) memcpy(palette[i], default_palette_table, sizeof(int) * GFXR_PIC0_PALETTE_SIZE); memcpy(priority_table, default_priority_table, sizeof(int) * GFXR_PIC0_PALETTE_SIZE); @@ -1839,7 +1834,6 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, case PIC_SCI0_OPX_SET_PRIORITY_TABLE: case PIC_SCI1_OPX_PRIORITY_TABLE_EXPLICIT: { - int i; int *pri_table; p0printf("Explicit priority table @%d\n", pos); @@ -1856,7 +1850,7 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, pri_table[0] = 0; pri_table[15] = 190; - for (i = 1; i < 15; i++) + for (int i = 1; i < 15; i++) pri_table[i] = resource[pos++]; } goto end_op_loop; diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/widgets.cpp index 7516512c29..502bc45e95 100644 --- a/engines/sci/gfx/widgets.cpp +++ b/engines/sci/gfx/widgets.cpp @@ -2472,7 +2472,7 @@ gfxw_port_t * gfxw_get_chrono_port(gfxw_visual_t *visual, gfxw_list_t **temp_widgets_list, int flags) { gfxw_port_t *result = NULL; - gfx_color_t transparent = {0}; + gfx_color_t transparent = {{0, 0, 0, 0}, 0, 0, 0, 0}; int id = 0; if (!(flags & GFXW_CHRONO_NON_TOPMOST)) diff --git a/engines/sci/include/game_select.h b/engines/sci/include/game_select.h index 91b3d957f6..adcee70ce7 100644 --- a/engines/sci/include/game_select.h +++ b/engines/sci/include/game_select.h @@ -1,12 +1,12 @@ -#include "list.h" - #ifndef _SCI_GAME_SELECT_H #define _SCI_GAME_SELECT_H +#include "sci/include/list.h" + typedef struct game { char *name; - char dir[PATH_MAX]; + char dir[MAXPATHLEN]; int conf_nr; } game_t; diff --git a/engines/sci/include/list.h b/engines/sci/include/list.h index d53b87f491..dfd0801c15 100644 --- a/engines/sci/include/list.h +++ b/engines/sci/include/list.h @@ -31,11 +31,11 @@ /* 2006-04-21 Modified by Walter van Niftrik. */ -#include - #ifndef _SCI_LIST_H #define _SCI_LIST_H +#include "common/scummsys.h" + /* List definitions. */ #define LIST_HEAD(name, type) \ struct name { \ diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index 64bb1ffb8d..42a7c6ceeb 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -60,7 +60,6 @@ #ifdef SCUMMVM //TODO: Remove these defines by replacing their functionality by their ScummVM counterparts #ifndef _MSC_VER -#define HAVE_ISBLANK #define HAVE_UNISTD_H #define HAVE_FCNTL_H #define HAVE_UNLINK @@ -102,18 +101,8 @@ #include "sci/include/scitypes.h" -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef _WIN32 -# include -#endif /* !_WIN32 */ - -#ifdef __BEOS__ -# include -# define usleep snooze -#endif +// FIXME: Mostly for close() in lots of places. Get rid of this! +#include #ifdef _MSC_VER # include @@ -150,10 +139,6 @@ # define G_DIR_SEPARATOR '/' #endif -#if defined(__MORPHOS__) || defined(_MSC_VER) || defined(ARM_WINCE) || defined(__amigaos4__) -# define PATH_MAX 255 -#endif - #ifndef MIN # define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif @@ -229,14 +214,6 @@ putInt16(byte* dest, int src) ** (int) src: value to write */ -#ifndef HAVE_ISBLANK -static inline int -isblank(int foo) -{ - return (foo == ' ') || (foo == '\t'); -} -#endif - #ifdef _cplusplus # define delete _freesci_cplusplus_workaround_delete # define new _freesci_cplusplus_workaround_new @@ -493,9 +470,3 @@ sci_sched_yield(void); #define WARNING(foo) {char i; i = 500;} #endif - - - - - - diff --git a/engines/sci/include/sci_dos.h b/engines/sci/include/sci_dos.h index 69e8803e29..97e56f712d 100644 --- a/engines/sci/include/sci_dos.h +++ b/engines/sci/include/sci_dos.h @@ -74,9 +74,6 @@ extern gpointer g_malloc0(guint32 size); /* directory separator */ #define G_DIR_SEPARATOR_S "/" -/* paths longer than 128 chars? nah... */ -#define PATH_MAX 128 - #define SSIZE_MAX 1024 #define g_get_current_time(x) gettimeofday(x,NULL) diff --git a/engines/sci/scicore/decompress01.cpp b/engines/sci/scicore/decompress01.cpp index e08e98f95b..1f9d429b90 100644 --- a/engines/sci/scicore/decompress01.cpp +++ b/engines/sci/scicore/decompress01.cpp @@ -44,7 +44,7 @@ struct tokenlist { static gint8 stak[0x1014] = {0}; static gint8 lastchar = 0; static gint16 stakptr = 0; -static guint16 numbits, bitstring, lastbits, decryptstart; +static guint16 numbits, s_bitstring, lastbits, decryptstart; static gint16 curtoken, endtoken; @@ -53,7 +53,7 @@ guint32 gbits(int numbits, guint8 * data, int dlen); void decryptinit3(void) { int i; - lastchar = lastbits = bitstring = stakptr = 0; + lastchar = lastbits = s_bitstring = stakptr = 0; numbits = 9; curtoken = 0x102; endtoken = 0x1ff; @@ -73,26 +73,26 @@ int decrypt3(guint8 *dest, guint8 *src, int length, int complength) switch (decryptstart) { case 0: case 1: - bitstring = gbits(numbits, src, complength); - if (bitstring == 0x101) { /* found end-of-data signal */ + s_bitstring = gbits(numbits, src, complength); + if (s_bitstring == 0x101) { /* found end-of-data signal */ decryptstart = 4; return 0; } if (decryptstart == 0) { /* first char */ decryptstart = 1; - lastbits = bitstring; - *(dest++) = lastchar = (bitstring & 0xff); + lastbits = s_bitstring; + *(dest++) = lastchar = (s_bitstring & 0xff); if (--length != 0) continue; return 0; } - if (bitstring == 0x100) { /* start-over signal */ + if (s_bitstring == 0x100) { /* start-over signal */ numbits = 9; endtoken = 0x1ff; curtoken = 0x102; decryptstart = 0; continue; } - token = bitstring; + token = s_bitstring; if (token >= curtoken) { /* index past current point */ token = lastbits; stak[stakptr++] = lastchar; @@ -122,7 +122,7 @@ int decrypt3(guint8 *dest, guint8 *src, int length, int complength) endtoken++; } } - lastbits = bitstring; + lastbits = s_bitstring; continue; /* When are "break" and "continue" synonymous? */ case 4: return 0; diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index 5a60ad1ad8..8719351d69 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -489,7 +489,7 @@ _scir_scan_new_sources(resource_mgr_t *mgr, int *detected_version, resource_sour int preset_version = mgr->sci_version; int resource_error = 0; int dummy = mgr->sci_version; - resource_t **concat_ptr = &(mgr->resources[mgr->resources_nr-1].next); +// resource_t **concat_ptr = &(mgr->resources[mgr->resources_nr-1].next); if (detected_version == NULL) detected_version = &dummy; diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index c54ff01732..618207239f 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -1879,7 +1879,7 @@ songit_next(song_iterator_t **it, unsigned char *buf, int *result, int mask) do { retval = (*it)->next(*it, buf, result); if (retval == SI_MORPH) { - fprintf(stderr, " Morphing %p (stored at %p)\n", *it, it); + fprintf(stderr, " Morphing %p (stored at %p)\n", (void *)*it, (void *)it); if (!SIMSG_SEND((*it), SIMSG_ACK_MORPH)) { BREAKPOINT(); } else fprintf(stderr, "SI_MORPH successful\n"); diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 2a4c23fa97..794ed36314 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -30,6 +30,8 @@ #include "sci/sfx/softseq.h" #include "sci/sfx/mixer.h" +#include // for close() + static song_iterator_t *play_it; static int play_paused = 0; static sfx_softseq_t *seq; -- cgit v1.2.3