From 51d56bfe5830a41e61f4ceefb75217f647d994fe Mon Sep 17 00:00:00 2001
From: Joshua Grams <josh@qualdan.com>
Date: Tue, 13 Jun 2006 19:49:29 +0000
Subject: [PATCH] started factoring out global t_frame

---
 dust.c    |    6 +++---
 dust.h    |    2 +-
 globals.h |    4 ----
 main.c    |    6 +++---
 rocks.c   |    6 +++---
 rocks.h   |    2 +-
 sprite.c  |   10 +++++-----
 sprite.h  |    4 ++--
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/dust.c b/dust.c
index b336696..5ee9e20 100644
--- a/dust.c
+++ b/dust.c
@@ -27,11 +27,11 @@ init_dust(void)
 }
 
 void
-move_dust(void)
+move_dust(float ticks)
 {
 	int i;
-	float xscroll = screendx * t_frame;
-	float yscroll = screendy * t_frame;
+	float xscroll = screendx * ticks;
+	float yscroll = screendy * ticks;
 	for(i=0; i<N_DUST_MOTES; i++) {
 		motes[i].x -= xscroll / (1.3 + motes[i].z);
 		motes[i].y -= yscroll / (1.3 + motes[i].z);
diff --git a/dust.h b/dust.h
index 984587b..5241a60 100644
--- a/dust.h
+++ b/dust.h
@@ -11,7 +11,7 @@
 #define MAX_DUST_DEPTH 2
 
 void init_dust(void);
-void move_dust(void);
+void move_dust(float ticks);
 void draw_dust(SDL_Surface *);
 
 #endif // VOR_DUST_H
diff --git a/globals.h b/globals.h
index a16e9f8..24e016e 100644
--- a/globals.h
+++ b/globals.h
@@ -50,10 +50,6 @@ extern char *initerror;
 
 extern float screendx, screendy;
 
-// All movement is based on t_frame.
-// All speeds are pixels/tick, with 20 ticks per second.
-extern float t_frame;  // length of this frame (in ticks = 1/20th second)
-
 extern int score;
 extern int g_easy;
 extern float fadetimer, faderate;
diff --git a/main.c b/main.c
index e3a0f83..e6449fe 100644
--- a/main.c
+++ b/main.c
@@ -343,7 +343,7 @@ drawdots(SDL_Surface *s) {
 		}
 	}
 
-	move_dust();
+	move_dust(t_frame);
 
 	SDL_LockSurface(s);
 	draw_dust(s);
@@ -676,7 +676,7 @@ gameloop() {
 				}
 			}
 
-			new_rocks();
+			new_rocks(t_frame);
 
 			// SCROLLING
 			tmp = (ship.y+ship.dy*t_frame-YSCROLLTO)/25 + (ship.dy-screendy);
@@ -694,7 +694,7 @@ gameloop() {
 			bangx += (bangdx - screendx)*t_frame;
 			bangy += (bangdy - screendy)*t_frame;
 
-			move_sprites();
+			move_sprites(t_frame);
 
 
 			// BOUNCE off left or right edge of screen
diff --git a/rocks.c b/rocks.c
index 9384fe0..c404305 100644
--- a/rocks.c
+++ b/rocks.c
@@ -129,7 +129,7 @@ weighted_rnd_range(float min, float max) {
 }
 
 void
-new_rocks(void)
+new_rocks(float ticks)
 {
 	int i, type;
 	struct rock *r;
@@ -138,7 +138,7 @@ new_rocks(void)
 	float rmax[4];
 
 	if(nrocks < final_rocks) {
-		nrocks_timer += t_frame;
+		nrocks_timer += ticks;
 		if(nrocks_timer >= nrocks_inc_ticks) {
 			nrocks_timer -= nrocks_inc_ticks;
 			nrocks++;
@@ -148,7 +148,7 @@ new_rocks(void)
 	rock_sides(ti, rmin, rmax);
 
 	// increment timers
-	for(i=0; i<4; i++) rtimers[i] += ti[i]*t_frame;
+	for(i=0; i<4; i++) rtimers[i] += ti[i]*ticks;
 
 	// generate rocks
 	for(i=0; i<4; i++) {
diff --git a/rocks.h b/rocks.h
index 1fbff53..baa462d 100644
--- a/rocks.h
+++ b/rocks.h
@@ -3,7 +3,7 @@
 void load_rocks(void);
 void reset_rocks(void);
 
-void new_rocks(void);
+void new_rocks(float ticks);
 void draw_rocks(void);
 
 void blast_rocks(float x, float y, float radius);
diff --git a/sprite.c b/sprite.c
index 447e482..36ca546 100644
--- a/sprite.c
+++ b/sprite.c
@@ -128,11 +128,11 @@ reset_sprites(void)
 }
 
 void
-move_sprite(Sprite *s)
+move_sprite(Sprite *s, float ticks)
 {
 	if(s->flags & MOVE) {
-		s->x += (s->dx - screendx)*t_frame;
-		s->y += (s->dy - screendy)*t_frame;
+		s->x += (s->dx - screendx)*ticks;
+		s->y += (s->dy - screendy)*ticks;
 	}
 }
 
@@ -148,7 +148,7 @@ sort_sprite(Sprite *s)
 }
 
 void
-move_sprites(void)
+move_sprites(float ticks)
 {
 	int sq;
 	Sprite **head;
@@ -158,7 +158,7 @@ move_sprites(void)
 		head=&sprites[set][sq];
 		while(*head) {
 			Sprite *s = remove_sprite(head);
-			move_sprite(s); sort_sprite(s);
+			move_sprite(s, ticks); sort_sprite(s);
 		}
 	}
 	set = 1-set;  // switch to other set of sprites.
diff --git a/sprite.h b/sprite.h
index 3cb2c0e..0bca1af 100644
--- a/sprite.h
+++ b/sprite.h
@@ -40,8 +40,8 @@ void collisions(void);
 void init_sprites(void);
 void reset_sprites(void);
 void add_sprite(Sprite *s);
-void move_sprite(Sprite *s);
-void move_sprites(void);
+void move_sprite(Sprite *s, float ticks);
+void move_sprites(float ticks);
 
 Sprite *collides(Sprite *s);
 Sprite * pixel_collides(float x, float y);
-- 
1.7.10.4