[Scummvm-cvs-logs] SF.net SVN: scummvm:[39996] scummvm/trunk/engines/sci
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Sat Apr 18 23:18:30 CEST 2009
Revision: 39996
http://scummvm.svn.sourceforge.net/scummvm/?rev=39996&view=rev
Author: wjpalenstijn
Date: 2009-04-18 21:18:30 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Retreive -> retrieve
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/said.cpp
scummvm/trunk/engines/sci/engine/said.y
scummvm/trunk/engines/sci/engine/vm.h
scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
scummvm/trunk/engines/sci/gfx/gfx_widgets.h
scummvm/trunk/engines/sci/gfx/operations.h
Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/engine/said.cpp 2009-04-18 21:18:30 UTC (rev 39996)
@@ -2072,7 +2072,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/said.y
===================================================================
--- scummvm/trunk/engines/sci/engine/said.y 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/engine/said.y 2009-04-18 21:18:30 UTC (rev 39996)
@@ -428,7 +428,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/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-04-18 21:18:30 UTC (rev 39996)
@@ -811,7 +811,7 @@
*/
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
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-04-18 21:18:30 UTC (rev 39996)
@@ -113,14 +113,14 @@
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 @@
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 @@
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 @@
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
Modified: scummvm/trunk/engines/sci/gfx/gfx_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_widgets.h 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/gfx/gfx_widgets.h 2009-04-18 21:18:30 UTC (rev 39996)
@@ -435,7 +435,7 @@
*/
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
Modified: scummvm/trunk/engines/sci/gfx/operations.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.h 2009-04-18 21:18:23 UTC (rev 39995)
+++ scummvm/trunk/engines/sci/gfx/operations.h 2009-04-18 21:18:30 UTC (rev 39996)
@@ -386,7 +386,7 @@
*/
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_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_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
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