Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
number of rocks on screen now starts at 25, gradually increasing
[vor.git]
/
rocks.c
diff --git
a/rocks.c
b/rocks.c
index
5c23b81
..
19918ed
100644
(file)
--- a/
rocks.c
+++ b/
rocks.c
@@
-24,7
+24,10
@@
struct shape rock_shapes[NROCKS];
// timers for rock generation.
float rtimers[4];
// timers for rock generation.
float rtimers[4];
-int nrocks;
+
+uint32_t nrocks;
+uint32_t nrocks_timer;
+uint32_t nrocks_inc_ticks = 2*60*1000/(F_ROCKS-I_ROCKS);
// constants for rock generation.
#define KH 32.0 // 32 s for a speed=1 rock to cross the screen horizontally.
// constants for rock generation.
#define KH 32.0 // 32 s for a speed=1 rock to cross the screen horizontally.
@@
-50,7
+53,6
@@
init_rocks(void)
NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
get_shape(surf_rock[i], &rock_shapes[i]);
}
NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
get_shape(surf_rock[i], &rock_shapes[i]);
}
- nrocks = 41;
return 0;
}
return 0;
}
@@
-60,6
+62,8
@@
reset_rocks(void)
int i;
for(i = 0; i<MAXROCKS; i++) rock[i].active = 0;
int i;
for(i = 0; i<MAXROCKS; i++) rock[i].active = 0;
+ nrocks = I_ROCKS;
+ nrocks_timer = 0;
}
enum { LEFT, RIGHT, TOP, BOTTOM };
}
enum { LEFT, RIGHT, TOP, BOTTOM };
@@
-108,6
+112,14
@@
new_rocks(void)
int i,j;
float ti[4];
int i,j;
float ti[4];
+ if(nrocks < F_ROCKS) {
+ nrocks_timer += ticks_since_last;
+ if(nrocks_timer >= nrocks_inc_ticks) {
+ nrocks_timer -= nrocks_inc_ticks;
+ nrocks++;
+ }
+ }
+
rock_timer_increments(ti);
for(i=0; i<4; i++) {
rock_timer_increments(ti);
for(i=0; i<4; i++) {
@@
-215,6
+227,8
@@
blast_rocks(float x, float y, float radius, int onlyslow)
int i;
float dx, dy, n;
int i;
float dx, dy, n;
+ if(onlyslow) return;
+
for(i = 0; i<MAXROCKS; i++ ) {
if(rock[i].x <= 0) continue;
for(i = 0; i<MAXROCKS; i++ ) {
if(rock[i].x <= 0) continue;
@@
-228,7
+242,7
@@
blast_rocks(float x, float y, float radius, int onlyslow)
n = sqrt(dx*dx + dy*dy);
if(n < radius) {
n = sqrt(dx*dx + dy*dy);
if(n < radius) {
- n *= 20;
+ n *= 15;
rock[i].dx += 54.0*dx/n;
rock[i].dy += 54.0*dy/n;
}
rock[i].dx += 54.0*dx/n;
rock[i].dy += 54.0*dy/n;
}