[Scummvm-cvs-logs] SF.net SVN: scummvm: [22640] scummvm/trunk/engines/agi

[wjpalenstijn at users.sourceforge.net]

Revision: 22640
Author:   wjpalenstijn
Date:     2006-05-25 15:53:45 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22640&view=rev

Log Message:
-----------
remove superfluous struct keywords

Modified Paths:
--------------
    scummvm/trunk/engines/agi/view.cpp
    scummvm/trunk/engines/agi/view.h
Modified: scummvm/trunk/engines/agi/view.cpp
===================================================================
--- scummvm/trunk/engines/agi/view.cpp	2006-05-25 22:51:42 UTC (rev 22639)
+++ scummvm/trunk/engines/agi/view.cpp	2006-05-25 22:53:45 UTC (rev 22640)
@@ -27,9 +27,9 @@
 
 namespace Agi {
 
-static void _set_cel(struct vt_entry *v, int n) {
-	struct view_loop *current_vl;
-	struct view_cel *current_vc;
+static void _set_cel(vt_entry *v, int n) {
+	view_loop *current_vl;
+	view_cel *current_vc;
 
 	v->current_cel = n;
 
@@ -51,8 +51,8 @@
 	v->y_size = current_vc->height;
 }
 
-static void _set_loop(struct vt_entry *v, int n) {
-	struct view_loop *current_vl;
+static void _set_loop(vt_entry *v, int n) {
+	view_loop *current_vl;
 	debugC(7, kDebugLevelResources, "vt entry #%d, loop = %d", v->entry, n);
 
 	/* Added to avoid crash when leaving the arcade machine in MH1
@@ -74,7 +74,7 @@
 	v->loop_data = &game.views[v->current_view].loop[n];
 }
 
-static void update_view(struct vt_entry *v) {
+static void update_view(vt_entry *v) {
 	int cel, last_cel;
 
 	if (v->flags & DONTUPDATE) {
@@ -137,8 +137,8 @@
 	int loop, cel;
 	uint8 *v, *lptr;
 	uint16 lofs, cofs;
-	struct view_loop *vl;
-	struct view_cel *vc;
+	view_loop *vl;
+	view_cel *vc;
 
 	debugC(5, kDebugLevelResources, "decode_view(%d)", n);
 	v = game.views[n].rdata;
@@ -153,7 +153,7 @@
 
 	/* allocate memory for all views */
 	game.views[n].loop = (view_loop *)
-			calloc(game.views[n].num_loops, sizeof(struct view_loop));
+			calloc(game.views[n].num_loops, sizeof(view_loop));
 
 	if (game.views[n].loop == NULL)
 		return err_NotEnoughMemory;
@@ -167,7 +167,7 @@
 
 		vl->num_cels = *(v + lofs);
 		debugC(6, kDebugLevelResources, "view %d, num_cels = %d", n, vl->num_cels);
-		vl->cel = (view_cel *) calloc(vl->num_cels, sizeof(struct view_cel));
+		vl->cel = (view_cel *) calloc(vl->num_cels, sizeof(view_cel));
 		if (vl->cel == NULL) {
 			free(game.views[n].loop);
 			game.views[n].num_loops = 0;
@@ -231,7 +231,7 @@
  * @param v pointer to view table entry
  * @param n number of cel
  */
-void set_cel(struct vt_entry *v, int n) {
+void set_cel(vt_entry *v, int n) {
 	assert(v->view_data != NULL);
 	assert(v->num_cels >= n);
 
@@ -257,7 +257,7 @@
  * @param v pointer to view table entry
  * @param n number of loop
  */
-void set_loop(struct vt_entry *v, int n) {
+void set_loop(vt_entry *v, int n) {
 	assert(v->view_data != NULL);
 	assert(v->num_loops >= n);
 	_set_loop(v, n);
@@ -269,7 +269,7 @@
  * @param v pointer to view table entry
  * @param n number of AGI view resource
  */
-void set_view(struct vt_entry *v, int n) {
+void set_view(vt_entry *v, int n) {
 	v->view_data = &game.views[n];
 	v->current_view = n;
 	v->num_loops = v->view_data->num_loops;
@@ -280,7 +280,7 @@
  * Set the view table entry as updating.
  * @param v pointer to view table entry
  */
-void start_update(struct vt_entry *v) {
+void start_update(vt_entry *v) {
 	if (~v->flags & UPDATE) {
 		erase_both();
 		v->flags |= UPDATE;
@@ -292,7 +292,7 @@
  * Set the view table entry as non-updating.
  * @param v pointer to view table entry
  */
-void stop_update(struct vt_entry *v) {
+void stop_update(vt_entry *v) {
 	if (v->flags & UPDATE) {
 		erase_both();
 		v->flags &= ~UPDATE;
@@ -317,7 +317,7 @@
  * to update the view table entries and blit the sprites.
  */
 void update_viewtable() {
-	struct vt_entry *v;
+	vt_entry *v;
 	int i, loop;
 
 	i = 0;
@@ -375,8 +375,7 @@
 	}
 }
 
-bool is_ego_view(const vt_entry* v)
-{
+bool is_ego_view(const vt_entry* v) {
 	return v == game.view_table;
 }
 

Modified: scummvm/trunk/engines/agi/view.h
===================================================================
--- scummvm/trunk/engines/agi/view.h	2006-05-25 22:51:42 UTC (rev 22639)
+++ scummvm/trunk/engines/agi/view.h	2006-05-25 22:53:45 UTC (rev 22640)
@@ -119,17 +119,17 @@
 
 /* Motion */
 void check_all_motions(void);
-void move_obj(struct vt_entry *);
-void in_destination(struct vt_entry *);
+void move_obj(vt_entry *);
+void in_destination(vt_entry *);
 void fix_position(int);
 void update_position(void);
 
 /* View table management */
-void set_cel(struct vt_entry *, int);
-void set_loop(struct vt_entry *, int);
-void set_view(struct vt_entry *, int);
-void start_update(struct vt_entry *);
-void stop_update(struct vt_entry *);
+void set_cel(vt_entry *, int);
+void set_loop(vt_entry *, int);
+void set_view(vt_entry *, int);
+void start_update(vt_entry *);
+void stop_update(vt_entry *);
 void update_viewtable(void);
 
 void unload_view(int);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.