[Xbubble-commits] xbubble-sdl/src frame.c,1.3,1.4 frame.h,1.2,1.3

[Martin Quinson]

Update of /cvsroot/xbubble/xbubble-sdl/src
In directory haydn:/tmp/cvs-serv31718

Modified Files:
	frame.c frame.h 
Log Message:
Cosmetics: struct field renaming and other cleanups

Index: frame.c
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/frame.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- frame.c	12 Sep 2006 08:04:08 -0000	1.3
+++ frame.c	16 Sep 2006 13:26:16 -0000	1.4
@@ -9,14 +9,12 @@
 frame_t frame_new_raw ( SDL_Surface *surf) {
   frame_t frame = (frame_t) xmalloc( sizeof( struct _frame ));
 
-  xassert(surf, "cannot make frame from null surf");
   frame->surf=surf;
-  xassert(frame->surf, "FUCKcannot make frame from null surf");
 
   /* default settings */
   frame->delay = 40; /* default frame duration = 40 ms */
-  frame->dim.x = surf->w;
-  frame->dim.y = surf->h;
+  frame->pos.w = surf->w;
+  frame->pos.h = surf->h;
 
   return frame;
 }

Index: frame.h
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/frame.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- frame.h	12 Sep 2006 08:04:08 -0000	1.2
+++ frame.h	16 Sep 2006 13:26:16 -0000	1.3
@@ -7,17 +7,9 @@
   SDL_Surface *surf;
   int delay; /* frame duration in ms */
 
-  SDL_Rect dim;
+  SDL_Rect pos; /* only w & h are used */
   int cx;
   int cy;
-  /*  
-  int width;
-  int height;
-  int delay;
-  int has_mask;
-  Pixmap pixmap;
-  GC gc;
-  */
 } * frame_t;
 
 /* New frame from unchanged surf */