removed title from main menu

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index e85ccda..243ac8e 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -16,13 +16,17 @@
 #include <SDL.h>
 #include "type.h"
 
-typedef struct bouncy_distro_type /*It is easier to read the sources IMHO, if we don't write something like int a,b,c; */
-  {
-    base_type base;
-  }
-bouncy_distro_type;
+/* Bounciness of distros: */
 
-texture_type img_distro[4];
+#define NO_BOUNCE 0
+#define BOUNCE 1
+
+struct bouncy_distro_type
+{
+  base_type base;
+};
+
+extern texture_type img_distro[4];
 
 void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y);
 void bouncy_distro_action(bouncy_distro_type* pbouncy_distro);
@@ -32,37 +36,34 @@ void bouncy_distro_collision(bouncy_distro_type* pbouncy_distro, int c_object);
 #define BOUNCY_BRICK_MAX_OFFSET 8
 #define BOUNCY_BRICK_SPEED 0.9
 
-typedef struct broken_brick_type
-  {
-    base_type base;
-    timer_type timer;
-  }
-broken_brick_type;
+struct broken_brick_type
+{
+  base_type base;
+  timer_type timer;
+};
 
 void broken_brick_init(broken_brick_type* pbroken_brick, float x, float y, float xm, float ym);
 void broken_brick_action(broken_brick_type* pbroken_brick);
 void broken_brick_draw(broken_brick_type* pbroken_brick);
 
-typedef struct bouncy_brick_type
-  {
-    float offset;
-    float offset_m;
-    int shape;
-    base_type base;
-  }
-bouncy_brick_type;
+struct bouncy_brick_type
+{
+  float offset;
+  float offset_m;
+  int shape;
+  base_type base;
+};
 
 void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y);
 void bouncy_brick_action(bouncy_brick_type* pbouncy_brick);
 void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick);
 
-typedef struct floating_score_type
-  {
-    int value;
-    timer_type timer;
-    base_type base;
-  }
-floating_score_type;
+struct floating_score_type
+{
+  int value;
+  timer_type timer;
+  base_type base;
+};
 
 void floating_score_init(floating_score_type* pfloating_score, float x, float y, int s);
 void floating_score_action(floating_score_type* pfloating_score);