X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=dust.c;h=0e4daa263b935c8a3e49ad08551dceb1dd308999;hp=96a5805601b5d99841e5fed771f1e57530ff97e7;hb=HEAD;hpb=1796973cc22433f9b875b8b6d945fc914a78e14d

diff --git a/dust.c b/dust.c
index 96a5805..0e4daa2 100644
--- a/dust.c
+++ b/dust.c
@@ -1,9 +1,10 @@
 #include <SDL.h>
 #include <math.h>
 
-#include "config.h"
+#include "vorconfig.h"
 #include "globals.h"
 #include "dust.h"
+#include "float.h"
 #include "mt.h"
 
 struct dust_mote {
@@ -13,9 +14,6 @@ struct dust_mote {
 
 struct dust_mote motes[N_DUST_MOTES];
 
-// lower bound to ensure that we don't lose precision when wrapping.
-static float zero;
-
 void
 init_dust(void)
 {
@@ -27,34 +25,30 @@ init_dust(void)
 		b = (MAX_DUST_DEPTH - motes[i].z) * 255.0 / MAX_DUST_DEPTH;
 		motes[i].color = SDL_MapRGB(surf_screen->format, b, b, b);
 	}
-
-	zero = pow(-10, ceil(log10(XSIZE)) - FLT_DIG);
 }
 
 void
-move_dust(float ticks)
+move_dust(void)
 {
 	int i;
-	float xscroll = screendx * ticks;
-	float yscroll = screendy * ticks;
+	float xscroll = screendx * t_frame;
+	float yscroll = screendy * t_frame;
 	
 	for(i=0; i<N_DUST_MOTES; i++) {
 		motes[i].x -= xscroll / (1.3 + motes[i].z);
-		if(motes[i].x >= XSIZE) motes[i].x -= XSIZE;
-		else if(motes[i].x < zero) motes[i].x += XSIZE;
+		motes[i].x = fwrap(motes[i].x, XSIZE);
 
 		motes[i].y -= yscroll / (1.3 + motes[i].z);
-		if(motes[i].y >= YSIZE) motes[i].y -= YSIZE;
-		else if(motes[i].y < zero) motes[i].y += YSIZE;
+		motes[i].y = fwrap(motes[i].y, YSIZE);
 	}
 }
 
 void
-draw_dust(SDL_Surface *s)
+draw_dust(void)
 {
 	int i;
-	uint16_t *pixels = s->pixels;
+	uint16_t *pixels = surf_screen->pixels;
 	for(i=0; i<N_DUST_MOTES; i++) {
-		pixels[s->pitch/2*(int)motes[i].y + (int)motes[i].x] = motes[i].color;
+		pixels[surf_screen->pitch/2*(int)motes[i].y + (int)motes[i].x] = motes[i].color;
 	}
 }