diff options
| author | Willem Jan Palenstijn | 2009-02-15 20:40:49 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-02-15 20:40:49 +0000 |
| commit | b484e828214db53176403a425c5b26065ce762af (patch) | |
| tree | 5a570dee4c3ba8736cd97a4278debdb1ec0a7abf /engines/sci/gfx | |
| parent | 3d5b349b7c881c6b208ceff7b0960a5a324b561c (diff) | |
| download | scummvm-rg350-b484e828214db53176403a425c5b26065ce762af.tar.gz scummvm-rg350-b484e828214db53176403a425c5b26065ce762af.tar.bz2 scummvm-rg350-b484e828214db53176403a425c5b26065ce762af.zip | |
retreive->retrieve
svn-id: r38296
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/gfx_test.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 10 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_resmgr.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/widgets.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/engines/sci/gfx/gfx_test.cpp b/engines/sci/gfx/gfx_test.cpp index 2b5b8f36ec..0170364b8d 100644 --- a/engines/sci/gfx/gfx_test.cpp +++ b/engines/sci/gfx/gfx_test.cpp @@ -351,7 +351,7 @@ gfxr_interpreter_calculate_pic(gfx_resstate_t *state, gfxr_pic_t *scaled_pic, gf fprintf(stderr,"Attempt to reference invalid pic #%d\n", nr); } - printf(">> resource manager retreived pic #%d\n", nr); + printf(">> resource manager retrieved pic #%d\n", nr); return GFX_OK; } @@ -434,7 +434,7 @@ gfxr_interpreter_get_view(gfx_resstate_t *state, int nr, void *internal, int pal loop->cels[i] = pxm; } - printf(">> resource manager retreived view #%d\n", nr); + printf(">> resource manager retrieved view #%d\n", nr); return view; } @@ -464,7 +464,7 @@ gfxr_interpreter_get_font(gfx_resstate_t *state, int nr, void *internal) font->char_size = ((BUILTIN_CHARS_WIDTH + 7) >> 3) * BUILTIN_CHARS_HEIGHT; font->data = memdup(builtin_font, font->char_size * BUILTIN_CHARS_NR); - printf(">> resource manager retreived font #%d\n", nr); + printf(">> resource manager retrieved font #%d\n", nr); return font; } @@ -543,7 +543,7 @@ gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *internal) return NULL; } - printf(">> resource manager retreived cursor #%d\n", nr); + printf(">> resource manager retrieved cursor #%d\n", nr); return cursor; } diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 9b15034c11..44d58f4a75 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1924,7 +1924,7 @@ gfxop_lookup_view_get_loops(gfx_state_t *state, int nr) view = gfxr_get_view(state->resstate, nr, &loop, &cel, 0); if (!view) { - GFXWARN("Attempt to retreive number of loops from invalid view %d\n", nr); + GFXWARN("Attempt to retrieve number of loops from invalid view %d\n", nr); return 0; } @@ -1943,7 +1943,7 @@ gfxop_lookup_view_get_cels(gfx_state_t *state, int nr, int loop) view = gfxr_get_view(state->resstate, nr, &real_loop, &cel, 0); if (!view) { - GFXWARN("Attempt to retreive number of cels from invalid/broken view %d\n", nr); + GFXWARN("Attempt to retrieve number of cels from invalid/broken view %d\n", nr); return 0; } else if (real_loop != loop) { GFXWARN("Loop number was corrected from %d to %d in view %d\n", loop, real_loop, nr); @@ -2127,13 +2127,13 @@ gfxop_new_pic(gfx_state_t *state, int nr, int flags, int default_palette) state->pic_unscaled = gfxr_get_pic(state->resstate, nr, GFX_MASK_VISUAL, flags, default_palette, 0); if (!state->pic || !state->pic_unscaled) { - GFXERROR("Could not retreive background pic %d!\n", nr); + GFXERROR("Could not retrieve background pic %d!\n", nr); if (state->pic) { - GFXERROR(" -- Inconsistency: scaled pic _was_ retreived!\n"); + GFXERROR(" -- Inconsistency: scaled pic _was_ retrieved!\n"); } if (state->pic_unscaled) { - GFXERROR(" -- Inconsistency: unscaled pic _was_ retreived!\n"); + GFXERROR(" -- Inconsistency: unscaled pic _was_ retrieved!\n"); } state->pic = state->pic_unscaled = NULL; diff --git a/engines/sci/gfx/resource/sci_resmgr.cpp b/engines/sci/gfx/resource/sci_resmgr.cpp index f0a64dd260..ad756afecd 100644 --- a/engines/sci/gfx/resource/sci_resmgr.cpp +++ b/engines/sci/gfx/resource/sci_resmgr.cpp @@ -237,7 +237,7 @@ gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *internal) return NULL; if (state->version >= SCI_VERSION_1_1) { - GFXWARN("Attempt to retreive cursor in SCI1.1 or later\n"); + GFXWARN("Attempt to retrieve cursor in SCI1.1 or later\n"); return NULL; } diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/widgets.cpp index 502bc45e95..778a0eb5ae 100644 --- a/engines/sci/gfx/widgets.cpp +++ b/engines/sci/gfx/widgets.cpp @@ -750,7 +750,7 @@ _gfxw_new_simple_view(gfx_state_t *state, point_t pos, int view, int loop, int c } if (gfxop_get_cel_parameters(state, view, loop, cel, &width, &height, &offset)) { - GFXERROR("Attempt to retreive cel parameters for (%d/%d/%d) failed (Maybe the values weren't checked beforehand?)\n", + GFXERROR("Attempt to retrieve cel parameters for (%d/%d/%d) failed (Maybe the values weren't checked beforehand?)\n", view, cel, loop); return NULL; } @@ -1051,7 +1051,7 @@ gfxw_new_dyn_view(gfx_state_t *state, point_t pos, int z, int view, int loop, in } if (gfxop_get_cel_parameters(state, view, loop, cel, &width, &height, &offset)) { - GFXERROR("Attempt to retreive cel parameters for (%d/%d/%d) failed (Maybe the values weren't checked beforehand?)\n", + GFXERROR("Attempt to retrieve cel parameters for (%d/%d/%d) failed (Maybe the values weren't checked beforehand?)\n", view, cel, loop); return NULL; } |
