diff options
| author | Johannes Schickel | 2009-02-15 14:59:03 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-02-15 14:59:03 +0000 |
| commit | e1b36cf2cd8a78782c9e177cb6f06c290bfeb585 (patch) | |
| tree | c4fd78dfcfae3b0b7ea5789ca2d9b99d44c55841 /engines | |
| parent | 3ea3141e9091e349b6dbcd4b6a79ceba5f62e14f (diff) | |
| download | scummvm-rg350-e1b36cf2cd8a78782c9e177cb6f06c290bfeb585.tar.gz scummvm-rg350-e1b36cf2cd8a78782c9e177cb6f06c290bfeb585.tar.bz2 scummvm-rg350-e1b36cf2cd8a78782c9e177cb6f06c290bfeb585.zip | |
Fixed some warnings.
svn-id: r38249
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/grammar.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kfile.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index ae96990b10..311679ed87 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -56,7 +56,7 @@ vocab_print_rule(parse_rule_t *rule) sciprintf("e"); for(i = 0; i < rule->length; i++) { - int token = rule->data[i]; + uint token = rule->data[i]; if (token == TOKEN_OPAREN) { @@ -529,9 +529,9 @@ static int _vbpt_write_subexpression(parse_tree_node_t *nodes, int *pos, parse_rule_t *rule, int rulepos, int writepos) { - int token; + uint token; while ((token = ((rulepos < rule->length)? rule->data[rulepos++] : TOKEN_CPAREN)) != TOKEN_CPAREN) { - int nexttoken = (rulepos < rule->length)? rule->data[rulepos] : TOKEN_CPAREN; + uint nexttoken = (rulepos < rule->length)? rule->data[rulepos] : TOKEN_CPAREN; if (token == TOKEN_OPAREN) { int wpold; int writepos2 = _vbpt_pareno(nodes, pos, wpold = writepos); diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 7498d9763b..3737cd4cad 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -732,7 +732,7 @@ kstub(state_t *s, int funct_nr, int argc, reg_t *argv) reg_t kNOP(state_t *s, int funct_nr, int argc, reg_t *argv) { - char *problem = (char*)(s->kfunct_table[funct_nr].orig_name ? + const char *problem = (const char*)(s->kfunct_table[funct_nr].orig_name ? "unmapped" : "NOP"); SCIkwarn(SCIkWARNING, "Warning: Kernel function 0x%02x invoked: %s", funct_nr, problem); diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 6af5cb7b86..90cea6bdf2 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -919,7 +919,7 @@ kSaveGame(state_t *s, int funct_nr, int argc, reg_t *argv) if ((idfile = sci_fopen(game_id_file_name, "w"))) { - fprintf(idfile, game_description); + fprintf(idfile, "%s", game_description); fclose(idfile); } else { |