Remove all coin-specific geometry functions except coin_head, coin_tail

[neverball] / share / geom.h

diff --git a/share/geom.h b/share/geom.h
index 9457fc9..89426bb 100644 (file)
--- a/share/geom.h
+++ b/share/geom.h
@@ -3,8 +3,16 @@
 
 /*---------------------------------------------------------------------------*/
 
+#include "solid.h"
+
+/*---------------------------------------------------------------------------*/
+
 #define IMG_SHAD "png/shadow.png"
 
+#define IMG_ITEM_COIN   _("png/coin.png")
+#define IMG_ITEM_GROW     "png/growup.png"
+#define IMG_ITEM_SHRINK   "png/growdn.png"
+
 #define BALL_FUDGE    0.001f
 #define COIN_RADIUS   0.15f
 #define COIN_THICK    0.01f
@@ -17,7 +25,7 @@
 
 void ball_init(int);
 void ball_free(void);
-void ball_draw(void);
+void ball_draw(int);
 
 /*---------------------------------------------------------------------------*/
 
@@ -27,13 +35,14 @@ void mark_draw(void);
 
 /*---------------------------------------------------------------------------*/
 
-void coin_color(float *, int);
-void coin_init(int);
-void coin_free(void);
+void item_color(const struct s_item *, float *);
+void item_init(int);
+void item_free(void);
 
-void coin_push(void);
-void coin_draw(int, float);
-void coin_pull(void);
+void item_push(void);
+void item_push_text(int);
+void item_draw(const struct s_item *, float);
+void item_pull(void);
 
 /*---------------------------------------------------------------------------*/
 
@@ -45,13 +54,13 @@ void goal_draw(void);
 
 void jump_init(int);
 void jump_free(void);
-void jump_draw(void);
+void jump_draw(int);
 
 /*---------------------------------------------------------------------------*/
 
 void swch_init(int);
 void swch_free(void);
-void swch_draw(int);
+void swch_draw(int, int);
 
 /*---------------------------------------------------------------------------*/