Almost completely separate coins and items in share/geom.c. Items still

[neverball] / ball / st_over.c

diff --git a/ball/st_over.c b/ball/st_over.c
index 4b6f9b8..44f025e 100644 (file)
--- a/ball/st_over.c
+++ b/ball/st_over.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -19,6 +19,7 @@
 #include "audio.h"
 #include "config.h"
 #include "demo.h"
+#include "st_shared.h"
 
 #include "st_over.h"
 #include "st_start.h"
@@ -43,17 +44,6 @@ static int over_enter(void)
     return id;
 }
 
-static void over_leave(int id)
-{
-    gui_delete(id);
-}
-
-static void over_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
 static void over_timer(int id, float dt)
 {
     if (dt > 0.f && time_state() > 3.f)
@@ -83,8 +73,8 @@ static int over_buttn(int b, int d)
 
 struct state st_over = {
     over_enter,
-    over_leave,
-    over_paint,
+    shared_leave,
+    shared_paint,
     over_timer,
     NULL,
     NULL,