aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2009-04-18 21:18:30 +0000
committerWillem Jan Palenstijn2009-04-18 21:18:30 +0000
commite1c82543fcaae786d2c6d7588338b92810af01d6 (patch)
treeff251605bc6ee757668b1199f6b3773a113a8f25
parent8c60930aaa0c4cc8b2ee55d0465c2918a68acf8c (diff)
downloadscummvm-rg350-e1c82543fcaae786d2c6d7588338b92810af01d6.tar.gz
scummvm-rg350-e1c82543fcaae786d2c6d7588338b92810af01d6.tar.bz2
scummvm-rg350-e1c82543fcaae786d2c6d7588338b92810af01d6.zip
Retreive -> retrieve
svn-id: r39996
-rw-r--r--engines/sci/engine/said.cpp2
-rw-r--r--engines/sci/engine/said.y2
-rw-r--r--engines/sci/engine/vm.h2
-rw-r--r--engines/sci/gfx/gfx_resmgr.h10
-rw-r--r--engines/sci/gfx/gfx_widgets.h2
-rw-r--r--engines/sci/gfx/operations.h6
6 files changed, 12 insertions, 12 deletions
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index 1681160247..a9850aec51 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -2072,7 +2072,7 @@ static int aug_get_next_sibling(parse_tree_node_t *tree, int pos, int *first, in
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/said.y b/engines/sci/engine/said.y
index 839c00d19e..e8e5a73c20 100644
--- a/engines/sci/engine/said.y
+++ b/engines/sci/engine/said.y
@@ -428,7 +428,7 @@ static int aug_get_next_sibling(parse_tree_node_t *tree, int pos, int *first, in
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/vm.h b/engines/sci/engine/vm.h
index 164f17c757..78b62b7524 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -811,7 +811,7 @@ const char *obj_get_name(EngineState *s, reg_t pos);
*/
Object *obj_get(EngineState *s, reg_t offset);
-/* Retreives an object from the specified location
+/* Retrieves an object from the specified location
** Parameters: (EngineState *) s: Pointer to the EngineState to operate on
** (reg_t) offset: The object's offset
** Returns : (Object *) The object in question, or NULL if there is none
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index b699c87430..ddc197a95e 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -113,14 +113,14 @@ public:
void tagResources() { _tagLockCounter++; }
- /* Retreives an SCI0/SCI01 mouse cursor
+ /* Retrieves an SCI0/SCI01 mouse cursor
** Parameters: (int) num: The cursor number
** Returns : (gfx_font_t *) The approprate cursor as a pixmap, or NULL on error
*/
gfx_pixmap_t *getCursor(int num);
- /* Retreives the static palette from the interpreter-specific code
+ /* Retrieves the static palette from the interpreter-specific code
** Parameters: (int *) colors_nr: Number of colors to use
** (int) nr: The palette to read
** Returns : (gfx_pixmap_color_t *) *colors_nr static color entries
@@ -129,7 +129,7 @@ public:
Palette *getPalette(int *colors_nr, int num = 999);
- /* Retreives a font
+ /* Retrieves a font
** Parameters: (int) nr: The font number
** (int) scaled: Whether the font should be font-scaled
** Returns : (gfx_font_t *) The appropriate font, or NULL on error
@@ -137,7 +137,7 @@ public:
gfx_bitmap_font_t *getFont(int num, bool scaled = false);
- /* Retreives a translated view cel
+ /* Retrieves a translated view cel
** Parameters:
** (int) nr: The view number
** (int *) loop: Pointer to a variable containing the loop number
@@ -151,7 +151,7 @@ public:
gfxr_view_t *getView(int nr, int *loop, int *cel, int palette);
- /* Retreives a displayable (translated) pic resource
+ /* Retrieves a displayable (translated) pic resource
** Parameters: (int) nr: Number of the pic resource
** (int) maps: The maps to translate (ORred GFX_MASK_*)
** (int) flags: Interpreter-dependant pic flags
diff --git a/engines/sci/gfx/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h
index fabe6c1979..3cae3afb0e 100644
--- a/engines/sci/gfx/gfx_widgets.h
+++ b/engines/sci/gfx/gfx_widgets.h
@@ -435,7 +435,7 @@ gfxw_port_t *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
+/* Retrieves the default port from a visual
** 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
diff --git a/engines/sci/gfx/operations.h b/engines/sci/gfx/operations.h
index d88f70724d..d680229549 100644
--- a/engines/sci/gfx/operations.h
+++ b/engines/sci/gfx/operations.h
@@ -386,7 +386,7 @@ int gfxop_set_pointer_position(gfx_state_t *state, Common::Point pos);
*/
sci_event_t gfxop_get_event(gfx_state_t *state, unsigned int mask);
-/* Retreives the next input event from the driver
+/* Retrieves the next input event from the driver
** Parameters: (gfx_state_t *) state: The affected state
** (int) mask: The event mask to poll from (see uinput.h)
** Returns : (sci_event_t) The next event in the driver's event queue, or
@@ -443,7 +443,7 @@ int gfxop_overflow_cel(gfx_state_t *state, int nr, int *loop, int *cel);
int gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
int *width, int *height, Common::Point *offset);
-/* Retreives the width and height of a cel
+/* Retrieves the width and height of a cel
** Parameters: (gfx_state_t *) state: The state to use
** (int) nr: Number of the view
** (int) loop: Loop number to examine
@@ -516,7 +516,7 @@ int gfxop_new_pic(gfx_state_t *state, int nr, int flags, int default_palette);
*/
int *gfxop_get_pic_metainfo(gfx_state_t *state);
-/* Retreives all meta-information assigned to the current pic
+/* Retrieves all meta-information assigned to the current pic
** Parameters: (gfx_state_t *) state: The state affected
** Returns : (int *) NULL if the pic doesn't exist or has no meta-information,
** the meta-info otherwise