static float jump_p[3]; /* Jump destination */
static float fade_k = 0.0; /* Fade in/out level */
static float fade_d = 0.0; /* Fade in/out direction */
-static int drawball = 1; /* Should the ball be drawn? */
static int ball_b = 0; /* Is the ball a bonus ball? */
static int grow = 0; /* Should the ball be changing size? */
/*---------------------------------------------------------------------------*/
-static void grow_set(const struct s_file *fp, int size)
+static void grow_set(const struct s_file *fp, int type)
{
if (!got_orig)
{
got_orig = 1;
}
- if (size == 50)
+ if (type == ITEM_SHRINK)
{
if (grow_goal == grow_orig * GROW_SMALL)
return;
grow = 1;
}
}
- if (size == 150)
+ if (type == ITEM_GROW)
{
if (grow_goal == grow_orig * GROW_BIG)
return;
static void view_init(void)
{
- /* Get the initial orientation angle */
- if (file.uc > 0)
- view_a = file.uv->a - 90.f; /* angle is in the sol */
- else
- view_a = 0.f; /* default is north :) */
-
+ view_a = 0.f;
view_ry = 0.f;
view_fov = (float) config_get_d(CONFIG_VIEW_FOV);
if (game_state)
game_free();
- if (!sol_load_gl(&file, level->file, config_get_d(CONFIG_TEXTURES),
+ if (!sol_load_gl(&file, config_data(level->file),
+ config_get_d(CONFIG_TEXTURES),
config_get_d(CONFIG_SHADOW)))
return (game_state = 0);
game_rx = 0.f;
game_rz = 0.f;
- drawball = 1;
-
/* Initialize jump and goal states. */
jump_e = 1;
glPopMatrix();
}
-static void game_draw_coins(const struct s_file *fp)
+static void game_draw_items(const struct s_file *fp)
{
float r = 360.f * SDL_GetTicks() / 1000.f;
- int ci;
+ int hi;
+
+ /* FIXME: Draw items of different types in one pass. */
- coin_push();
- coin_push_text(0); /* Regular coins. */
+ item_push();
+ item_push_text(ITEM_COIN);
{
- for (ci = 0; ci < fp->cc; ci++)
+ for (hi = 0; hi < fp->hc; hi++)
- if (fp->cv[ci].n > 0 && fp->cv[ci].n < 50)
+ if (fp->hv[hi].t == ITEM_COIN && fp->hv[hi].n > 0)
{
glPushMatrix();
{
- glTranslatef(fp->cv[ci].p[0],
- fp->cv[ci].p[1],
- fp->cv[ci].p[2]);
+ glTranslatef(fp->hv[hi].p[0],
+ fp->hv[hi].p[1],
+ fp->hv[hi].p[2]);
glRotatef(r, 0.0f, 1.0f, 0.0f);
- coin_draw(fp->cv[ci].n, r);
+ item_draw(&fp->hv[hi], r);
}
glPopMatrix();
}
}
- coin_pull();
+ item_pull();
- /* FIXME: there has got to be a better way than three seperate loops, once
- * for each texture, but someone else is going to have to do it! */
-
- coin_push();
- coin_push_text(50); /* Any shrink coins? */
+ item_push();
+ item_push_text(ITEM_SHRINK);
{
- for (ci = 0; ci < fp->cc; ci++)
+ for (hi = 0; hi < fp->hc; hi++)
- if (fp->cv[ci].n == 50)
+ if (fp->hv[hi].t == ITEM_SHRINK)
{
glPushMatrix();
{
- glTranslatef(fp->cv[ci].p[0],
- fp->cv[ci].p[1],
- fp->cv[ci].p[2]);
+ glTranslatef(fp->hv[hi].p[0],
+ fp->hv[hi].p[1],
+ fp->hv[hi].p[2]);
glRotatef(r, 0.0f, 1.0f, 0.0f);
- coin_draw(fp->cv[ci].n, r);
+ item_draw(&fp->hv[hi], r);
}
glPopMatrix();
}
}
- coin_pull();
+ item_pull();
- coin_push();
- coin_push_text(150); /* Any grow coins? */
+ item_push();
+ item_push_text(ITEM_GROW);
{
- for (ci = 0; ci < fp->cc; ci++)
+ for (hi = 0; hi < fp->hc; hi++)
- if (fp->cv[ci].n == 150)
+ if (fp->hv[hi].t == ITEM_GROW)
{
glPushMatrix();
{
- glTranslatef(fp->cv[ci].p[0],
- fp->cv[ci].p[1],
- fp->cv[ci].p[2]);
+ glTranslatef(fp->hv[hi].p[0],
+ fp->hv[hi].p[1],
+ fp->hv[hi].p[2]);
glRotatef(r, 0.0f, 1.0f, 0.0f);
- coin_draw(fp->cv[ci].n, r);
+ item_draw(&fp->hv[hi], r);
}
glPopMatrix();
}
}
- coin_pull();
+ item_pull();
}
static void game_draw_goals(const struct s_file *fp, float rx, float ry)
sol_draw(&file);
- if (config_get_d(CONFIG_SHADOW) && drawball)
+ if (config_get_d(CONFIG_SHADOW))
{
shad_draw_set(ball_p, ball_r);
sol_shad(&file);
if (pose == 0)
{
part_draw_coin(-rx * d, -ry);
- game_draw_coins(&file);
- if (drawball)
- game_draw_balls(&file);
+ game_draw_items(&file);
+ game_draw_balls(&file);
}
game_draw_goals(&file, -rx * d, -ry);
game_draw_jumps(&file);
static int game_update_state(int *state_value)
{
struct s_file *fp = &file;
+ struct s_goal *zp;
+ struct s_item *hp;
+
float p[3];
float c[3];
- int bt = state_value != NULL;
- int n;
- struct s_goal *g;
- /* Test for a coin grab. */
+ int bt = state_value != NULL;
- if (bt && (n = sol_coin_test(fp, p, COIN_RADIUS)) > 0)
+ /* Test for an item. */
+ if (bt && (hp = sol_item_test(fp, p, COIN_RADIUS)))
{
- coin_color(c, n);
+ int sound = AUD_COIN;
+
+ item_color(hp, c);
part_burst(p, c);
- /* Add coins if regular, change radius if not. */
+ grow_set(fp, hp->t);
- if (n <= 10)
- coins += n;
- else
+ if (hp->t == ITEM_COIN)
{
- grow_set(fp, n);
- n = 0;
- }
+ coins += hp->n;
- /* Check for goal open. */
- if (goal_c > 0)
- {
- goal_c = goal_c - n;
- if (goal_c <= 0)
+ /* Check for goal open. */
+ if (goal_c > 0)
{
- audio_play(AUD_SWITCH, 1.f);
- goal_c = 0;
+ goal_c -= hp->n;
+ if (goal_c <= 0)
+ {
+ sound = AUD_SWITCH;
+ goal_c = 0;
+ }
}
- else
- audio_play(AUD_COIN, 1.f);
}
- else
- audio_play(AUD_COIN, 1.f);
+ audio_play(sound, 1.f);
+
+ /* Reset item type. */
+ hp->t = ITEM_NONE;
}
/* Test for a switch. */
/* Test for a goal. */
- if (bt && goal_c == 0 && (g = sol_goal_test(fp, p, 0)))
+ if (bt && goal_c == 0 && (zp = sol_goal_test(fp, p, 0)))
{
- *state_value = g->s;
+ *state_value = zp->s;
audio_play(AUD_GOAL, 1.0f);
- return g->c ? GAME_SPEC : GAME_GOAL;
+ return zp->c ? GAME_SPEC : GAME_GOAL;
}
/* Test for time-out. */
if (bt && clock_down && clock <= 0.f)
{
- const GLfloat *p = fp->uv->p;
- const GLfloat c[5] = {1.0f, 1.0f, 0.0f, 0.0f, 1.0f};
- part_burst(p, c);
- part_burst(p, c+1);
- part_burst(p, c+2);
- part_burst(p, c);
- part_burst(p, c+1);
- part_burst(p, c+2);
- drawball = 0;
audio_play(AUD_TIME, 1.0f);
return GAME_TIME;
}
}
if (grow)
- grow_ball(fp,dt);
+ grow_ball(fp, dt);
game_update_grav(h, g);
part_step(h, t);
- if (!drawball)
- /* nothing */;
- else if (jump_b)
+ if (jump_b)
{
jump_dt += t;
projects / neverball / blobdiff