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

Fixed compilation under MSVC, and silenced some more warnings

Browse source 
svn-id: r38247
This commit is contained in:
Filippos Karapetis 2009-02-15 14:52:51 +00:00
parent dee51a77b5
commit aa3f10b2fd
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/klists.cpp
View file

@ -124,7 +124,7 @@ static inline int
sane_nodep(state_t *s, reg_t addr) sane_nodep(state_t *s, reg_t addr)
{ {
int have_prev = 0; int have_prev = 0;
reg_t prev; reg_t prev = addr;
do { do {
node_t *node = LOOKUP_NODE(addr); node_t *node = LOOKUP_NODE(addr);

10
engines/sci/engine/scriptconsole.cpp
View file

@ -395,7 +395,7 @@ parse_reg_t(state_t *s, const char *str, reg_t *dest)
} else if (*str == '&') { } else if (*str == '&') {
int script_nr; int script_nr;
/* Look up by script ID */ /* Look up by script ID */
char *colon = strchr(str, ':'); char *colon = (char *)strchr(str, ':');
if (!colon) if (!colon)
return 1; return 1;
@ -422,8 +422,8 @@ parse_reg_t(state_t *s, const char *str, reg_t *dest)
int i; int i;
/* Parse obj by name */ /* Parse obj by name */
tmp = strchr(str, '+'); tmp = (char *)strchr(str, '+');
str_suffix = strchr(str, '-'); str_suffix = (char *)strchr(str, '-');
if (tmp < str_suffix) if (tmp < str_suffix)
str_suffix = tmp; str_suffix = tmp;
if (str_suffix) { if (str_suffix) {
@ -431,7 +431,7 @@ parse_reg_t(state_t *s, const char *str, reg_t *dest)
*str_suffix = 0; *str_suffix = 0;
} }
tmp = strchr(str, '.'); tmp = (char *)strchr(str, '.');
if (tmp) { if (tmp) {
*tmp = 0; *tmp = 0;
@ -514,7 +514,7 @@ parse_reg_t(state_t *s, const char *str, reg_t *dest)
*str_suffix = suffchar; *str_suffix = suffchar;
rel_offsetting = 1; rel_offsetting = 1;
} else { } else {
char *colon = strchr(str, ':'); char *colon = (char *)strchr(str, ':');
if (!colon) { if (!colon) {
offsetting = str; offsetting = str;

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

@ -773,7 +773,7 @@ c_seginfo(state_t *s)
sciprintf("[%04x] ", nr); sciprintf("[%04x] ", nr);
_c_single_seg_info(s, s->seg_manager.heap[nr]); _c_single_seg_info(s, s->seg_manager.heap[nr]);
} }
} else for (i = 0; i < s->seg_manager.heap_size; i++) } else for (i = 0; i < (unsigned int) s->seg_manager.heap_size; i++)
if (s->seg_manager.heap[i]) { if (s->seg_manager.heap[i]) {
sciprintf("[%04x] ", i); sciprintf("[%04x] ", i);
_c_single_seg_info(s, s->seg_manager.heap[i]); _c_single_seg_info(s, s->seg_manager.heap[i]);
@ -1573,7 +1573,7 @@ disassemble(state_t *s, reg_t pos, int print_bw_tag, int print_bytecode)
while (stackframe > 0) { while (stackframe > 0) {
int argc = sb[- stackframe + 1].offset; int argc = sb[- stackframe + 1].offset;
const char *name = NULL; const char *name = NULL;
reg_t called_obj_addr; reg_t called_obj_addr = *p_objp;
if (opcode == op_send) if (opcode == op_send)
called_obj_addr = s->r_acc; called_obj_addr = s->r_acc;

2
engines/sci/engine/seg_manager.cpp
View file

@ -577,7 +577,7 @@ sm_get_heap (seg_manager_t* self, reg_t reg)
switch( mem_type ) { switch( mem_type ) {
case MEM_OBJ_SCRIPT: case MEM_OBJ_SCRIPT:
VERIFY( reg.offset + 1 < mem_obj->data.script.buf_size, "invalid offset\n" ); VERIFY( reg.offset + 1 < (unsigned int)mem_obj->data.script.buf_size, "invalid offset\n" );
return (unsigned char)mem_obj->data.script.buf[reg.offset] | return (unsigned char)mem_obj->data.script.buf[reg.offset] |
( ((unsigned char)mem_obj->data.script.buf[reg.offset+1]) << 8 ); ( ((unsigned char)mem_obj->data.script.buf[reg.offset+1]) << 8 );
case MEM_OBJ_CLONES: case MEM_OBJ_CLONES:

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

@ -163,7 +163,7 @@ menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char *entr
menu_t *menu; menu_t *menu;
char tracker; char tracker;
char *left = NULL, *right; char *left = NULL, *right;
reg_t left_origin; reg_t left_origin = entries_base;
int string_len = 0; int string_len = 0;
int tag = 0, c_width, max_width = 0; int tag = 0, c_width, max_width = 0;
int height; int height;

2
engines/sci/scicore/versions.cpp
View file

@ -354,7 +354,7 @@ version_guess_from_hashcode(sci_version_t *result, int *res_version, guint32 *co
*code = hash_code; *code = hash_code;
for (i = 0 ; sci_games[i].name ; i++) { for (i = 0 ; sci_games[i].name ; i++) {
if (sci_games[i].id == hash_code) { if ((unsigned int)sci_games[i].id == hash_code) {
*result = sci_games[i].version; *result = sci_games[i].version;
*res_version = sci_games[i].res_version; *res_version = sci_games[i].res_version;
return sci_games[i].name; return sci_games[i].name;