[Scummvm-cvs-logs] SF.net SVN: scummvm:[38296] scummvm/trunk/engines/sci
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Sun Feb 15 21:40:49 CET 2009
Revision: 38296
http://scummvm.svn.sourceforge.net/scummvm/?rev=38296&view=rev
Author: wjpalenstijn
Date: 2009-02-15 20:40:49 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
retreive->retrieve
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/said.cpp
scummvm/trunk/engines/sci/engine/scriptconsole.cpp
scummvm/trunk/engines/sci/gfx/gfx_test.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
scummvm/trunk/engines/sci/gfx/widgets.cpp
scummvm/trunk/engines/sci/include/console.h
scummvm/trunk/engines/sci/include/gfx_res_options.h
scummvm/trunk/engines/sci/include/gfx_widgets.h
scummvm/trunk/engines/sci/include/sbtree.h
scummvm/trunk/engines/sci/include/vm.h
scummvm/trunk/engines/sci/scicore/resource.cpp
scummvm/trunk/engines/sci/sfx/mixer/soft.cpp
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -61,7 +61,7 @@
s->opcodes = vocabulary_get_opcodes(s->resmgr);
if (!(s->selector_names = vocabulary_get_snames(s->resmgr, NULL, s->version))) {
- sciprintf("_init_vocabulary(): Could not retreive selector names (vocab.997)!\n");
+ sciprintf("_init_vocabulary(): Could not retrieve selector names (vocab.997)!\n");
return 1;
}
Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/engine/said.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -2096,7 +2096,7 @@
AUG_READ_BRANCH(seek, 0, pos);
AUG_ASSERT(seek);
- /* Now retreive first value */
+ /* Now retrieve first value */
AUG_READ_BRANCH(valpos, 0, seek);
AUG_ASSERT(valpos);
AUG_READ_VALUE(*first, valpos);
Modified: scummvm/trunk/engines/sci/engine/scriptconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptconsole.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/engine/scriptconsole.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -217,8 +217,8 @@
"Gets a mark describing\n the current heap state\n\nUSAGE\n\n dm_mark\n\n"
" The mark is written to the\n dmalloc output file and\n to sci output.\n\nSEE ALSO\n\n cm_chmark");
con_hook_command (c_dm_chmark, "dm_chmark", "s",
- "Checks changes in the\n heap state since a certain\n mark was retreived\n\n"
- "USAGE\n\n c_dm_chmark <mark>\n\n Output is written to the\n dmalloc output file.\n\n Use dm_mark to retreive a\n"
+ "Checks changes in the\n heap state since a certain\n mark was retrieved\n\n"
+ "USAGE\n\n c_dm_chmark <mark>\n\n Output is written to the\n dmalloc output file.\n\n Use dm_mark to retrieve a\n"
" mark.\n\nSEE ALSO\n\n c_dm_mark");
con_hook_command (c_dm_print, "dm_print", "s*",
"Prints something to the\n dmalloc output.\n\nUSAGE\n\n dm_print <text>");
Modified: scummvm/trunk/engines/sci/gfx/gfx_test.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_test.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/gfx/gfx_test.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -351,7 +351,7 @@
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 @@
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 @@
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 @@
return NULL;
}
- printf(">> resource manager retreived cursor #%d\n", nr);
+ printf(">> resource manager retrieved cursor #%d\n", nr);
return cursor;
}
Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -1924,7 +1924,7 @@
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 @@
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 @@
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;
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -237,7 +237,7 @@
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;
}
Modified: scummvm/trunk/engines/sci/gfx/widgets.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/widgets.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/gfx/widgets.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -750,7 +750,7 @@
}
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 @@
}
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;
}
Modified: scummvm/trunk/engines/sci/include/console.h
===================================================================
--- scummvm/trunk/engines/sci/include/console.h 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/include/console.h 2009-02-15 20:40:49 UTC (rev 38296)
@@ -156,7 +156,7 @@
con_getopt(char *opt);
/* Retreives the specified optional parameter
** -- for use within console functions only --
-** Parameters: (char *) opt: The optional parameter to retreive
+** Parameters: (char *) opt: The optional parameter to retrieve
** Returns : (cmd_param_t) The corresponding parameter
** Should only be used if con_hasopt() reports its presence.
*/
Modified: scummvm/trunk/engines/sci/include/gfx_res_options.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_res_options.h 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/include/gfx_res_options.h 2009-02-15 20:40:49 UTC (rev 38296)
@@ -72,7 +72,7 @@
short type; /* GFX_RES_ASSIGN_TYPE_* */
union {
- byte factor[3]; /* divide by 16 to retreive factor */
+ byte factor[3]; /* divide by 16 to retrieve factor */
} mod;
} gfx_res_mod_t;
Modified: scummvm/trunk/engines/sci/include/gfx_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_widgets.h 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/include/gfx_widgets.h 2009-02-15 20:40:49 UTC (rev 38296)
@@ -437,7 +437,7 @@
gfxw_port_t *
gfxw_find_port(gfxw_visual_t *visual, int ID);
/* Retrieves a port with the specified ID
-** Parameters: (gfxw_visual_t *) visual: The visual the port is to be retreived from
+** Parameters: (gfxw_visual_t *) visual: The visual the port is to be retrieved from
** (int) ID: The port's ID
** Returns : (gfxw_port_t *) The requested port, or NULL if it didn't exist
** This function is O(1).
@@ -446,7 +446,7 @@
gfxw_port_t *
gfxw_find_default_port(gfxw_visual_t *visual);
/* Retreives the default port from a visual
-** Parameters: (gfxw_visual_t *) visual: The visual the port should be retreived from
+** Parameters: (gfxw_visual_t *) visual: The visual the port should be retrieved from
** Returns : (gfxw_port_t *) The default port, or NULL if no port is present
** The 'default port' is the last port to be instantiated; usually the topmost
** or highest-ranking port.
Modified: scummvm/trunk/engines/sci/include/sbtree.h
===================================================================
--- scummvm/trunk/engines/sci/include/sbtree.h 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/include/sbtree.h 2009-02-15 20:40:49 UTC (rev 38296)
@@ -80,7 +80,7 @@
sbtree_get(sbtree_t *tree, int key);
/* Retreives a key
** Parameters: (sbtree_t *) tree: The tree to search in
-** (int) key: The key to retreive
+** (int) key: The key to retrieve
** Returns : (void *) The value mapped to the key
** If key was not found/invalid, NULL is returned. Note that there is no
** way of distinguishing between keys mapped to NULL and invalid keys,
Modified: scummvm/trunk/engines/sci/include/vm.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm.h 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/include/vm.h 2009-02-15 20:40:49 UTC (rev 38296)
@@ -760,7 +760,7 @@
int
script_map_kernel(struct _state *s);
/* Maps kernel functions
-** Parameters: (state_t *) s: The state which the kernel_names are retreived from
+** Parameters: (state_t *) s: The state which the kernel_names are retrieved from
** Returns : (void)
** This function reads from and writes to s. It is called by script_run().
*/
Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -634,7 +634,7 @@
free(mgr->resources);
mgr->resources = NULL;
}
- sciprintf("Resmgr: Could not retreive a resource list!\n");
+ sciprintf("Resmgr: Could not retrieve a resource list!\n");
_scir_free_resource_sources(mgr->sources);
sci_free(mgr);
chdir(caller_cwd);
Modified: scummvm/trunk/engines/sci/sfx/mixer/soft.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/mixer/soft.cpp 2009-02-15 20:39:05 UTC (rev 38295)
+++ scummvm/trunk/engines/sci/sfx/mixer/soft.cpp 2009-02-15 20:40:49 UTC (rev 38296)
@@ -580,7 +580,7 @@
int write_offset; /* Iterator for translation */
int delay_frames = 0; /* Number of frames (dest buffer) at the beginning we skip */
- /* First, compute the number of frames we want to retreive */
+ /* First, compute the number of frames we want to retrieve */
frames_nr = fs->spd.val * len;
/* A little complicated since we must consider partial frames */
frames_nr += (fs->spd.nom * len
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list