diff options
| author | Max Horn | 2004-04-25 14:42:14 +0000 |
|---|---|---|
| committer | Max Horn | 2004-04-25 14:42:14 +0000 |
| commit | d4f876b37df0fdc772936eedf9b112802987254b (patch) | |
| tree | c7e782e5846dd153159c574ca9cb2ca250dfd34f /saga/script.cpp | |
| parent | f9cd78cedd48371f8aa9d98cbcdeb879fe543fac (diff) | |
| download | scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.tar.gz scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.tar.bz2 scummvm-rg350-d4f876b37df0fdc772936eedf9b112802987254b.zip | |
Fix many warnings; use C++ type system instead of C style typedefs; removed various unused stuff; const correctness; etc.
svn-id: r13622
Diffstat (limited to 'saga/script.cpp')
| -rw-r--r-- | saga/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/saga/script.cpp b/saga/script.cpp index 4c84a9e069..5c9a0db422 100644 --- a/saga/script.cpp +++ b/saga/script.cpp @@ -415,7 +415,7 @@ int SCRIPT_Free(void) return R_SUCCESS; } -R_SCRIPT_BYTECODE *SCRIPT_LoadBytecode(const uchar * bytecode_p, +R_SCRIPT_BYTECODE *SCRIPT_LoadBytecode(uchar * bytecode_p, size_t bytecode_len) /*--------------------------------------------------------------------------*\ * Reads the entrypoint table from a script bytecode resource in memory. @@ -539,7 +539,7 @@ R_DIALOGUE_LIST *SCRIPT_LoadDialogue(const uchar * dialogue_p, dialogue_list->n_dialogue = n_dialogue; /* Allocate table of string pointers */ - dialogue_list->str = (char **)malloc(n_dialogue * sizeof(char *)); + dialogue_list->str = (const char **)malloc(n_dialogue * sizeof(const char *)); if (dialogue_list->str == NULL) { free(dialogue_list); return NULL; @@ -565,7 +565,7 @@ R_DIALOGUE_LIST *SCRIPT_LoadDialogue(const uchar * dialogue_p, free(dialogue_list); return NULL; } - dialogue_list->str[i] = (char *)dialogue_p + offset; + dialogue_list->str[i] = (const char *)dialogue_p + offset; dialogue_list->str_off[i] = offset; } |