head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.0.30
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.28
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.26
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.24
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.22
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.20
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.18
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.16
	pkgsrc-2008Q1:1.1.0.14
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.12
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.10
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.8
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.6
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.4
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.2
	pkgsrc-2006Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.12.03.06.33.46;	author snj;	state dead;
branches;
next	1.1;

1.1
date	2006.08.22.15.22.31;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update neverball to 1.5.4.  Inspired by PR pkg/41637.

pkgsrc changes:
The neverball script is no more.  To run neverball, use the neverball
binary.  To run neverputt, use the neverputt binary.  Sanity restored.

Upstream changes:
Updated maps, textures, zillions of bugfixes and small enhancements.
A few highlights:
* Split off limited lives and set high-scores to a separate "Challenge"
  game mode.
* Middle mouse button toggles between chase/manual views
* Allow view rotation using second gamepad stick
* Add a ball configuration screen
* Bound camera rotation keys to S and D by default.
* Make mouse buttons configurable (full view control)
* Rewrote audio code, eliminating SDL_mixer dependency.
* Rewrote image handling, eliminating SDL_image dependency.
@
text
@$NetBSD: patch-aa,v 1.1 2006/08/22 15:22:31 joerg Exp $

--- ball/game.c.orig	2004-07-21 21:20:07.000000000 +0000
+++ ball/game.c
@@@@ -36,7 +36,7 @@@@ static int game_state = 0;
 static struct s_file file;
 static struct s_file back;
 
-static float clock = 0.f;               /* Clock time                        */
+static float my_clock = 0.f;               /* Clock time                        */
 
 static float game_ix;                   /* Input rotation about X axis       */
 static float game_iz;                   /* Input rotation about Z axis       */
@@@@ -102,7 +102,7 @@@@ int game_init(const char *file_name,
               const char *back_name,
               const char *grad_name, int t, int e)
 {
-    clock = (float) t / 100.f;
+    my_clock = (float) t / 100.f;
 
     if (game_state)
         game_free();
@@@@ -159,7 +159,7 @@@@ void game_free(void)
 
 int curr_clock(void)
 {
-    return (int) (clock * 100.f);
+    return (int) (my_clock * 100.f);
 }
 
 char *curr_intro(void)
@@@@ -600,8 +600,8 @@@@ static void game_update_view(float dt)
 
 static void game_update_time(float dt, int b)
 {
-    int tick = (int) floor(clock);
-    int tock = (int) floor(clock * 2);
+    int tick = (int) floor(my_clock);
+    int tock = (int) floor(my_clock * 2);
 
     if (goal_e && goal_k < 1.0f)
         goal_k += dt;
@@@@ -610,17 +610,17 @@@@ static void game_update_time(float dt, i
 
     if (b)
     {
-        if (clock < 600.f)
-            clock -= dt;
-        if (clock < 0.f)
-            clock = 0.f;
+        if (my_clock < 600.f)
+            my_clock -= dt;
+        if (my_clock < 0.f)
+            my_clock = 0.f;
 
-        if (0 < tick && tick <= 10 && tick == (int) ceil(clock))
+        if (0 < tick && tick <= 10 && tick == (int) ceil(my_clock))
         {
             audio_play(AUD_TICK, 1.f);
             hud_time_pulse(1.50);
         }
-        else if (0 < tock && tock <= 10 && tock == (int) ceil(clock * 2))
+        else if (0 < tock && tock <= 10 && tock == (int) ceil(my_clock * 2))
         {
             audio_play(AUD_TOCK, 1.f);
             hud_time_pulse(1.25);
@@@@ -671,7 +671,7 @@@@ static int game_update_state(void)
 
     /* Test for time-out. */
 
-    if (clock <= 0.f)
+    if (my_clock <= 0.f)
         return GAME_TIME;
 
     /* Test for fall-out. */
@


1.1
log
@Rename static clock variable to avoid conflict with function from
time.h on DragonFly.
@
text
@d1 1
a1 1
$NetBSD$
@