retreive->retrieve

svn-id: r38296

14 files changed, 24 insertions, 24 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index f80abf1647..cf33473907 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -61,7 +61,7 @@ _init_vocabulary(state_t *s) /* initialize vocabulary and related resources */
 	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;
 	}
 
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index 5296fc4b51..9a0401fa1d 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -2096,7 +2096,7 @@ aug_get_next_sibling(parse_tree_node_t *tree, int pos, int *first, int *second)
 	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);
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp
index aedd685ff6..bb8c053317 100644
--- a/engines/sci/engine/scriptconsole.cpp
+++ b/engines/sci/engine/scriptconsole.cpp
@@ -217,8 +217,8 @@ con_init_dmalloc()
 			  "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>");
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;
 	}
diff --git a/engines/sci/include/console.h b/engines/sci/include/console.h
index e56ab5e461..306582840d 100644
--- a/engines/sci/include/console.h
+++ b/engines/sci/include/console.h
@@ -156,7 +156,7 @@ cmd_param_t
 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.
 */
diff --git a/engines/sci/include/gfx_res_options.h b/engines/sci/include/gfx_res_options.h
index 8e3149368f..de0fc0b86e 100644
--- a/engines/sci/include/gfx_res_options.h
+++ b/engines/sci/include/gfx_res_options.h
@@ -72,7 +72,7 @@ typedef struct {
 	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;
 
diff --git a/engines/sci/include/gfx_widgets.h b/engines/sci/include/gfx_widgets.h
index 37d5557c7a..791b9335aa 100644
--- a/engines/sci/include/gfx_widgets.h
+++ b/engines/sci/include/gfx_widgets.h
@@ -437,7 +437,7 @@ gfxw_new_port(gfxw_visual_t *visual, gfxw_port_t *predecessor, rect_t area, gfx_
 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_find_port(gfxw_visual_t *visual, int ID);
 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.
diff --git a/engines/sci/include/sbtree.h b/engines/sci/include/sbtree.h
index 38f8a71ba1..9fdd1a5f1d 100644
--- a/engines/sci/include/sbtree.h
+++ b/engines/sci/include/sbtree.h
@@ -80,7 +80,7 @@ void *
 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,
diff --git a/engines/sci/include/vm.h b/engines/sci/include/vm.h
index 1bf3353c3d..31141126ff 100644
--- a/engines/sci/include/vm.h
+++ b/engines/sci/include/vm.h
@@ -760,7 +760,7 @@ script_map_selectors(struct _state *s, selector_map_t *map);
 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().
 */
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index 8719351d69..5d9dff5091 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -634,7 +634,7 @@ scir_new_resource_manager(char *dir, int version,
 			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);
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 5617defbbc..7c5b7c12ee 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -580,7 +580,7 @@ mix_compute_input_linear(sfx_pcm_mixer_t *self, int add_result,
 	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