projects
/
neverball
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct logic of BSP back/front tests
[neverball]
/
share
/
geom.h
diff --git
a/share/geom.h
b/share/geom.h
index
9457fc9
..
a21b660
100644
(file)
--- a/
share/geom.h
+++ b/
share/geom.h
@@
-3,11
+3,12
@@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
+#include "solid.h"
+
+/*---------------------------------------------------------------------------*/
+
#define IMG_SHAD "png/shadow.png"
#define IMG_SHAD "png/shadow.png"
-#define BALL_FUDGE 0.001f
-#define COIN_RADIUS 0.15f
-#define COIN_THICK 0.01f
#define JUMP_HEIGHT 2.00f
#define SWCH_HEIGHT 2.00f
#define GOAL_HEIGHT 3.00f
#define JUMP_HEIGHT 2.00f
#define SWCH_HEIGHT 2.00f
#define GOAL_HEIGHT 3.00f
@@
-15,28
+16,12
@@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-void ball_init(int);
-void ball_free(void);
-void ball_draw(void);
-
-/*---------------------------------------------------------------------------*/
-
void mark_init(int);
void mark_free(void);
void mark_draw(void);
/*---------------------------------------------------------------------------*/
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_draw(int, float);
-void coin_pull(void);
-
-/*---------------------------------------------------------------------------*/
-
void goal_init(int);
void goal_free(void);
void goal_draw(void);
void goal_init(int);
void goal_free(void);
void goal_draw(void);
@@
-45,13
+30,13
@@
void goal_draw(void);
void jump_init(int);
void jump_free(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_init(int);
void swch_free(void);
-void swch_draw(int);
+void swch_draw(int, int);
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/