[Scummvm-cvs-logs] SF.net SVN: scummvm:[38319] scummvm/trunk/engines/sci/include
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Feb 15 23:32:57 CET 2009
Revision: 38319
http://scummvm.svn.sourceforge.net/scummvm/?rev=38319&view=rev
Author: fingolfin
Date: 2009-02-15 22:32:57 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: include dir
Modified Paths:
--------------
scummvm/trunk/engines/sci/include/conf_driver.h
scummvm/trunk/engines/sci/include/conf_extension.h
scummvm/trunk/engines/sci/include/console.h
scummvm/trunk/engines/sci/include/engine.h
scummvm/trunk/engines/sci/include/event.h
scummvm/trunk/engines/sci/include/game_select.h
scummvm/trunk/engines/sci/include/gfx_driver.h
scummvm/trunk/engines/sci/include/gfx_operations.h
scummvm/trunk/engines/sci/include/gfx_options.h
scummvm/trunk/engines/sci/include/gfx_res_options.h
scummvm/trunk/engines/sci/include/gfx_resmgr.h
scummvm/trunk/engines/sci/include/gfx_resource.h
scummvm/trunk/engines/sci/include/gfx_state_internal.h
scummvm/trunk/engines/sci/include/gfx_system.h
scummvm/trunk/engines/sci/include/gfx_tools.h
scummvm/trunk/engines/sci/include/gfx_widgets.h
scummvm/trunk/engines/sci/include/hashmap.h
scummvm/trunk/engines/sci/include/kdebug.h
scummvm/trunk/engines/sci/include/kernel.h
scummvm/trunk/engines/sci/include/menubar.h
scummvm/trunk/engines/sci/include/old_objects.h
scummvm/trunk/engines/sci/include/reg_t_hashmap.h
scummvm/trunk/engines/sci/include/resource.h
scummvm/trunk/engines/sci/include/sbtree.h
scummvm/trunk/engines/sci/include/sci_memory.h
scummvm/trunk/engines/sci/include/sci_widgets.h
scummvm/trunk/engines/sci/include/sciresource.h
scummvm/trunk/engines/sci/include/scitypes.h
scummvm/trunk/engines/sci/include/script.h
scummvm/trunk/engines/sci/include/seg_manager.h
scummvm/trunk/engines/sci/include/sfx_engine.h
scummvm/trunk/engines/sci/include/sfx_iterator.h
scummvm/trunk/engines/sci/include/sfx_iterator_internal.h
scummvm/trunk/engines/sci/include/sfx_pcm.h
scummvm/trunk/engines/sci/include/sfx_player.h
scummvm/trunk/engines/sci/include/sfx_songlib.h
scummvm/trunk/engines/sci/include/sfx_timer.h
scummvm/trunk/engines/sci/include/versions.h
scummvm/trunk/engines/sci/include/vm.h
scummvm/trunk/engines/sci/include/vm_types.h
scummvm/trunk/engines/sci/include/vocabulary.h
Modified: scummvm/trunk/engines/sci/include/conf_driver.h
===================================================================
--- scummvm/trunk/engines/sci/include/conf_driver.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/conf_driver.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -41,7 +41,8 @@
unsigned int type;
unsigned int flags;
union { char * str;
- int nr } default; /* Optional default value */
+ int nr
+ } default; /* Optional default value */
int min; /* For subrange types */
int max; /* For subrange types; for enum types */
conf_value_t *values; /* For enum types; NULL-terminated */
@@ -72,9 +73,10 @@
unsigned int dependencies; /* CONF_DRIVER_DEPENDENCY_* */
conf_option_t *options; /* Last option has name of NULL */
char * (*set_option)(void * self, /* points to base struct */
- conf_option_t *,
- union { char *str;
- int nr }); /* Set option, return static error (if applicable) or NULL on success */
+ conf_option_t *,
+ union { char *str;
+ int nr
+ }); /* Set option, return static error (if applicable) or NULL on success */
} conf_header_t; /* Universal driver header */
struct conf_driver;
@@ -94,23 +96,23 @@
typedef struct conf_driver {
conf_header_t header;
char * (*init)(struct conf_driver *self,
- struct conf_subsystem *owner); /* Initialise, return static error message on error or NULL on success.
+ struct conf_subsystem *owner); /* Initialise, return static error message on error or NULL on success.
** The owner is guaranteed to have been configured and guaranteed NOT to have
** been initialised. */
-
+
void (*exit)(void);
} conf_driver_t;
typedef struct conf_subsystem {
conf_header_t header;
char * (*init)(struct conf_subsystem *self,
- struct conf_main *main,
- struct conf_driver *driver); /* Initialise, return static error message on error or NULL on success.
+ struct conf_main *main,
+ struct conf_driver *driver); /* Initialise, return static error message on error or NULL on success.
** The driver is configured and initialised, the main reference configured but
** not initialised. */
void (*exit)(void);
char *(*get_default_driver)(struct conf_subsystem *self,
- int index); /* Get the nth default driver name, or NULL if there is none. These are tried in order if
+ int index); /* Get the nth default driver name, or NULL if there is none. These are tried in order if
** there is no explicit choice. */
conf_driver_t **builtin_drivers; /* NULL terminated list of built-in drivers */
char *dynamic_driver_prefix; /* string prefix to dynamically loaded drivers for this subsystem */
@@ -146,10 +148,11 @@
/* ---------------------------------------------- */
-char *
+char *
conf_default_set_option(void * self, conf_option_t *option,
- union { char *str;
- int nr } value);
+ union { char *str;
+ int nr
+ } value);
/* Default implementation of the option setting function
** Parameters: (void *) self: Reference to the structure we should be accessing
** (conf_option_t *) option: The option to set
Modified: scummvm/trunk/engines/sci/include/conf_extension.h
===================================================================
--- scummvm/trunk/engines/sci/include/conf_extension.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/conf_extension.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -25,7 +25,7 @@
***************************************************************************/
-/* Config extensions handle special-purpose configuration options such as the
+/* Config extensions handle special-purpose configuration options such as the
** graphics operations. To add new special-purpose operations, modify this file,
** the lexer, and conf_extensions.c.
*/
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <stdlib.h>
-#define CONF_EXT_TYPE_INVALID -1
+#define CONF_EXT_TYPE_INVALID -1
#define CONF_EXT_TYPE_GFX 0
typedef struct {
Modified: scummvm/trunk/engines/sci/include/console.h
===================================================================
--- scummvm/trunk/engines/sci/include/console.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/console.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -247,4 +247,4 @@
** Returns : (void)
*/
-#endif /* _SCI_CONSOLE_H_ */
+#endif /* _SCI_CONSOLE_H_ */
Modified: scummvm/trunk/engines/sci/include/engine.h
===================================================================
--- scummvm/trunk/engines/sci/include/engine.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/engine.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -83,8 +83,7 @@
int palette;
} drawn_pic_t;
-typedef struct _state
-{
+typedef struct _state {
int savegame_version;
int widget_serial_counter; /* Used for savegames */
@@ -298,10 +297,10 @@
*/
static inline
-reg_t not_register(state_t *s, reg_t r)
-{
+reg_t not_register(state_t *s, reg_t r) {
if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE)
- return make_reg(0, !r.offset); else
+ return make_reg(0, !r.offset);
+ else
return r;
}
Modified: scummvm/trunk/engines/sci/include/event.h
===================================================================
--- scummvm/trunk/engines/sci/include/event.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/event.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -5,7 +5,7 @@
struct _state;
-sci_event_t getEvent (struct _state *s);
+sci_event_t getEvent(struct _state *s);
/* Returns the next SCI_EV_* event
** Parameters: (struct state *) Current game state
** Returns : (sci_event_t) The next event, which may be any of the
Modified: scummvm/trunk/engines/sci/include/game_select.h
===================================================================
--- scummvm/trunk/engines/sci/include/game_select.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/game_select.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -3,15 +3,13 @@
#include "sci/include/list.h"
-typedef struct game
-{
+typedef struct game {
char *name;
char dir[MAXPATHLEN];
int conf_nr;
} game_t;
-typedef struct games_list
-{
+typedef struct games_list {
LIST_ENTRY(games_list) entries;
game_t game;
@@ -33,6 +31,6 @@
/* this can be used to generate code that creates a particular font at runtime */
/* this is meant to be used as a development tool */
void save_font(int id, gfx_bitmap_font_t* font)
-#endif
+#endif
#endif /* _SCI_GAME_SELECT_H */
Modified: scummvm/trunk/engines/sci/include/gfx_driver.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_driver.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_driver.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -148,7 +148,7 @@
/*** Initialization ***/
- int (*set_parameter) (struct _gfx_driver *drv, char *attribute, char *value);
+ int (*set_parameter)(struct _gfx_driver *drv, char *attribute, char *value);
/* Sets a driver-specific parameter
** Parameters: (gfx_driver_t *) drv: Pointer to the affected driver
** (char *) attribute: Name of the attribute/parameter to set
@@ -162,8 +162,8 @@
** console).
*/
- int (*init_specific) (struct _gfx_driver *drv, int xres, int yres,
- int bytespp);
+ int (*init_specific)(struct _gfx_driver *drv, int xres, int yres,
+ int bytespp);
/* Attempts to initialize a specific graphics mode
** Parameters: (gfx_driver_t *) drv: The affected driver
** (int x int) xres, yres: Horizontal and vertical scaling
@@ -180,7 +180,7 @@
** specified in gfx_tools.h.
*/
- int (*init) (struct _gfx_driver *drv);
+ int (*init)(struct _gfx_driver *drv);
/* Initialize any graphics mode
** Parameters: (gfx_driver_t *) drv: The affected driver
** Returns : (int) GFX_OK on success, GFX_FATAL otherwise.
@@ -192,7 +192,7 @@
** specified in gfx_tools.h.
*/
- void (*exit) (struct _gfx_driver *drv);
+ void (*exit)(struct _gfx_driver *drv);
/* Uninitializes the current graphics mode
** Paramters: (gfx_driver_t *) drv: The driver to uninitialize
** Return : (void)
@@ -206,10 +206,10 @@
/*** Drawing operations ***/
- int (*draw_line) (struct _gfx_driver *drv,
- point_t start, point_t end,
- gfx_color_t color,
- gfx_line_mode_t line_mode, gfx_line_style_t line_style);
+ int (*draw_line)(struct _gfx_driver *drv,
+ point_t start, point_t end,
+ gfx_color_t color,
+ gfx_line_mode_t line_mode, gfx_line_style_t line_style);
/* Draws a single line to the back buffer.
** Parameters: (gfx_driver_t *) drv: The driver affected
** (point_t) start: Starting point of the line to draw
@@ -227,9 +227,9 @@
** set.
*/
- int (*draw_filled_rect) (struct _gfx_driver *drv, rect_t rect,
- gfx_color_t color1, gfx_color_t color2,
- gfx_rectangle_fill_t shade_mode);
+ int (*draw_filled_rect)(struct _gfx_driver *drv, rect_t rect,
+ gfx_color_t color1, gfx_color_t color2,
+ gfx_rectangle_fill_t shade_mode);
/* Draws a single filled and possibly shaded rectangle to the back buffer.
** Parameters: (gfx_driver_t *) drv: The driver affected
** (rect_t *) rect: The rectangle to draw
@@ -244,7 +244,7 @@
/*** Pixmap operations ***/
- int (*register_pixmap) (struct _gfx_driver *drv, gfx_pixmap_t *pxm);
+ int (*register_pixmap)(struct _gfx_driver *drv, gfx_pixmap_t *pxm);
/* Registers a pixmap with the driver.
** Parameters: (gfx_driver_t *) drv: The driver
** (gfx_pixmap_t *) pxm: The pixmap to register
@@ -254,7 +254,7 @@
** pxm->internal may be used to store any handle or meta information.
*/
- int (*unregister_pixmap) (struct _gfx_driver *drv, gfx_pixmap_t *pxm);
+ int (*unregister_pixmap)(struct _gfx_driver *drv, gfx_pixmap_t *pxm);
/* Unregisters a pixmap previously registered with register_pixmap()
** Parameters: (gfx_driver_t *) drv: The driver
** (gfx_pixmap_t *) pxm: The pixmap to register
@@ -264,8 +264,8 @@
** GFX_CAPABILITY_PIXMAP_REGISTRY is set.
*/
- int (*draw_pixmap) (struct _gfx_driver *drv, gfx_pixmap_t *pxm, int priority,
- rect_t src, rect_t dest, gfx_buffer_t buffer);
+ int (*draw_pixmap)(struct _gfx_driver *drv, gfx_pixmap_t *pxm, int priority,
+ rect_t src, rect_t dest, gfx_buffer_t buffer);
/* Draws part of a pixmap to the static or back buffer
** Parameters: (gfx_driver_t *) drv: The affected driver
** (gfx_pixmap_t *) pxm: The pixmap to draw
@@ -281,8 +281,8 @@
** GFX_CAPABILITY_SCALEABLE_PIXMAPS is supported.
*/
- int (*grab_pixmap) (struct _gfx_driver *drv, rect_t src, gfx_pixmap_t *pxm,
- gfx_map_mask_t map);
+ int (*grab_pixmap)(struct _gfx_driver *drv, rect_t src, gfx_pixmap_t *pxm,
+ gfx_map_mask_t map);
/* Grabs an image from the visual or priority back buffer
** Parameters: (gfx_driver_t *) drv: The affected driver
** (rect_t) src: The rectangle to grab
@@ -298,8 +298,8 @@
/*** Buffer operations ***/
- int (*update) (struct _gfx_driver *drv, rect_t src, point_t dest,
- gfx_buffer_t buffer);
+ int (*update)(struct _gfx_driver *drv, rect_t src, point_t dest,
+ gfx_buffer_t buffer);
/* Updates the front buffer or the back buffers
** Parameters: (gfx_driver_t *) drv: The affected driver
** (rect_t) src: Source rectangle
@@ -314,8 +314,8 @@
** If they aren't, the priority map will not be required to be copied.
*/
- int (*set_static_buffer) (struct _gfx_driver *drv, gfx_pixmap_t *pic,
- gfx_pixmap_t *priority);
+ int (*set_static_buffer)(struct _gfx_driver *drv, gfx_pixmap_t *pic,
+ gfx_pixmap_t *priority);
/* Sets the contents of the static visual and priority buffers
** Parameters: (gfx_driver_t *) drv: The affected driver
** (gfx_pixmap_t *) pic: The image defining the new content
@@ -337,7 +337,7 @@
/*** Mouse pointer operations ***/
- int (*set_pointer) (struct _gfx_driver *drv, gfx_pixmap_t *pointer);
+ int (*set_pointer)(struct _gfx_driver *drv, gfx_pixmap_t *pointer);
/* Sets a new mouse pointer.
** Parameters: (gfx_driver_t *) drv: The driver to modify
** (gfx_pixmap_t *) pointer: The pointer to set, or NULL to set
@@ -354,8 +354,8 @@
/*** Palette operations ***/
- int (*set_palette) (struct _gfx_driver *drv, int index, byte red, byte green,
- byte blue);
+ int (*set_palette)(struct _gfx_driver *drv, int index, byte red, byte green,
+ byte blue);
/* Manipulates a palette index in the hardware palette
** Parameters: (gfx_driver_t *) drv: The driver affected
** (int) index: The index of the palette entry to modify
@@ -371,14 +371,14 @@
/*** Event management ***/
- sci_event_t (*get_event) (struct _gfx_driver *drv);
+ sci_event_t (*get_event)(struct _gfx_driver *drv);
/* Returns the next event in the event queue for this driver
** Parameters: (gfx_driver_t *) drv: The driver to query
** Returns : (sci_event_t) The oldest event still in the driver's event
** queue, or the null event if there is none.
*/
- int (*usec_sleep) (struct _gfx_driver *drv, long usecs);
+ int (*usec_sleep)(struct _gfx_driver *drv, long usecs);
/* Sleeps the specified amount of microseconds, or until the mouse moves
** Parameters: (gfx_driver_t *) drv: The relevant driver
** (long) usecs: Amount of microseconds to sleep
Modified: scummvm/trunk/engines/sci/include/gfx_operations.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_operations.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_operations.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -71,7 +71,7 @@
/* possible with alphaing, but there is no way to check for
** alpha capability of gfx_driver->draw_filled_rect() yet
*/
- ,GFX_BOX_SHADE_RIGHT_DOWN,
+ , GFX_BOX_SHADE_RIGHT_DOWN,
GFX_BOX_SHADE_LEFT_DOWN,
GFX_BOX_SHADE_RIGHT_UP,
GFX_BOX_SHADE_LEFT_UP
@@ -164,7 +164,7 @@
int
gfxop_init(gfx_state_t *state, int xfact, int yfact, gfx_color_mode_t bpp,
- gfx_options_t *options, void *misc_info);
+ gfx_options_t *options, void *misc_info);
/* Initializes a custom graphics mode
** Parameters: (gfx_state_t *) state: The state to initialize
** (int x int) xfact, yfact: Horizontal and vertical scale factors
@@ -244,9 +244,9 @@
int
gfxop_draw_line(gfx_state_t *state,
- point_t start, point_t end,
- gfx_color_t color, gfx_line_mode_t line_mode,
- gfx_line_style_t line_style);
+ point_t start, point_t end,
+ gfx_color_t color, gfx_line_mode_t line_mode,
+ gfx_line_style_t line_style);
/* Renders a clipped line to the back buffer
** Parameters: (gfx_state_t *) state: The state affected
** (point_t) start: Starting point of the line
@@ -259,7 +259,7 @@
int
gfxop_draw_rectangle(gfx_state_t *state, rect_t rect, gfx_color_t color, gfx_line_mode_t line_mode,
- gfx_line_style_t line_style);
+ gfx_line_style_t line_style);
/* Draws a non-filled rectangular box to the back buffer
** Parameters: (gfx_state_t *) state: The affected state
** (rect_t) rect: The rectangular area the box is drawn to
@@ -272,7 +272,7 @@
int
gfxop_draw_box(gfx_state_t *state, rect_t box, gfx_color_t color1, gfx_color_t color2,
- gfx_box_shade_t shade_type);
+ gfx_box_shade_t shade_type);
/* Draws a filled box to the back buffer
** Parameters: (gfx_state_t *) state: The affected state
** (rect_t) box: The area to draw to
@@ -349,7 +349,7 @@
int
gfxop_set_color(gfx_state_t *state, gfx_color_t *color, int r, int g, int b, int a,
- int priority, int control);
+ int priority, int control);
/* Maps an r/g/b value to a color and sets a gfx_color_t structure
** Parameters: (gfx_state_t *) state: The current state
** (gfx_color_t *) color: Pointer to the structure to write to
@@ -503,7 +503,7 @@
int
gfxop_get_cel_parameters(gfx_state_t *state, int nr, int loop, int cel,
- int *width, int *height, point_t *offset);
+ int *width, int *height, point_t *offset);
/* Retreives the width and height of a cel
** Parameters: (gfx_state_t *) state: The state to use
** (int) nr: Number of the view
@@ -518,7 +518,7 @@
int
gfxop_draw_cel(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
- gfx_color_t color, int palette);
+ gfx_color_t color, int palette);
/* Draws (part of) a cel to the back buffer
** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
** (int) nr: Number of the view to draw
@@ -533,7 +533,7 @@
int
gfxop_draw_cel_static(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
- gfx_color_t color, int palette);
+ gfx_color_t color, int palette);
/* Draws a cel to the static buffer; no clipping is performed
** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
** (int) nr: Number of the view to draw
@@ -549,7 +549,7 @@
int
gfxop_draw_cel_static_clipped(gfx_state_t *state, int nr, int loop, int cel, point_t pos,
- gfx_color_t color, int palette);
+ gfx_color_t color, int palette);
/* Draws (part of) a clipped cel to the static buffer
** Parameters: (gfx_state_t *) state: The state encapsulating the driver to draw with
** (int) nr: Number of the view to draw
@@ -617,8 +617,8 @@
int
gfxop_get_text_params(gfx_state_t *state, int font_nr, const char *text,
- int maxwidth, int *width, int *height, int flags,
- int *lines_nr, int *lineheight, int *lastline_width);
+ int maxwidth, int *width, int *height, int flags,
+ int *lines_nr, int *lineheight, int *lastline_width);
/* Calculates the width and height of a specified text in a specified font
** Parameters: (gfx_state_t *) state: The state to use
** (int) font_nr: Font number to use for the calculation
@@ -636,9 +636,9 @@
gfx_text_handle_t *
gfxop_new_text(gfx_state_t *state, int font_nr, char *text, int maxwidth,
- gfx_alignment_t halign, gfx_alignment_t valign,
- gfx_color_t color1, gfx_color_t color2, gfx_color_t bg_color,
- int flags);
+ gfx_alignment_t halign, gfx_alignment_t valign,
+ gfx_color_t color1, gfx_color_t color2, gfx_color_t bg_color,
+ int flags);
/* Generates a new text handle that can be used to draw any text
** Parameters: (gfx_state_t *) state: The state to use
** (int) font_nr: Font number to use for the calculation
Modified: scummvm/trunk/engines/sci/include/gfx_options.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_options.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_options.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -74,7 +74,7 @@
int dirty_frames;
int workarounds; /* Workaround flags- see below */
-
+
rect_t pic_port_bounds;
} gfx_options_t;
Modified: scummvm/trunk/engines/sci/include/gfx_res_options.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_res_options.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_res_options.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -109,7 +109,7 @@
int
gfx_update_conf(struct _gfx_options *options,
- char *line);
+ char *line);
/* Updates the configuration
** Parameters: (gfx_options_t *) options: The options list to update
** (char *) line: The text line to parse
@@ -121,7 +121,7 @@
int
gfx_get_res_config(struct _gfx_options *options,
- gfx_pixmap_t *pxm);
+ gfx_pixmap_t *pxm);
/* Configures a graphical pixmap according to config options
** Parameters: (gfx_options_t *) options: The options according to which
** configuration should be performed
Modified: scummvm/trunk/engines/sci/include/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_resmgr.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_resmgr.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -93,7 +93,7 @@
gfx_resstate_t *
gfxr_new_resource_manager(int version, struct _gfx_options *options,
- gfx_driver_t *driver, void *misc_payload);
+ gfx_driver_t *driver, void *misc_payload);
/* Allocates and initializes a new resource manager
** Parameters: (int) version: Interpreter version
** (gfx_options_t *): Pointer to all relevant drawing options
@@ -147,7 +147,7 @@
gfxr_pic_t *
gfxr_get_pic(gfx_resstate_t *state, int nr, int maps, int flags,
- int default_palette, int scaled);
+ int default_palette, int scaled);
/* Retreives a displayable (translated) pic resource
** Parameters: (gfx_resstate_t *) state: The resource state
** (int) nr: Number of the pic resource
@@ -162,7 +162,7 @@
gfxr_pic_t *
gfxr_add_to_pic(gfx_resstate_t *state, int old_nr, int new_nr, int maps, int flags,
- int old_default_palette, int default_palette, int scaled);
+ int old_default_palette, int default_palette, int scaled);
/* Retreives a displayable (translated) pic resource written ontop of an existing pic
** Parameters: (gfx_resstate_t *) state: The resource state
** (int) old_nr: Number of the pic resource to write on
@@ -226,7 +226,7 @@
int
gfxr_interpreter_options_hash(gfx_resource_type_t type, int version,
- struct _gfx_options *options, void *internal, int palette);
+ struct _gfx_options *options, void *internal, int palette);
/* Calculates a unique hash value for the specified options/type setup
** Parameters: (gfx_resource_type_t) type: The type the hash is to be generated for
** (int) version: The interpreter type and version
@@ -245,7 +245,7 @@
int *
gfxr_interpreter_get_resources(gfx_resstate_t *state, gfx_resource_type_t type,
- int version, int *entries_nr, void *internal);
+ int version, int *entries_nr, void *internal);
/* Retreives all resources of a specified type that are available from the interpreter
** Parameters: (gfx_resstate_t *) state: The relevant resource state
** (gfx_respirce_type_t) type: The resource type to query
@@ -282,7 +282,7 @@
int
gfxr_interpreter_calculate_pic(gfx_resstate_t *state, gfxr_pic_t *scaled_pic, gfxr_pic_t *unscaled_pic,
- int flags, int default_palette, int nr, void *internal);
+ int flags, int default_palette, int nr, void *internal);
/* Instructs the interpreter-specific code to calculate a picture
** Parameters: (gfx_resstate_t *) state: The resource state, containing options and version information
** (gfxr_pic_t *) scaled_pic: The pic structure that is to be written to
Modified: scummvm/trunk/engines/sci/include/gfx_resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_resource.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_resource.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -81,12 +81,12 @@
byte aux_map[GFXR_AUX_MAP_SIZE];
-/* Auxiliary map details:
-** Bit 0: Vis
-** Bit 1: Pri
-** Bit 2: Ctrl
-** Bit 3-5: 'filled' (all three bits are set to 1)
-*/
+ /* Auxiliary map details:
+ ** Bit 0: Vis
+ ** Bit 1: Pri
+ ** Bit 2: Ctrl
+ ** Bit 3-5: 'filled' (all three bits are set to 1)
+ */
rect_t bounds;
@@ -209,9 +209,9 @@
text_fragment_t *
gfxr_font_calculate_size(gfx_bitmap_font_t *font, int max_width, const char *text,
- int *width, int *height,
- int *lines, int *line_height, int *last_offset,
- int flags);
+ int *width, int *height,
+ int *lines, int *line_height, int *last_offset,
+ int flags);
/* Calculates the size that would be occupied by drawing a specified text
** Parameters: (gfx_bitmap_font_t *) font: The font to calculate with
** (int) max_width: Maximum pixel width allowed for the output
@@ -230,7 +230,7 @@
gfx_pixmap_t *
gfxr_draw_font(gfx_bitmap_font_t *font, const char *text, int characters,
- gfx_pixmap_color_t *fg0, gfx_pixmap_color_t *fg1, gfx_pixmap_color_t *bg);
+ gfx_pixmap_color_t *fg0, gfx_pixmap_color_t *fg1, gfx_pixmap_color_t *bg);
/* Draws text in a specific font to a pixmap
** Parameters: (gfx_bitmap_font_t *) font: The font to use for drawing
** (char *) text: The start of the text to draw
@@ -265,8 +265,8 @@
void
gfxr_draw_pic01(gfxr_pic_t *pic, int fill_normally, int default_palette,
- int size, byte *resource, gfxr_pic0_params_t *style, int resid, int sci1,
- gfx_pixmap_color_t *static_pal, int static_pal_nr);
+ int size, byte *resource, gfxr_pic0_params_t *style, int resid, int sci1,
+ gfx_pixmap_color_t *static_pal, int static_pal_nr);
/* Draws a pic resource (all formats prior to SCI1.1)
** Parameters: (gfxr_pic_t *) pic: The pic to draw to
** (int) fill_normally: If 1, the pic is drawn normally; if 0, all
@@ -287,8 +287,8 @@
void
gfxr_draw_pic11(gfxr_pic_t *pic, int fill_normally, int default_palette,
- int size, byte *resource, gfxr_pic0_params_t *style, int resid,
- gfx_pixmap_color_t *static_pal, int static_pal_nr);
+ int size, byte *resource, gfxr_pic0_params_t *style, int resid,
+ gfx_pixmap_color_t *static_pal, int static_pal_nr);
/* Draws a pic resource (SCI1.1)
** Parameters: (gfxr_pic_t *) pic: The pic to draw to
** (int) fill_normally: If 1, the pic is drawn normally; if 0, all
@@ -397,7 +397,7 @@
gfxr_view_t *
gfxr_draw_view1(int id, byte *resource, int size, gfx_pixmap_color_t *static_pal,
- int static_pal_nr);
+ int static_pal_nr);
/* Calculates an SCI1 view
** Parameters: (int) id: Resource ID of the view
** (byte *) resource: Pointer to the resource to read
@@ -424,14 +424,12 @@
static inline int
-get_uint_16(const byte *offset)
-{
+get_uint_16(const byte *offset) {
return ((unsigned int) offset[0] | (((unsigned int) offset[1]) << 8));
}
static inline int
-get_int_16(const byte *offset)
-{
+get_int_16(const byte *offset) {
return ((int) offset[0] | (((int) offset[1]) << 8));
}
Modified: scummvm/trunk/engines/sci/include/gfx_state_internal.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_state_internal.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_state_internal.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -150,10 +150,10 @@
typedef struct {
VIEW_COMMON;
/* fixme: This code is specific to SCI */
- rect_t draw_bounds; /* The correct position to draw to */
+ rect_t draw_bounds; /* The correct position to draw to */
void *under_bitsp, *signalp;
int under_bits, signal;
- int z; /* The z coordinate: Added to y, but used for sorting */
+ int z; /* The z coordinate: Added to y, but used for sorting */
int sequence; /* Sequence number: For sorting */
int force_precedence; /* Precedence enforcement variable for sorting- defaults to 0 */
} gfxw_dyn_view_t;
Modified: scummvm/trunk/engines/sci/include/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_system.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_system.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -68,7 +68,7 @@
int lockers; /* Number of pixmaps holding a lock on that color.
** 0 means that the color is unused, -1 means that it is
** "system allocated" and may not be freed. */
- byte r,g,b; /* Red, green, blue; intensity varies from 0 (min) to 255 (max) */
+ byte r, g, b; /* Red, green, blue; intensity varies from 0 (min) to 255 (max) */
} gfx_palette_color_t;
@@ -150,8 +150,7 @@
** Returns : (rect_t) A rectangle matching the supplied parameters
*/
static inline rect_t
-gfx_rect(int x, int y, int xl, int yl)
-{
+gfx_rect(int x, int y, int xl, int yl) {
rect_t rect;
rect.x = x;
@@ -171,10 +170,9 @@
** Returns : (int) 1 if they overlap, 0 otherwise
*/
static inline int
-gfx_rects_overlap(rect_t a, rect_t b)
-{
+gfx_rects_overlap(rect_t a, rect_t b) {
return (OVERLAP(a, b, x, xl) || OVERLAP(b, a, x, xl))
- && (OVERLAP(a, b, y, yl) || OVERLAP(b, a, y, yl));
+ && (OVERLAP(a, b, y, yl) || OVERLAP(b, a, y, yl));
}
#undef OVERLAP
@@ -200,8 +198,7 @@
** Returns : (rect_t) The smallest rect containing both a and b
*/
static inline rect_t
-gfx_rects_merge(rect_t a, rect_t b)
-{
+gfx_rects_merge(rect_t a, rect_t b) {
rect_t retval;
MERGE_PARTIAL(x, xl);
MERGE_PARTIAL(y, yl);
@@ -216,11 +213,10 @@
** Returns : non-zero iff for each pixel p in a the following holds: p is in b.
*/
static inline int
-gfx_rect_subset(rect_t a, rect_t b)
-{
+gfx_rect_subset(rect_t a, rect_t b) {
return ((a.x >= b.x) && (a.y >= b.y)
- && ((a.x + a.xl) <= (b.x + b.xl))
- && ((a.y + a.yl) <= (b.y + b.yl)));
+ && ((a.x + a.xl) <= (b.x + b.xl))
+ && ((a.y + a.yl) <= (b.y + b.yl)));
}
@@ -229,12 +225,11 @@
** Returns : (int) gfx_rect_subset(a,b) AND gfx_rect_subset(b,a)
*/
static inline int
-gfx_rect_equals(rect_t a, rect_t b)
-{
+gfx_rect_equals(rect_t a, rect_t b) {
return (a.x == b.x
- && a.xl == b.xl
- && a.y == b.y
- && a.yl == b.yl);
+ && a.xl == b.xl
+ && a.y == b.y
+ && a.yl == b.yl);
}
@@ -254,8 +249,7 @@
** Returns : (point_t) The resulting structure
*/
static inline point_t
-gfx_point(int x, int y)
-{
+gfx_point(int x, int y) {
point_t point;
point.x = x;
@@ -270,8 +264,7 @@
** Returns : (rect_t) The translated rect
*/
static inline rect_t
-gfx_rect_translate(rect_t rect, point_t offset)
-{
+gfx_rect_translate(rect_t rect, point_t offset) {
rect.x += offset.x;
rect.y += offset.y;
@@ -381,9 +374,9 @@
GFX_OK = 0, /* Indicates "operation successful" */
GFX_ERROR = -1, /* Indicates "operation failed" */
GFX_FATAL = -2
-/* Fatal error: Used by graphics drivers to indicate that they were unable to
-** do anything useful
-*/
+ /* Fatal error: Used by graphics drivers to indicate that they were unable to
+ ** do anything useful
+ */
};
Modified: scummvm/trunk/engines/sci/include/gfx_tools.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_tools.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_tools.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -50,8 +50,8 @@
gfx_mode_t *
gfx_new_mode(int xfact, int yfact, int bytespp, unsigned int red_mask, unsigned int green_mask,
- unsigned int blue_mask, unsigned int alpha_mask, int red_shift, int green_shift,
- int blue_shift, int alpha_shift, int palette, int flags);
+ unsigned int blue_mask, unsigned int alpha_mask, int red_shift, int green_shift,
+ int blue_shift, int alpha_shift, int palette, int flags);
/* Allocates a new gfx_mode_t structure with the specified parameters
** Parameters: (int x int) xfact x yfact: Horizontal and vertical scaling factors
** (int) bytespp: Bytes per pixel
@@ -160,7 +160,7 @@
void
gfx_draw_line_buffer(byte *buffer, int linewidth, int pixelwidth,
- point_t start, point_t end, unsigned int color);
+ point_t start, point_t end, unsigned int color);
/* Draws a line to a linear pixel buffer
** Parameters: (byte *) buffer: Pointer to the start of the buffer to draw to
** (int) linewidth: Number of bytes per pixel line in the buffer
@@ -217,9 +217,9 @@
int
gfx_crossblit_pixmap(gfx_mode_t *mode, gfx_pixmap_t *pxm, int priority,
- rect_t src_coords, rect_t dest_coords, byte *dest,
- int dest_line_width, byte *priority_dest,
- int priority_line_width, int priority_skip,
+ rect_t src_coords, rect_t dest_coords, byte *dest,
+ int dest_line_width, byte *priority_dest,
+ int priority_line_width, int priority_skip,
int flags);
/* Transfers the non-transparent part of a pixmap to a linear pixel buffer
** Parameters: (gfx_mode_t *) mode: The graphics mode of the target buffer
@@ -277,15 +277,15 @@
void
alpha_mvi_crossblit_32(byte *dest, byte *src, int bytes_per_dest_line, int bytes_per_src_line,
- int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
- unsigned int alpha_test_mask, int alpha_shift);
+ int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
+ unsigned int alpha_test_mask, int alpha_shift);
/* Internal function for accellerated 32 bit cross-blitting on Alpha hardware */
void
alpha_mvi_crossblit_32_P(byte *dest, byte *src, int bytes_per_dest_line, int bytes_per_src_line,
- int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
- unsigned int alpha_test_mask, int alpha_shift,
- byte *priority_pos, int bytes_per_priority_line, int bytes_per_priority_pixel, int priority);
+ int xl, int yl, byte *alpha, int bytes_per_alpha_line, int bytes_per_alpha_pixel,
+ unsigned int alpha_test_mask, int alpha_shift,
+ byte *priority_pos, int bytes_per_priority_line, int bytes_per_priority_pixel, int priority);
/* Internal function for accellerated 32 bit cross-blitting on Alpha hardware (with priority) */
#endif /* __alpha__ */
Modified: scummvm/trunk/engines/sci/include/gfx_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_widgets.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/gfx_widgets.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -161,7 +161,7 @@
** function.
**
**
-** -- superarea_of(gfxw_widget_t *self, gfxw_widget_t *other)
+** -- superarea_of(gfxw_widget_t *self, gfxw_widget_t *other)
** Tests whether drawing self after other would reduce all traces of other
** Parameters: (gfxw_widget_t *) self: self reference
** (gxfw_widget_t *) other: The widget to compare for containment
@@ -280,7 +280,7 @@
gfxw_view_t *
gfxw_new_view(gfx_state_t *state, point_t pos, int view, int loop, int cel, int palette, int priority, int control,
- gfx_alignment_t halign, gfx_alignment_t valign, int flags);
+ gfx_alignment_t halign, gfx_alignment_t valign, int flags);
/* Creates a new view (a cel, actually)
** Parameters: (gfx_state_t *) state: The graphics state
** (point_t) pos: The position to place the view at
@@ -295,8 +295,8 @@
gfxw_dyn_view_t *
gfxw_new_dyn_view(gfx_state_t *state, point_t pos, int z, int view, int loop, int cel, int palette,
- int priority, int control, gfx_alignment_t halign, gfx_alignment_t valign,
- int sequence);
+ int priority, int control, gfx_alignment_t halign, gfx_alignment_t valign,
+ int sequence);
/* Creates a new dyn view
** Parameters: (gfx_state_t *) state: The graphics state
** (point_t) pos: The position to place the dynamic view at
@@ -315,8 +315,8 @@
gfxw_text_t *
gfxw_new_text(gfx_state_t *state, rect_t area, int font, const char *text, gfx_alignment_t halign,
- gfx_alignment_t valign, gfx_color_t color1, gfx_color_t color2,
- gfx_color_t bgcolor, int flags);
+ gfx_alignment_t valign, gfx_color_t color1, gfx_color_t color2,
+ gfx_color_t bgcolor, int flags);
/* Creates a new text widget
** Parameters: (gfx_state_t *) state: The state the text is to be calculated from
** (rect_t) area: The area the text is to be confined to (the yl value is only
@@ -333,7 +333,7 @@
void
gfxw_text_info(gfx_state_t *state, gfxw_text_t *text, int *lines_nr,
- int *lineheight, int *offset);
+ int *lineheight, int *offset);
/* Determines text widget meta-information
** Parameters: (gfx_state_t *) state: The state to operate on
** (gfx_text_t *) text: The widget to query
@@ -497,7 +497,7 @@
*/
gfxw_snapshot_t *
-gfxw_restore_snapshot(gfxw_visual_t *visual, gfxw_snapshot_t *snapshot);
+gfxw_restore_snapshot(gfxw_visual_t *visual, gfxw_snapshot_t *snapshot);
/* Restores a snapshot to a visual
** Parameters: (gfxw_visual_t *) visual: The visual to operate on
** (gfxw_snapshot_t *) snapshot: The snapshot to restore
Modified: scummvm/trunk/engines/sci/include/hashmap.h
===================================================================
--- scummvm/trunk/engines/sci/include/hashmap.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/hashmap.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -37,7 +37,7 @@
** (e.g. '#define DUPLICATOR strdup').
*/
- /**-- WARNING!!! --**/
+/**-- WARNING!!! --**/
/* This file uses a lot of dark magic (aka preprocessor macros) to define
** its semantics. It is not to be taken lightly. It is not to be taken
@@ -78,7 +78,7 @@
TYPE##_hash_map_node_t *holes; /* List of freed entries to minimize \
** memory operations and modifications \
** to base_value */ \
-} TYPE##_hash_map_t, *TYPE##_hash_map_ptr;
+} TYPE##_hash_map_t, *TYPE##_hash_map_ptr;
#define DECLARE_FUNCTIONS(TYPE) \
Modified: scummvm/trunk/engines/sci/include/kdebug.h
===================================================================
--- scummvm/trunk/engines/sci/include/kdebug.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/kdebug.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -109,7 +109,7 @@
*/
void
-set_debug_mode (struct _state *s, int mode, const char *areas);
+set_debug_mode(struct _state *s, int mode, const char *areas);
extern int sci_debug_flags;
Modified: scummvm/trunk/engines/sci/include/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/include/kernel.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/kernel.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -96,10 +96,10 @@
read_selector(struct _state *s, reg_t object, selector_t selector_id, const char *fname, int line);
void
write_selector(struct _state *s, reg_t object, selector_t selector_id, reg_t value,
- const char *fname, int line);
+ const char *fname, int line);
int
invoke_selector(struct _state *s, reg_t object, int selector_id, int noinvalid, int kfunct,
- stack_ptr_t k_argp, int k_argc, const char *fname, int line, int argc, ...);
+ stack_ptr_t k_argp, int k_argc, const char *fname, int line, int argc, ...);
@@ -140,7 +140,7 @@
} \
sciprintf(")\n"); \
} \
-
+
#else /* !SCI_KERNEL_DEBUG */
#define CHECK_THIS_KERNEL_FUNCTION
@@ -281,7 +281,7 @@
*/
extern abs_rect_t
-get_nsrect(struct _state *s, reg_t object, byte clip);
+ get_nsrect(struct _state *s, reg_t object, byte clip);
/* Determines the now-seen rectangle of a view object
** Parameters: (state_t *) s: The state to use
** (reg_t) object: The object to check
@@ -293,10 +293,10 @@
void
_k_dyn_view_list_prepare_change(struct _state *s);
- /* Removes all views in anticipation of a new window or text */
+/* Removes all views in anticipation of a new window or text */
void
_k_dyn_view_list_accept_change(struct _state *s);
- /* Redraws all views after a new window or text was added */
+/* Redraws all views after a new window or text was added */
Modified: scummvm/trunk/engines/sci/include/menubar.h
===================================================================
--- scummvm/trunk/engines/sci/include/menubar.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/menubar.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -84,30 +84,30 @@
#define MENU_ATTRIBUTE_FLAGS_SAID 0x02
typedef struct {
- int type; /* Normal or hbar */
- char *keytext; /* right-centered part of the text (the key) */
- int keytext_size; /* Width of the right-centered text */
+ int type; /* Normal or hbar */
+ char *keytext; /* right-centered part of the text (the key) */
+ int keytext_size; /* Width of the right-centered text */
- int flags;
- byte said[MENU_SAID_SPEC_SIZE]; /* Said spec for this item */
- reg_t said_pos;
- char *text;
- reg_t text_pos;
- int modifiers, key; /* Hotkey for this item */
- int enabled;
- int tag;
+ int flags;
+ byte said[MENU_SAID_SPEC_SIZE]; /* Said spec for this item */
+ reg_t said_pos;
+ char *text;
+ reg_t text_pos;
+ int modifiers, key; /* Hotkey for this item */
+ int enabled;
+ int tag;
} menu_item_t;
typedef struct {
- char *title;
+ char *title;
- int title_width; /* Width of the title in pixels */
- int width; /* Pixel width of the menu window */
+ int title_width; /* Width of the title in pixels */
+ int width; /* Pixel width of the menu window */
- int items_nr; /* Window height equals to intems_nr * 10 */
- menu_item_t *items; /* Actual entries into the menu */
+ int items_nr; /* Window height equals to intems_nr * 10 */
+ menu_item_t *items; /* Actual entries into the menu */
} menu_t;
@@ -115,8 +115,8 @@
typedef struct {
- int menus_nr;
- menu_t *menus; /* The actual menus */
+ int menus_nr;
+ menu_t *menus; /* The actual menus */
} menubar_t;
Modified: scummvm/trunk/engines/sci/include/old_objects.h
===================================================================
--- scummvm/trunk/engines/sci/include/old_objects.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/old_objects.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -4,10 +4,9 @@
#include <sciresource.h>
#include <util.h>
-typedef FLEXARRAY(script_opcode,int number;) script_method;
+typedef FLEXARRAY(script_opcode, int number;) script_method;
-typedef struct object_
-{
+typedef struct object_ {
/*These are based on cached selector values, and set to the values
*the selectors had at load time. If the selectors are changed in
*instances, inconsistency will follow*/
@@ -24,12 +23,11 @@
int* selector_numbers;
} object;
-typedef struct
-{
- int id;
- object* classID;
- byte* heap;
- int offset;
+typedef struct {
+ int id;
+ object* classID;
+ byte* heap;
+ int offset;
} instance;
extern object **object_map, *object_root;
Modified: scummvm/trunk/engines/sci/include/reg_t_hashmap.h
===================================================================
--- scummvm/trunk/engines/sci/include/reg_t_hashmap.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/reg_t_hashmap.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -66,6 +66,6 @@
reg_t_hash_map_remove_value(reg_t_hash_map_ptr, reg_t value);
void
-apply_to_reg_t_hash_map(reg_t_hash_map_ptr map, void *param, void (*note) (void *param, reg_t name, int value));
+apply_to_reg_t_hash_map(reg_t_hash_map_ptr map, void *param, void (*note)(void *param, reg_t name, int value));
#endif /* _INT_HASHMAP_H_ */
Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/resource.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -188,8 +188,7 @@
#define _GET_INT_16
static inline gint16
-getInt16(byte *d)
-{
+getInt16(byte *d) {
return (gint16)(*d | (d[1] << 8));
}
@@ -202,10 +201,9 @@
*/
static inline void
-putInt16(byte* dest, int src)
-{
- dest[0]=(byte)src&0xff;
- dest[1]=(byte)(src>>8)&0xff;
+putInt16(byte* dest, int src) {
+ dest[0] = (byte)src & 0xff;
+ dest[1] = (byte)(src >> 8) & 0xff;
}
/* Converse of getInt16()
** Parameters: (byte *) dest: The position to write to
@@ -383,7 +381,7 @@
/* Returns the filesize of an open file
** Parameters: (int) fd: File descriptor of open file
** Returns : (int) filesize of file pointed to by fd, -1 on error
-*/
+*/
int
sci_file_size(const char *fname);
Modified: scummvm/trunk/engines/sci/include/sbtree.h
===================================================================
--- scummvm/trunk/engines/sci/include/sbtree.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sbtree.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -89,7 +89,7 @@
void
sbtree_foreach(sbtree_t *tree, void *args, void *(*operation)(sbtree_t *, const int,
- const void *, void *));
+ const void *, void *));
/* Operates once on each entry in the tree
** Parameters: (sbtree_t *) tree: The tree to operate on
** (void *) arguments: Additional arguments to pass to 'operation'
Modified: scummvm/trunk/engines/sci/include/sci_memory.h
===================================================================
--- scummvm/trunk/engines/sci/include/sci_memory.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sci_memory.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -168,7 +168,7 @@
/********** memory allocation routines **********/
extern void *
-_SCI_MALLOC(size_t size, const char *file, int line, const char *funct);
+ _SCI_MALLOC(size_t size, const char *file, int line, const char *funct);
/* Allocates the specified amount of memory.
** Parameters: (size_t) size: Number of bytes to allocate
** (char *) file: Filename this routine is called from
@@ -183,7 +183,7 @@
*/
extern void *
-_SCI_CALLOC(size_t num, size_t size, const char *file, int line, const char *funct);
+ _SCI_CALLOC(size_t num, size_t size, const char *file, int line, const char *funct);
/* Allocates num * size bytes of zeroed-out memory.
** Parameters: (size_t) num: Number of elements to allocate
** (size_t) size: Amount of memory per element to allocate
@@ -194,7 +194,7 @@
*/
extern void *
-_SCI_REALLOC(void *ptr, size_t size, const char *file, int line, const char *funct);
+ _SCI_REALLOC(void *ptr, size_t size, const char *file, int line, const char *funct);
/* Increases the size of an allocated memory chunk.
** Parameters: (void *) ptr: The original pointer
** (size_t) size: New size of the memory chunk
@@ -208,7 +208,7 @@
*/
extern void
-_SCI_FREE(void *ptr, const char *file, int line, const char *funct);
+ _SCI_FREE(void *ptr, const char *file, int line, const char *funct);
/* Frees previously allocated memory chunks
** Parameters: (void *) ptr: The pointer to free
** Please see _SCI_MALLOC() for details on other parameters.
@@ -216,7 +216,7 @@
*/
extern void *
-_SCI_MEMDUP(const void *src, size_t size, const char *file, int line, const char *funct);
+ _SCI_MEMDUP(const void *src, size_t size, const char *file, int line, const char *funct);
/* Duplicates a chunk of memory
** Parameters: (void *) src: Pointer to the data to duplicate
** (size_t) size: Number of bytes to duplicate
@@ -228,7 +228,7 @@
*/
extern char *
-_SCI_STRDUP(const char *src, const char *file, int line, const char *funct);
+ _SCI_STRDUP(const char *src, const char *file, int line, const char *funct);
/* Duplicates a string.
** Parameters: (const char *) src: The original pointer
** Please see _SCI_MALLOC() for details on other parameters.
@@ -240,7 +240,7 @@
extern char *
-_SCI_STRNDUP(const char *src, size_t length, const char *file, int line, const char *funct);
+ _SCI_STRNDUP(const char *src, size_t length, const char *file, int line, const char *funct);
/* Copies a string into a newly allocated memory part, up to a certain length.
** Parameters: (char *) src: The source string
** (int) length: The maximum length of the string (not counting
@@ -262,7 +262,7 @@
#define SCI_REFCOUNT_TEST(f) sci_refcount_incref(f); sci_refcount_decref(f);
extern void *
-sci_refcount_alloc(size_t length);
+ sci_refcount_alloc(size_t length);
/* Allocates "garbage" memory
** Parameters: (size_t) length: Number of bytes to allocate
** Returns : (void *) The allocated memory
@@ -271,14 +271,14 @@
*/
extern void *
-sci_refcount_incref(void *data);
+ sci_refcount_incref(void *data);
/* Adds another reference to refcounted memory
** Parameters: (void *) data: The data to add a reference to
** Returns : (void *) data
*/
extern void
-sci_refcount_decref(void *data);
+ sci_refcount_decref(void *data);
/* Decrements the reference count for refcounted memory
** Parameters: (void *) data: The data to add a reference to
** Returns : (void *) data
@@ -286,7 +286,7 @@
*/
extern void *
-sci_refcount_memdup(void *data, size_t len);
+ sci_refcount_memdup(void *data, size_t len);
/* Duplicates non-refcounted memory into a refcounted block
** Parameters: (void *) data: The memory to copy from
** (size_t) len: The number of bytes to copy/allocate
@@ -373,7 +373,7 @@
#ifdef WIN32
extern void
-debug_win32_memory(int dbg_setting);
+ debug_win32_memory(int dbg_setting);
/* Sets debugging for Win32 memory.
** Parameters: (bool) dbg_setting:
** 0: no debugging
Modified: scummvm/trunk/engines/sci/include/sci_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/include/sci_widgets.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sci_widgets.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -70,8 +70,8 @@
gfxw_port_t *
sciw_new_window(state_t *s, rect_t area, int font, gfx_color_t color, gfx_color_t bgcolor,
- int title_font, gfx_color_t title_color, gfx_color_t title_bg_color,
- const char *title, int flags);
+ int title_font, gfx_color_t title_color, gfx_color_t title_bg_color,
+ const char *title, int flags);
/* Creates a new SCI style window
** Parameters: (state_t *) s: The affected game state
** (rect_t) area: The screen area to frame (not including a potential window title)
@@ -107,7 +107,7 @@
gfxw_list_t *
sciw_new_text_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int font,
- gfx_alignment_t align, char frame, char inverse);
+ gfx_alignment_t align, char frame, char inverse);
/* Creates a new text control list
** Parameters: (gfxw_port_t *) port: The port containing the color values to use
** (reg_t) ID: Text widget ID
@@ -122,7 +122,7 @@
gfxw_list_t *
sciw_new_edit_control(gfxw_port_t *port, reg_t ID, rect_t zone, char *text, int font, unsigned int cursor,
- char inverse);
+ char inverse);
/* Creates a new edit control list
** Parameters: (gfxw_port_t *) port: The port containing the color values to use
** (reg_t) ID: Text widget ID
@@ -136,7 +136,7 @@
gfxw_list_t *
sciw_new_icon_control(gfxw_port_t *port, reg_t ID, rect_t zone, int view, int loop, int cel,
- char frame, char inverse);
+ char frame, char inverse);
/* Creates a new icon control list
** Parameters: (gfxw_port_t *) port: The port containing the color values to use
** (reg_t) ID: Text widget ID
@@ -149,7 +149,7 @@
gfxw_list_t *
sciw_new_list_control(gfxw_port_t *port, reg_t ID, rect_t zone, int font_nr, char **entries_list,
- int entries_nr, int list_top, int selection, char inverse);
+ int entries_nr, int list_top, int selection, char inverse);
/* Creates a new list control list
** Parameters: (gfxw_port_t *) port: The port containing the color values to use
** (int) ID: Text widget ID
Modified: scummvm/trunk/engines/sci/include/sciresource.h
===================================================================
--- scummvm/trunk/engines/sci/include/sciresource.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sciresource.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -112,7 +112,7 @@
enum ResourceTypes {
- sci_view=0, sci_pic, sci_script, sci_text,
+ sci_view = 0, sci_pic, sci_script, sci_text,
sci_sound, sci_memory, sci_vocab, sci_font,
sci_cursor, sci_patch, sci_bitmap, sci_palette,
sci_cdaudio, sci_audio, sci_sync, sci_message,
@@ -187,7 +187,7 @@
resource_source_t *sources;
resource_t *resources;
- int memory_locked; /* Amount of resource bytes in locked memory */
+ int memory_locked; /* Amount of resource bytes in locked memory */
int memory_lru; /* Amount of resource bytes under LRU control */
char *resource_path; /* Path to the resource and patch files */
@@ -222,7 +222,7 @@
scir_add_patch_dir(resource_mgr_t *mgr, int type, char *path);
/* Add a path to the resource manager's list of sources.
** Parameters: (resource_mgr_t *) mgr: The resource manager to look up in
-** (int) dirtype: The type of patch directory to add,
+** (int) dirtype: The type of patch directory to add,
** either RESSOURCE_TYPE_DIRECTORY or RESSOURCE_TYPE_AUDIO_DIRECTORY
** (char *) path: The path to add
** Returns: A pointer to the added source structure, or NULL if an error occurred.
@@ -233,7 +233,7 @@
resource_source_t *
scir_add_volume(resource_mgr_t *mgr, resource_source_t *map, char *filename,
- int number, int extended_addressing);
+ int number, int extended_addressing);
/* Add a volume to the resource manager's list of sources.
** Parameters: (resource_mgr_t *) mgr: The resource manager to look up in
** (resource_source_t *) map: The map associated with this volume
@@ -261,11 +261,11 @@
int
scir_scan_new_sources(resource_mgr_t *mgr, int *detected_version);
-/* Scans newly registered resource sources for resources, earliest addition first.
+/* Scans newly registered resource sources for resources, earliest addition first.
** Parameters: (resource_mgr_t *) mgr: The resource manager to look up in
** (int *) detected_version: Pointer to the detected version number,
** used during startup. May be NULL.
-** Returns: One of SCI_ERROR_*.
+** Returns: One of SCI_ERROR_*.
*/
resource_t *
@@ -329,7 +329,7 @@
int
sci1_read_resource_map(resource_mgr_t *mgr, resource_source_t *map, resource_source_t *vol,
- resource_t **resource_p, int *resource_nr_p, int *sci_version);
+ resource_t **resource_p, int *resource_nr_p, int *sci_version);
/* Reads the SCI1 resource.map file from a local directory
** Parameters: (char *) path: (unused)
** (resource_t **) resources: Pointer to a pointer
@@ -458,7 +458,7 @@
_scir_find_resource_unsorted(resource_t *res, int res_nr, int type, int number);
/* Finds a resource matching type.number in an unsorted resource_t block
** To be used during initial resource loading, when the resource list
-** may not have been sorted yet.
+** may not have been sorted yet.
** Parameters: (resource_t *) res: Pointer to the block to search in
** (int) res_nr: Number of resource_t structs allocated and defined
** in the block pointed to by res
Modified: scummvm/trunk/engines/sci/include/scitypes.h
===================================================================
--- scummvm/trunk/engines/sci/include/scitypes.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/scitypes.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -119,8 +119,8 @@
typedef guint16 word;
typedef struct {
- long tv_sec;
- long tv_usec;
+ long tv_sec;
+ long tv_usec;
} GTimeVal;
typedef struct {
@@ -142,9 +142,9 @@
FRAC_BITS = 16,
FRAC_LO_MASK = ((1L << FRAC_BITS) - 1),
FRAC_HI_MASK = (((1L << (32 - FRAC_BITS)) - 1) << FRAC_BITS),
-
+
FRAC_ONE = (1L << FRAC_BITS), // 1.0
- FRAC_HALF = (1L << (FRAC_BITS-1)) // 0.5
+ FRAC_HALF = (1L << (FRAC_BITS - 1)) // 0.5
};
/*
Modified: scummvm/trunk/engines/sci/include/script.h
===================================================================
--- scummvm/trunk/engines/sci/include/script.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/script.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -26,174 +26,173 @@
#define SCI_SCRIPTS_NR 1000
-typedef struct script_opcode_
-{
- unsigned opcode;
- int arg1, arg2, arg3;
- int pos, size;
+typedef struct script_opcode_ {
+ unsigned opcode;
+ int arg1, arg2, arg3;
+ int pos, size;
} script_opcode;
typedef enum {
- sci_obj_terminator,
- sci_obj_object,
- sci_obj_code,
- sci_obj_synonyms,
- sci_obj_said,
- sci_obj_strings,
- sci_obj_class,
- sci_obj_exports,
- sci_obj_pointers,
- sci_obj_preload_text, /* This is really just a flag. */
- sci_obj_localvars
+ sci_obj_terminator,
+ sci_obj_object,
+ sci_obj_code,
+ sci_obj_synonyms,
+ sci_obj_said,
+ sci_obj_strings,
+ sci_obj_class,
+ sci_obj_exports,
+ sci_obj_pointers,
+ sci_obj_preload_text, /* This is really just a flag. */
+ sci_obj_localvars
} script_object_types;
void script_dissect(resource_mgr_t *resmgr, int res_no, char **snames, int snames_nr);
/* Opcode formats as used by script.c */
typedef enum {
- Script_Invalid=-1,
- Script_None=0,
- Script_Byte,
- Script_SByte,
- Script_Word,
- Script_SWord,
- Script_Variable,
- Script_SVariable,
- Script_SRelative,
- Script_Property,
- Script_Global,
- Script_Local,
- Script_Temp,
- Script_Param,
- Script_Offset,
- Script_End
+ Script_Invalid = -1,
+ Script_None = 0,
+ Script_Byte,
+ Script_SByte,
+ Script_Word,
+ Script_SWord,
+ Script_Variable,
+ Script_SVariable,
+ Script_SRelative,
+ Script_Property,
+ Script_Global,
+ Script_Local,
+ Script_Temp,
+ Script_Param,
+ Script_Offset,
+ Script_End
} opcode_format;
typedef enum { /* FIXME */
- op_bnot = 0,
- op_add,
- op_sub,
- op_mul,
- op_div,
- op_mod,
- op_shr,
- op_shl,
- op_xor,
- op_and,
- op_or,
- op_neg,
- op_not,
- op_eq,
- op_ne_,
- op_gt_,
- op_ge_,
- op_lt_,
- op_le_,
- op_ugt_,
- op_uge_,
- op_ult_,
- op_ule_,
- op_bt,
- op_bnt,
- op_jmp,
- op_ldi,
- op_push,
- op_pushi,
- op_toss,
- op_dup,
- op_link,
- op_call = 0x20,
- op_callk,
- op_callb,
- op_calle,
- op_ret,
- op_send,
- op_class = 0x28,
- op_self = 0x2a,
- op_super,
- op_rest,
- op_lea,
- op_selfID,
- op_pprev = 0x30,
- op_pToa,
- op_aTop,
- op_pTos,
- op_sTop,
- op_ipToa,
- op_dpToa,
- op_ipTos,
- op_dpTos,
- op_lofsa,
- op_lofss,
- op_push0,
- op_push1,
- op_push2,
- op_pushSelf,
- op_lag = 0x40,
- op_lal,
- op_lat,
- op_lap,
- op_lagi,
- op_lali,
- op_lati,
- op_lapi,
- op_lsg,
- op_lsl,
- op_lst,
- op_lsp,
- op_lsgi,
- op_lsli,
- op_lsti,
- op_lspi,
- op_sag,
- op_sal,
- op_sat,
- op_sap,
- op_sagi,
- op_sali,
- op_sati,
- op_sapi,
- op_ssg,
- op_ssl,
- op_sst,
- op_ssp,
- op_ssgi,
- op_ssli,
- op_ssti,
- op_sspi,
- op_plusag,
- op_plusal,
- op_plusat,
- op_plusap,
- op_plusagi,
- op_plusali,
- op_plusati,
- op_plusapi,
- op_plussg,
- op_plussl,
- op_plusst,
- op_plussp,
- op_plussgi,
- op_plussli,
- op_plussti,
- op_plusspi,
- op_minusag,
- op_minusal,
- op_minusat,
- op_minusap,
- op_minusagi,
- op_minusali,
- op_minusati,
- op_minusapi,
- op_minussg,
- op_minussl,
- op_minusst,
- op_minussp,
- op_minussgi,
- op_minussli,
- op_minussti,
- op_minusspi
+ op_bnot = 0,
+ op_add,
+ op_sub,
+ op_mul,
+ op_div,
+ op_mod,
+ op_shr,
+ op_shl,
+ op_xor,
+ op_and,
+ op_or,
+ op_neg,
+ op_not,
+ op_eq,
+ op_ne_,
+ op_gt_,
+ op_ge_,
+ op_lt_,
+ op_le_,
+ op_ugt_,
+ op_uge_,
+ op_ult_,
+ op_ule_,
+ op_bt,
+ op_bnt,
+ op_jmp,
+ op_ldi,
+ op_push,
+ op_pushi,
+ op_toss,
+ op_dup,
+ op_link,
+ op_call = 0x20,
+ op_callk,
+ op_callb,
+ op_calle,
+ op_ret,
+ op_send,
+ op_class = 0x28,
+ op_self = 0x2a,
+ op_super,
+ op_rest,
+ op_lea,
+ op_selfID,
+ op_pprev = 0x30,
+ op_pToa,
+ op_aTop,
+ op_pTos,
+ op_sTop,
+ op_ipToa,
+ op_dpToa,
+ op_ipTos,
+ op_dpTos,
+ op_lofsa,
+ op_lofss,
+ op_push0,
+ op_push1,
+ op_push2,
+ op_pushSelf,
+ op_lag = 0x40,
+ op_lal,
+ op_lat,
+ op_lap,
+ op_lagi,
+ op_lali,
+ op_lati,
+ op_lapi,
+ op_lsg,
+ op_lsl,
+ op_lst,
+ op_lsp,
+ op_lsgi,
+ op_lsli,
+ op_lsti,
+ op_lspi,
+ op_sag,
+ op_sal,
+ op_sat,
+ op_sap,
+ op_sagi,
+ op_sali,
+ op_sati,
+ op_sapi,
+ op_ssg,
+ op_ssl,
+ op_sst,
+ op_ssp,
+ op_ssgi,
+ op_ssli,
+ op_ssti,
+ op_sspi,
+ op_plusag,
+ op_plusal,
+ op_plusat,
+ op_plusap,
+ op_plusagi,
+ op_plusali,
+ op_plusati,
+ op_plusapi,
+ op_plussg,
+ op_plussl,
+ op_plusst,
+ op_plussp,
+ op_plussgi,
+ op_plussli,
+ op_plussti,
+ op_plusspi,
+ op_minusag,
+ op_minusal,
+ op_minusat,
+ op_minusap,
+ op_minusagi,
+ op_minusali,
+ op_minusati,
+ op_minusapi,
+ op_minussg,
+ op_minussl,
+ op_minusst,
+ op_minussp,
+ op_minussgi,
+ op_minussli,
+ op_minussti,
+ op_minusspi
} sci_opcodes;
extern opcode_format formats[128][4];
Modified: scummvm/trunk/engines/sci/include/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/include/seg_manager.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/seg_manager.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -36,12 +36,12 @@
#define DEFAULT_SCRIPTS 32
#define DEFAULT_OBJECTS 8 /* default # of objects per script */
#define DEFAULT_OBJECTS_INCREMENT 4 /* Number of additional objects to
- ** instantiate if we're running out of them */
+** instantiate if we're running out of them */
/* SCRIPT_ID must be 0 */
typedef enum {
- SCRIPT_ID,
- SEG_ID
+SCRIPT_ID,
+SEG_ID
} id_flag;
//void dbg_print( const char* msg, void *i ); /* for debug only */
@@ -94,22 +94,22 @@
typedef struct _seg_manager_t {
- int_hash_map_t* id_seg_map; /* id - script id; seg - index of heap */
- struct _mem_obj** heap;
- int heap_size; /* size of the heap */
- int reserved_id;
- int exports_wide;
- int sci1_1;
+int_hash_map_t* id_seg_map; /* id - script id; seg - index of heap */
+struct _mem_obj** heap;
+int heap_size; /* size of the heap */
+int reserved_id;
+int exports_wide;
+int sci1_1;
- int gc_mark_bits; /* For standard Mark&Sweep:
- ** 1 or 0, depending on what unreachable/freshly allocated
- ** memory is tagged as */
- size_t mem_allocated; /* Total amount of memory allocated */
+int gc_mark_bits; /* For standard Mark&Sweep:
+** 1 or 0, depending on what unreachable/freshly allocated
+** memory is tagged as */
+size_t mem_allocated; /* Total amount of memory allocated */
- seg_id_t clones_seg_id; /* ID of the (a) clones segment */
- seg_id_t lists_seg_id; /* ID of the (a) list segment */
- seg_id_t nodes_seg_id; /* ID of the (a) node segment */
- seg_id_t hunks_seg_id; /* ID of the (a) hunk segment */
+seg_id_t clones_seg_id; /* ID of the (a) clones segment */
+seg_id_t lists_seg_id; /* ID of the (a) list segment */
+seg_id_t nodes_seg_id; /* ID of the (a) node segment */
+seg_id_t hunks_seg_id; /* ID of the (a) hunk segment */
} seg_manager_t;
@@ -118,12 +118,12 @@
/* Toplevel functionality */
/*==============================================================*/
void
-sm_init (seg_manager_t* self, int sci1_1);
+sm_init(seg_manager_t* self, int sci1_1);
/* Initialize the segment manager
*/
void
-sm_destroy (seg_manager_t* self);
+sm_destroy(seg_manager_t* self);
/* Deallocate all memory associated with the segment manager
*/
@@ -142,7 +142,7 @@
void
-sm_free_script ( mem_obj_t* mem );
+sm_free_script(mem_obj_t* mem);
mem_obj_t*
sm_allocate_script(struct _seg_manager_t* self, struct _state *s, int script_nr, int* seg_id);
@@ -170,7 +170,7 @@
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
** by its segment (SEG_ID). SEG_ID is faster than SCRIPT_ID,
** but less convenient.
-*/
+*/
guint16
sm_validate_export_func(struct _seg_manager_t* self, int pubfunct, int seg);
@@ -182,7 +182,7 @@
**/
int
-sm_seg_get (seg_manager_t* self, int script_nr);
+sm_seg_get(seg_manager_t* self, int script_nr);
/* Get the segment ID associated with a script number
** Parameters: (int) script_nr: Number of the script to look up
** Returns : (int) The associated segment ID, or -1 if no matching segment exists
@@ -201,7 +201,7 @@
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
** by its segment (SEG_ID). SEG_ID is faster than SCRIPT_ID,
** but less convenient.
-*/
+*/
void
sm_decrement_lockers(struct _seg_manager_t* self, int id, id_flag flag);
@@ -210,7 +210,7 @@
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
** by its segment (SEG_ID). SEG_ID is faster than SCRIPT_ID,
** but less convenient.
-*/
+*/
int
sm_get_lockers(struct _seg_manager_t* self, int id, id_flag flag);
@@ -220,7 +220,7 @@
** by its segment (SEG_ID). SEG_ID is faster than SCRIPT_ID,
** but less convenient.
** Returns : (int) The number of locks held on the previously identified script
-*/
+*/
void
sm_set_lockers(struct _seg_manager_t* self, int lockers, int id, id_flag flag);
@@ -229,10 +229,10 @@
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
** by its segment (SEG_ID). SEG_ID is faster than SCRIPT_ID,
** but less convenient.
-*/
+*/
byte *
-sm_get_synonyms (struct _seg_manager_t* self, int id, id_flag flag);
+sm_get_synonyms(struct _seg_manager_t* self, int id, id_flag flag);
/* Retrieves a pointer to the synonyms associated with the specified script
** Parameters: (int) id: ID of the script or script segment to read from
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
@@ -243,7 +243,7 @@
*/
int
-sm_get_synonyms_nr (struct _seg_manager_t* self, int id, id_flag flag);
+sm_get_synonyms_nr(struct _seg_manager_t* self, int id, id_flag flag);
/* Retrieves the number of synonyms associated with the specified script
** Parameters: (int) id: ID of the script or script segment to read from
** (id_flag) flag: Whether to address the script by script number (SCRIPT_ID) or
@@ -317,7 +317,7 @@
*/
void
-sm_set_export_table_offset (struct _seg_manager_t* self, int offset, int id, id_flag flag);
+sm_set_export_table_offset(struct _seg_manager_t* self, int offset, int id, id_flag flag);
/* Sets the script-relative offset of the exports table
** Parameters: (int) offset: The script-relative exports table offset
** (int) id: ID of the script or script segment to write to
@@ -328,7 +328,7 @@
*/
void
-sm_set_synonyms_offset (struct _seg_manager_t* self, int offset, int id, id_flag flag);
+sm_set_synonyms_offset(struct _seg_manager_t* self, int offset, int id, id_flag flag);
/* Sets the script-relative offset of the synonyms associated with the specified script
** Parameters: (int) offset: The script-relative offset of the synonyms block
** (int) id: ID of the script or script segment to write to
@@ -339,7 +339,7 @@
*/
void
-sm_set_synonyms_nr (struct _seg_manager_t* self, int nr, int id, id_flag flag);
+sm_set_synonyms_nr(struct _seg_manager_t* self, int nr, int id, id_flag flag);
/* Sets the number of synonyms associated with the specified script
** Parameters: (int) nr: The number of synonyms, as to be stored within the script
** (int) id: ID of the script or script segment to write to
@@ -400,22 +400,22 @@
/* Not all of these functions are fully operational for clones ATM */
-gint16
-sm_get_heap(struct _seg_manager_t* self, reg_t reg );
+gint16
+sm_get_heap(struct _seg_manager_t* self, reg_t reg);
/* Retrieves a 16 bit value from within a script's heap representation
** Parameters: (reg_t) reg: The address to read from
** Returns : (gint16) The value read from the specified location
*/
void
-sm_put_heap(struct _seg_manager_t* self, reg_t reg, gint16 value );
+sm_put_heap(struct _seg_manager_t* self, reg_t reg, gint16 value);
/* Writes a 16 bit value into a script's heap representation
** Parameters: (reg_t) reg: The address to write to
** (gint16) value: The value to write
*/
void
-sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id, int flag);
+sm_mcpy_in_out(seg_manager_t* self, int dst, const void* src, size_t n, int id, int flag);
/* Copies a byte string into a script's heap representation
** Parameters: (int) dst: The script-relative offset of the destination area
** (const void *) src: Pointer to the data source location
@@ -536,7 +536,7 @@
/* Gets the description of a dynmem segment
** Parameters: (reg_t) addr: Segment to describe
** Returns : (const char *): Pointer to the descriptive string set in
-** sm_alloc_dynmem
+** sm_alloc_dynmem
*/
/*==============================================================*/
Modified: scummvm/trunk/engines/sci/include/sfx_engine.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_engine.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_engine.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -38,13 +38,13 @@
#define SFX_STATE_FLAG_MULTIPLAY (1 << 0) /* More than one song playable
- ** simultaneously ? */
+** simultaneously ? */
#define SFX_STATE_FLAG_NOSOUND (1 << 1) /* Completely disable sound playing */
#define SFX_DEBUG_SONGS (1 << 0) /* Debug song changes */
#define SFX_DEBUG_CUES (1 << 1) /* Debug cues, loops, and
- ** song completions */
+** song completions */
typedef struct {
song_iterator_t *it; /* The song iterator at the heart of things */
Modified: scummvm/trunk/engines/sci/include/sfx_iterator.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_iterator.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_iterator.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -57,9 +57,9 @@
#define _SIMSG_BASE 0 /* Any base decoder */
#define _SIMSG_BASEMSG_SET_LOOPS 0 /* Set loops */
#define _SIMSG_BASEMSG_CLONE 1 /* Clone object and data. Must provide the
- ** (possibly negative) number of ticks that have
- ** passed since the last delay time started being
- ** used */
+** (possibly negative) number of ticks that have
+** passed since the last delay time started being
+** used */
#define _SIMSG_BASEMSG_SET_PLAYMASK 2 /* Set the current playmask for filtering */
#define _SIMSG_BASEMSG_SET_RHYTHM 3 /* Activate/deactivate rhythm channel */
#define _SIMSG_BASEMSG_ACK_MORPH 4 /* Acknowledge self-morph */
@@ -114,19 +114,19 @@
int (*get_timepos) (struct _song_iterator *self); \
listener_t death_listeners[SONGIT_MAX_LISTENERS]; \
int death_listeners_nr \
-
+
#define SONGIT_MAX_LISTENERS 2
typedef struct _song_iterator {
songit_id_t ID;
guint16 channel_mask; /* Bitmask of all channels this iterator will use */
- fade_params_t fade;
+ fade_params_t fade;
unsigned int flags;
int priority;
- int (*next) (struct _song_iterator *self,
- unsigned char *buf, int *result);
+ int (*next)(struct _song_iterator *self,
+ unsigned char *buf, int *result);
/* Reads the next MIDI operation _or_ delta time
** Parameters: (song_iterator_t *) self
** (byte *) buf: The buffer to write to (needs to be able to
@@ -144,7 +144,7 @@
** PCM, but this must be done before any subsequent calls to next().
*/
- sfx_pcm_feed_t * (*get_pcm_feed) (struct _song_iterator *self);
+ sfx_pcm_feed_t * (*get_pcm_feed)(struct _song_iterator *self);
/* Checks for the presence of a pcm sample
** Parameters: (song_iterator_t *) self
** Returns : (sfx_pcm_feed_t *) NULL if no PCM data was found, a
@@ -153,7 +153,7 @@
struct _song_iterator *
- (* handle_message)(struct _song_iterator *self, song_iterator_message_t msg);
+ (* handle_message)(struct _song_iterator *self, song_iterator_message_t msg);
/* Handles a message to the song iterator
** Parameters: (song_iterator_t *) self
** (song_iterator_messag_t) msg: The message to handle
@@ -168,20 +168,20 @@
*/
- void (*init) (struct _song_iterator *self);
+ void (*init)(struct _song_iterator *self);
/* Resets/initializes the sound iterator
** Parameters: (song_iterator_t *) self
** Returns : (void)
*/
- void (*cleanup) (struct _song_iterator *self);
+ void (*cleanup)(struct _song_iterator *self);
/* Frees any content of the iterator structure
** Parameters: (song_iterator_t *) self
** Does not physically free(self) yet. May be NULL if nothing needs to be done.
** Must not recurse on its delegate.
*/
- int (*get_timepos) (struct _song_iterator *self);
+ int (*get_timepos)(struct _song_iterator *self);
/* Gets the song position to store in a savegame
** Parameters: (song_iterator_t *) self
*/
@@ -198,13 +198,13 @@
/* Song iterator flags */
#define SONGIT_FLAG_CLONE (1 << 0) /* This flag is set for clones, which are exclusively used in song players.
- ** Thus, this flag distinguishes song iterators in the main thread from those
- ** in the song-player thread. */
+** Thus, this flag distinguishes song iterators in the main thread from those
+** in the song-player thread. */
void
song_iterator_add_death_listener(song_iterator_t *it,
- void *client,
- void (*notify) (void *self, void *notifier));
+ void *client,
+ void (*notify)(void *self, void *notifier));
/* Adds a death listener to a song iterator
** Parameters: (song_iterator_t *) it: The iterator to add to
** (void *) client: The object wanting to be notified
@@ -217,7 +217,7 @@
void
song_iterator_remove_death_listener(song_iterator_t *it,
- void *client);
+ void *client);
/* Removes a death listener from a song iterator
** Parameters: (song_iterator_t *) it: The iterator to modify
** (void *) client: The object no longer wanting to be notified
@@ -240,8 +240,8 @@
#define IT_READER_MASK_PCM (1 << 4)
#define IT_READER_MAY_FREE (1 << 10) /* Free SI_FINISHED iterators */
#define IT_READER_MAY_CLEAN (1 << 11)
- /* MAY_CLEAN: May instantiate cleanup iterators
- ** (use for players; this closes open channels at the end of a song) */
+/* MAY_CLEAN: May instantiate cleanup iterators
+** (use for players; this closes open channels at the end of a song) */
#define IT_READER_MASK_ALL ( IT_READER_MASK_MIDI \
| IT_READER_MASK_DELAY \
@@ -299,7 +299,7 @@
song_iterator_message_t
songit_make_message(songit_id_t id,
- int recipient_class, int type, int a1, int a2);
+ int recipient_class, int type, int a1, int a2);
/* Create a song iterator message
** Parameters: (songit_id_t) id: song ID the message is targetted to
** (int) recipient_class: Message recipient class
@@ -310,7 +310,7 @@
song_iterator_message_t
songit_make_ptr_message(songit_id_t id,
- int recipient_class, int type, void * a1, int a2);
+ int recipient_class, int type, void * a1, int a2);
/* Create a song iterator message, wherein the first parameter is a pointer
** Parameters: (songit_id_t) id: song ID the message is targetted to
** (int) recipient_class: Message recipient class
@@ -335,7 +335,7 @@
** (int) delta: Number of ticks that still need to elapse until
** the next item should be read from the song iterator
** Returns : (song_iterator_t *) A shallow clone of 'it'.
-** This performs a clone on the bottom-most part (containing the actual song data) _only_.
+** This performs a clone on the bottom-most part (containing the actual song data) _only_.
** The justification for requiring 'delta' to be passed in here is that this
** is typically maintained outside of the song iterator.
*/
Modified: scummvm/trunk/engines/sci/include/sfx_iterator_internal.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_iterator_internal.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_iterator_internal.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -136,7 +136,8 @@
int channels_looped; /* Number of channels that are ready to loop */
int delay_remaining; /* Number of ticks that haven't been polled yet */
- int hold; \
+ int hold;
+ \
} sci1_song_iterator_t;
#define PLAYMASK_NONE 0x0
@@ -225,8 +226,8 @@
sfx_pcm_feed_t *
sfx_iterator_make_feed(byte *base_data, int offset,
- int size,
- sfx_pcm_config_t conf);
+ int size,
+ sfx_pcm_config_t conf);
/* Generates a feed for a song iterator
** Parameters: (byte *) base_data: A refcounted memory chunk containing
** (among other things) PCM data
Modified: scummvm/trunk/engines/sci/include/sfx_pcm.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_pcm.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_pcm.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -118,7 +118,7 @@
*/
int (*output)(struct _sfx_pcm_device *self, byte *buf,
- int count, sfx_timestamp_t *timestamp);
+ int count, sfx_timestamp_t *timestamp);
/* Writes output to the device
** Parameters: (sfx_pcm_device_t *) self: Self reference
** (byte *) buf: The buffer to write
Modified: scummvm/trunk/engines/sci/include/sfx_player.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_player.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_player.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -117,9 +117,9 @@
*/
tell_synth_func *tell_synth;
- /* Pass a raw MIDI event to the synth
- Parameters: (int) argc: Length of buffer holding the midi event
- (byte *) argv: The buffer itself
+ /* Pass a raw MIDI event to the synth
+ Parameters: (int) argc: Length of buffer holding the midi event
+ (byte *) argv: The buffer itself
*/
int polyphony; /* Number of voices that can play simultaneously */
Modified: scummvm/trunk/engines/sci/include/sfx_songlib.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_songlib.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_songlib.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -58,9 +58,9 @@
int restore_behavior;
int restore_time;
-/* Grabbed from the sound iterator, for save/restore purposes */
- int loops;
- int hold;
+ /* Grabbed from the sound iterator, for save/restore purposes */
+ int loops;
+ int hold;
song_iterator_t *it;
long delay; /* Delay before accessing the iterator, in microseconds */
@@ -188,8 +188,8 @@
*/
void
-song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle,
- RESTORE_BEHAVIOR action);
+song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle,
+ RESTORE_BEHAVIOR action);
/* Determines what should be done with the song "handle" when
** restoring it from a saved game.
** Parameters: (songlib_t) songlib: The library that contains the song
Modified: scummvm/trunk/engines/sci/include/sfx_timer.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_timer.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/sfx_timer.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -84,7 +84,7 @@
} sfx_timer_t;
extern sfx_timer_t *
-sfx_find_timer(char *name);
+ sfx_find_timer(char *name);
/* Finds a timer by name
** Parameters: (char *) name: Name of the timer to look up, or NULL for default
** Returns : (sfx_timer_t *) The timer of matching name, or NULL
Modified: scummvm/trunk/engines/sci/include/versions.h
===================================================================
--- scummvm/trunk/engines/sci/include/versions.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/versions.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -96,7 +96,7 @@
*/
#define SCI_VERSION_RESUME_SUSPENDED_SONG SCI_VERSION(0,000,490)
-/* First version (PQ2-new) known to use the different song resumption
+/* First version (PQ2-new) known to use the different song resumption
mechanism -- When a new song is initialized, we store its state and
resume it when the new one finishes. Older versions completely
clobbered the old songs.
Modified: scummvm/trunk/engines/sci/include/vm.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/vm.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -110,7 +110,7 @@
typedef struct {
int script; /* number of the script the class is in, -1 for non-existing */
- reg_t reg; /* offset; script-relative offset, segment: 0 if not instantiated */
+ reg_t reg; /* offset; script-relative offset, segment: 0 if not instantiated */
} class_t;
#define RAW_GET_CLASS_INDEX(scr, reg) (int_hash_map_check_value((scr)->obj_indices, reg.offset, 0, NULL))
@@ -200,8 +200,8 @@
int lockers; /* Number of classes and objects that require this script */
object_t *objects; /* Table for objects, contains property variables */
- /* Indexed by the value stored at SCRIPT_LOCALVARPTR_OFFSET,
- ** see VM_OBJECT_[GS]ET_INDEX() */
+ /* Indexed by the value stored at SCRIPT_LOCALVARPTR_OFFSET,
+ ** see VM_OBJECT_[GS]ET_INDEX() */
int objects_nr; /* Number of objects and classes */
int objects_allocated; /* Number of allocated objects */
@@ -260,7 +260,7 @@
typedef struct _mem_obj {
int type;
- int segmgr_id; /* Internal value used by the seg_manager's hash map */
+ int segmgr_id; /* Internal value used by the seg_manager's hash map */
union {
script_t script;
clone_table_t clones;
@@ -336,7 +336,7 @@
selector_t vol;
selector_t pri;
-
+
selector_t min; /* SMPTE time format */
selector_t sec;
selector_t frame;
@@ -451,9 +451,10 @@
extern kernel_function* kfuncs[];
extern int max_instance;
-/*inline*/ exec_stack_t *
+/*inline*/
+exec_stack_t *
execute_method(struct _state *s, word script, word pubfunct, stack_ptr_t sp, reg_t calling_obj,
- word argc, stack_ptr_t argp);
+ word argc, stack_ptr_t argp);
/* Executes function pubfunct of the specified script.
** Parameters: (state_t *) s: The state which is to be executed with
** (word) script: The script which is called
@@ -468,7 +469,7 @@
exec_stack_t *
send_selector(struct _state *s, reg_t send_obj, reg_t work_obj,
- stack_ptr_t sp, int framesize, stack_ptr_t argp);
+ stack_ptr_t sp, int framesize, stack_ptr_t argp);
/* Executes a "send" or related operation to a selector
** Parameters: (state_t *) s: The state_t to operate on
** (reg_t) send_obj: Heap address of the object to send to
@@ -487,8 +488,8 @@
exec_stack_t *
add_exec_stack_entry(struct _state *s, reg_t pc, stack_ptr_t sp, reg_t objp, int argc,
- stack_ptr_t argp, selector_t selector, reg_t sendp, int origin,
- seg_id_t local_segment);
+ stack_ptr_t argp, selector_t selector, reg_t sendp, int origin,
+ seg_id_t local_segment);
/* Adds an entry to the top of the execution stack
** Parameters: (state_t *) s: The state with which to execute
** (reg_t) pc: The initial program counter
@@ -510,7 +511,7 @@
exec_stack_t *
add_exec_stack_varselector(struct _state *s, reg_t objp, int argc, stack_ptr_t argp,
- selector_t selector, reg_t *address, int origin);
+ selector_t selector, reg_t *address, int origin);
/* Adds one varselector access to the execution stack
** Parameters: (state_t *) s: The state_t to use
** (reg_t) objp: Pointer to the object owning the selector
@@ -545,10 +546,10 @@
void
script_debug(struct _state *s, reg_t *pc, stack_ptr_t *sp, stack_ptr_t *pp, reg_t *objp,
- int *restadjust,
- seg_id_t *segids, reg_t **variables, reg_t **variables_base,
- int *variables_nr,
- int bp);
+ int *restadjust,
+ seg_id_t *segids, reg_t **variables, reg_t **variables_base,
+ int *variables_nr,
+ int bp);
/* Debugger functionality
** Parameters: (state_t *) s: The state at which debugging should take place
** (reg_t *) pc: Pointer to the program counter
@@ -671,7 +672,7 @@
struct _state *
-game_restore_state(char *name);
+ game_restore_state(char *name);
/* Restores the game state from a file
** Parameters: (char *) name: Name of the saved game state to restore
** Returns : (state_t *): The restored game state, or NULL on failure
Modified: scummvm/trunk/engines/sci/include/vm_types.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm_types.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/vm_types.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -54,8 +54,7 @@
#define PRINT_STK(v) (unsigned) (v - s->stack_base)
static inline reg_t
-make_reg(int segment, int offset)
-{
+make_reg(int segment, int offset) {
reg_t r;
r.offset = offset;
r.segment = segment;
Modified: scummvm/trunk/engines/sci/include/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/include/vocabulary.h 2009-02-15 22:28:50 UTC (rev 38318)
+++ scummvm/trunk/engines/sci/include/vocabulary.h 2009-02-15 22:32:57 UTC (rev 38319)
@@ -43,11 +43,10 @@
/* Number of bytes allocated on the heap to store bad words if parsing fails */
-typedef struct opcode_
-{
- int type;
- int number;
- char* name;
+typedef struct opcode_ {
+ int type;
+ int number;
+ char* name;
} opcode;
#define VOCAB_RESOURCE_OPCODES 998
@@ -111,63 +110,62 @@
typedef struct {
- int w_class; /* Word class */
- int group; /* Word group */
- char word[1]; /* The actual word */
+ int w_class; /* Word class */
+ int group; /* Word group */
+ char word[1]; /* The actual word */
} word_t;
typedef struct {
- int id; /* non-terminal ID */
- int first_special; /* first terminal or non-terminal */
- int specials_nr; /* number of terminals and non-terminals */
- int length;
- int data[1]; /* actual data (size 1 to avoid compiler warnings) */
+ int id; /* non-terminal ID */
+ int first_special; /* first terminal or non-terminal */
+ int specials_nr; /* number of terminals and non-terminals */
+ int length;
+ int data[1]; /* actual data (size 1 to avoid compiler warnings) */
} parse_rule_t;
typedef struct _parse_rule_list {
- int terminal; /* Terminal character this rule matches against or 0 for a non-terminal rule */
- parse_rule_t *rule;
- struct _parse_rule_list *next;
+ int terminal; /* Terminal character this rule matches against or 0 for a non-terminal rule */
+ parse_rule_t *rule;
+ struct _parse_rule_list *next;
} parse_rule_list_t;
typedef struct {
- int class_mask; /* the word class this suffix applies to */
- int result_class; /* the word class a word is morphed to if it doesn't fail this check */
+ int class_mask; /* the word class this suffix applies to */
+ int result_class; /* the word class a word is morphed to if it doesn't fail this check */
- int alt_suffix_length; /* String length of the suffix */
- int word_suffix_length; /* String length of the other suffix */
+ int alt_suffix_length; /* String length of the suffix */
+ int word_suffix_length; /* String length of the other suffix */
- char *alt_suffix; /* The alternative suffix */
- char *word_suffix; /* The suffix as used in the word vocabulary */
+ char *alt_suffix; /* The alternative suffix */
+ char *word_suffix; /* The suffix as used in the word vocabulary */
} suffix_t;
typedef struct {
- int w_class; /* Word class */
- int group; /* Word group */
+ int w_class; /* Word class */
+ int group; /* Word group */
} result_word_t;
-typedef struct
-{
- int replaceant; /* The word group to replace */
- int replacement; /* The replacement word group for this one */
+typedef struct {
+ int replaceant; /* The word group to replace */
+ int replacement; /* The replacement word group for this one */
} synonym_t;
typedef struct {
- int id;
+ int id;
- int data[10];
+ int data[10];
} parse_tree_branch_t;
@@ -177,14 +175,14 @@
typedef struct {
- short type; /* leaf or branch */
+ short type; /* leaf or branch */
- union {
+ union {
- int value; /* For leaves */
- short branches[2]; /* For branches */
+ int value; /* For leaves */
+ short branches[2]; /* For branches */
- } content;
+ } content;
} parse_tree_node_t;
@@ -291,8 +289,8 @@
result_word_t *
vocab_lookup_word(char *word, int word_len,
- word_t **words, int words_nr,
- suffix_t **suffices, int suffices_nr);
+ word_t **words, int words_nr,
+ suffix_t **suffices, int suffices_nr);
/* Looks up a single word in the words and suffixes list
** Parameters: (char *) word: Pointer to the word to look up
** (int) word_len: Length of the word to look up
@@ -307,9 +305,9 @@
result_word_t *
vocab_tokenize_string(char *sentence, int *result_nr,
- word_t **words, int words_nr,
- suffix_t **suffices, int suffices_nr,
- char **error);
+ word_t **words, int words_nr,
+ suffix_t **suffices, int suffices_nr,
+ char **error);
/* Tokenizes a string and compiles it into word_ts.
** Parameters: (char *) sentence: The sentence to examine
** (int *) result_nr: The variable to store the resulting number of words in
@@ -415,7 +413,7 @@
int
vocab_gnf_parse(parse_tree_node_t *nodes, result_word_t *words, int words_nr,
- parse_tree_branch_t *branch0, parse_rule_list_t *tlist, int verbose);
+ parse_tree_branch_t *branch0, parse_rule_list_t *tlist, int verbose);
void
vocab_gnf_dump(parse_tree_branch_t *branches, int branches_nr);
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