Implement new shot name generation using a persistent index.

[neverball] / share / geom.h

diff --git a/share/geom.h b/share/geom.h
index 36f6943..bc73828 100644 (file)
--- a/share/geom.h
+++ b/share/geom.h
@@ -3,13 +3,16 @@
 
 /*---------------------------------------------------------------------------*/
 
+#include "solid.h"
+
+/*---------------------------------------------------------------------------*/
+
 #define IMG_SHAD "png/shadow.png"
-#define IMG_COIN _("png/coin.png")
 
-#define IMG_ITEM_GROW   "png/growup.png"
-#define IMG_ITEM_SHRINK "png/growdn.png"
+#define IMG_ITEM_COIN   _("png/coin.png")
+#define IMG_ITEM_GROW    "png/grow.png"
+#define IMG_ITEM_SHRINK  "png/shrink.png"
 
-#define BALL_FUDGE    0.001f
 #define COIN_RADIUS   0.15f
 #define COIN_THICK    0.01f
 #define JUMP_HEIGHT   2.00f
@@ -19,36 +22,18 @@
 
 /*---------------------------------------------------------------------------*/
 
-void ball_init(int);
-void ball_free(void);
-void ball_draw(int);
-
-/*---------------------------------------------------------------------------*/
-
 void mark_init(int);
 void mark_free(void);
 void mark_draw(void);
 
 /*---------------------------------------------------------------------------*/
 
-void coin_color(float *, int);
-void coin_init(int);
-void coin_free(void);
-
-void coin_push(void);
-void coin_push_text(int n);
-void coin_draw(int, float);
-void coin_pull(void);
-
-/*---------------------------------------------------------------------------*/
-
-void item_color(float *, int);
+void item_color(const struct s_item *, float *);
 void item_init(int);
 void item_free(void);
 
-void item_push(void);
-void item_push_text(int n);
-void item_draw(int, float);
+void item_push(int);
+void item_draw(const struct s_item *, float);
 void item_pull(void);
 
 /*---------------------------------------------------------------------------*/