glasstower: smooth glass goal

[neverball] / ball / st_shared.c

diff --git a/ball/st_shared.c b/ball/st_shared.c
index 0147c53..44695c1 100644 (file)
--- a/ball/st_shared.c
+++ b/ball/st_shared.c
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2003 Robert Kooima - 2006 Jean Privat
+ * Part of the Neverball Project http://icculus.org/neverball/
+ *
+ * NEVERBALL is  free software; you can redistribute  it and/or modify
+ * it under the  terms of the GNU General  Public License as published
+ * by the Free  Software Foundation; either version 2  of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT  ANY  WARRANTY;  without   even  the  implied  warranty  of
+ * MERCHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.   See the GNU
+ * General Public License for more details.
+ */
+
 #include "gui.h"
 #include "config.h"
 #include "audio.h"
@@ -11,24 +26,26 @@ void shared_leave(int id)
     gui_delete(id);
 }
 
-void shared_paint(int id, float st)
+void shared_paint(int id, float t)
 {
-    game_draw(0, st);
+    game_draw(0, t);
     gui_paint(id);
 }
 
 void shared_timer(int id, float dt)
 {
     gui_timer(id, dt);
-    audio_timer(dt);
 }
 
 int shared_point_basic(int id, int x, int y)
-/* Pulse, activate and return the active id (if changed)*/
 {
+    /* Pulse, activate and return the active id (if changed) */
+
     int jd = gui_point(id, x, y);
+
     if (jd)
         gui_pulse(jd, 1.2f);
+
     return jd;
 }
 
@@ -38,15 +55,18 @@ void shared_point(int id, int x, int y, int dx, int dy)
 }
 
 int shared_stick_basic(int id, int a, int v)
-/* Pulse, activate and return the active id (if changed)*/
 {
+    /* Pulse, activate and return the active id (if changed) */
+
     int jd = 0;
-    if (config_tst_d(CONFIG_JOYSTICK_AXIS_X, a))
+
+    if      (config_tst_d(CONFIG_JOYSTICK_AXIS_X, a))
         jd = gui_stick(id, v, 0);
     else if (config_tst_d(CONFIG_JOYSTICK_AXIS_Y, a))
         jd = gui_stick(id, 0, v);
     if (jd)
         gui_pulse(jd, 1.2f);
+
     return jd;
 }
 
@@ -55,11 +75,16 @@ void shared_stick(int id, int a, int v)
     shared_stick_basic(id, a, v);
 }
 
+void shared_angle(int id, int x, int z)
+{
+    game_set_ang(x, z);
+}
+
 int shared_click(int b, int d)
 {
     if (b < 0 && d == 1)
-       return st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_A), 1);
-    else 
-       return 1;
+        return st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_A), 1);
+    else
+        return 1;
 }