projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started to convert timer into a class
[supertux.git]
/
src
/
title.cpp
diff --git
a/src/title.cpp
b/src/title.cpp
index
263b188
..
016b13d
100644
(file)
--- a/
src/title.cpp
+++ b/
src/title.cpp
@@
-38,16
+38,14
@@
#include "scene.h"
#include "player.h"
#include "math.h"
#include "scene.h"
#include "player.h"
#include "math.h"
-
-void loadshared(void);
-void activate_particle_systems(void);
+#include "tile.h"
+#include "resources.h"
static texture_type bkg_title;
static texture_type logo;
static texture_type img_choose_subset;
static bool walking;
static texture_type bkg_title;
static texture_type logo;
static texture_type img_choose_subset;
static bool walking;
-static Player titletux;
static timer_type random_timer;
static SDL_Event event;
static timer_type random_timer;
static SDL_Event event;
@@
-65,10
+63,15
@@
void draw_background()
texture_draw_bg(&bkg_title);
}
texture_draw_bg(&bkg_title);
}
-void draw_demo()
+void draw_demo(
GameSession* session, double frame_ratio
)
{
{
- /* DEMO begin */
- /* update particle systems */
+ World::set_current(session->get_world());
+ //World* world = session->get_world();
+ Level* plevel = session->get_level();
+ Player* tux = session->get_world()->get_tux();
+
+ /* FIXME:
+ // update particle systems
std::vector<ParticleSystem*>::iterator p;
for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
{
std::vector<ParticleSystem*>::iterator p;
for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
{
@@
-80,73
+83,72
@@
void draw_demo()
{
(*p)->draw(scroll_x, 0, 0);
}
{
(*p)->draw(scroll_x, 0, 0);
}
+ */
// Draw interactive tiles:
for (int y = 0; y < 15; ++y)
{
for (int x = 0; x < 21; ++x)
{
// Draw interactive tiles:
for (int y = 0; y < 15; ++y)
{
for (int x = 0; x < 21; ++x)
{
-
drawshape
(32*x - fmodf(scroll_x, 32), y * 32,
-
current_level.
ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
+
Tile::draw
(32*x - fmodf(scroll_x, 32), y * 32,
+
plevel->
ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
}
}
global_frame_counter++;
}
}
global_frame_counter++;
- t
itletux.
key_event(SDLK_RIGHT,DOWN);
+ t
ux->
key_event(SDLK_RIGHT,DOWN);
- if(
timer_check(&random_timer
))
+ if(
random_timer.check(
))
{
if(walking)
{
if(walking)
- t
itletux.
key_event(SDLK_UP,UP);
+ t
ux->
key_event(SDLK_UP,UP);
else
else
- t
itletux.
key_event(SDLK_UP,DOWN);
+ t
ux->
key_event(SDLK_UP,DOWN);
}
else
{
}
else
{
-
timer_start(&random_timer,
rand() % 3000 + 3000);
+
random_timer.start(
rand() % 3000 + 3000);
walking = !walking;
}
// Wrap around at the end of the level back to the beginnig
walking = !walking;
}
// Wrap around at the end of the level back to the beginnig
- if(
current_level.width * 32 - 320 < titletux.
base.x)
+ if(
plevel->width * 32 - 320 < tux->
base.x)
{
{
- t
itletux.base.x = titletux.base.x - (current_level.
width * 32 - 640);
- scroll_x = t
itletux.
base.x - 320;
+ t
ux->base.x = tux->base.x - (plevel->
width * 32 - 640);
+ scroll_x = t
ux->
base.x - 320;
}
}
- float last_tux_x_pos = titletux.base.x;
- titletux.action();
+
+
+ float last_tux_x_pos = tux->base.x;
+ tux->action(frame_ratio);
// Jump if tux stays in the same position for one loop, ie. if he is
// stuck behind a wall
// Jump if tux stays in the same position for one loop, ie. if he is
// stuck behind a wall
- if (last_tux_x_pos == t
itletux.
base.x)
+ if (last_tux_x_pos == t
ux->
base.x)
walking = false;
walking = false;
- t
itletux.
draw();
+ t
ux->
draw();
/* DEMO end */
}
/* --- TITLE SCREEN --- */
/* DEMO end */
}
/* --- TITLE SCREEN --- */
-
-int title(void)
+bool title(void)
{
{
- int done;
string_list_type level_subsets;
st_subset subset;
level_subsets = dsubdirs("/levels", "info");
string_list_type level_subsets;
st_subset subset;
level_subsets = dsubdirs("/levels", "info");
-
timer_init(&random_timer,
true);
+
random_timer.init(
true);
walking = true;
walking = true;
- titletux.init();
st_pause_ticks_init();
st_pause_ticks_init();
-
current_level.load((datadir + "/levels/misc/menu.stl").c_str()
);
+
GameSession session(datadir + "/levels/misc/menu.stl"
);
loadshared();
loadshared();
- activate_particle_systems();
- /* Lower the gravity that tux doesn't jump to hectically through the demo */
- //gravity = 5;
+
+ //FIXME:activate_particle_systems();
/* Reset menu variables */
menu_reset();
/* Reset menu variables */
menu_reset();
@@
-162,9
+164,7
@@
int title(void)
texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
/* --- Main title loop: --- */
texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
/* --- Main title loop: --- */
-
- done = 0;
- quit = 0;
+ bool done = 0;
show_menu = 1;
frame = 0;
show_menu = 1;
frame = 0;
@@
-173,13
+173,12
@@
int title(void)
load_hs();
update_time = st_get_ticks();
load_hs();
update_time = st_get_ticks();
-
timer_start(&random_timer,
rand() % 2000 + 2000);
+
random_timer.start(
rand() % 2000 + 2000);
- while (!done
&& !quit
)
+ while (!done)
{
{
-
/* Calculate the movement-factor */
/* Calculate the movement-factor */
- frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
+
double
frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */
frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85;
/* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */
if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */
frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85;
/* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */
@@
-192,13
+191,11
@@
int title(void)
menu_event(event);
if (event.type == SDL_QUIT)
{
menu_event(event);
if (event.type == SDL_QUIT)
{
- /* Quit event - quit: */
- quit = 1;
+ done = true;
}
else if (event.type == SDL_KEYDOWN)
{
/* Keypress... */
}
else if (event.type == SDL_KEYDOWN)
{
/* Keypress... */
-
key = event.key.keysym.sym;
/* Check for menu events */
key = event.key.keysym.sym;
/* Check for menu events */
@@
-207,16
+204,15
@@
int title(void)
if (key == SDLK_ESCAPE)
{
/* Escape: Quit: */
if (key == SDLK_ESCAPE)
{
/* Escape: Quit: */
-
- quit = 1;
+ done = true;
}
}
}
/* Draw the background: */
draw_background();
}
}
}
/* Draw the background: */
draw_background();
- draw_demo();
-
+ draw_demo(
&session, frame_ratio
);
+
if (current_menu == main_menu)
texture_draw(&logo, 160, 30);
if (current_menu == main_menu)
texture_draw(&logo, 160, 30);
@@
-237,7
+233,7
@@
int title(void)
*/
/* Don't draw menu, if quit is true */
*/
/* Don't draw menu, if quit is true */
- if(show_menu && !
quit
)
+ if(show_menu && !
done
)
menu_process_current();
if(current_menu == main_menu)
menu_process_current();
if(current_menu == main_menu)
@@
-276,8
+272,7
@@
int title(void)
switch(event.type)
{
case SDL_QUIT:
switch(event.type)
{
case SDL_QUIT:
- done = 1;
- quit = 1;
+ done = true;
break;
case SDL_KEYDOWN: // key pressed
// Keypress...
break;
case SDL_KEYDOWN: // key pressed
// Keypress...
@@
-333,13
+328,13
@@
int title(void)
break;
case 3:
done = 1;
break;
case 3:
done = 1;
-
quit
= leveleditor(1);
+
done
= leveleditor(1);
break;
case 4:
display_credits();
break;
case 5:
break;
case 4:
display_credits();
break;
case 5:
-
quit = 1
;
+
done = true
;
break;
}
}
break;
}
}
@@
-351,9
+346,10
@@
int title(void)
{
if (process_load_game_menu())
{
{
if (process_load_game_menu())
{
+ // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
// reset tux
scroll_x = 0;
// reset tux
scroll_x = 0;
- titletux.level_begin();
+
//
titletux.level_begin();
update_time = st_get_ticks();
}
}
update_time = st_get_ticks();
}
}
@@
-382,8
+378,7
@@
int title(void)
string_list_free(&level_subsets);
/* Return to main! */
string_list_free(&level_subsets);
/* Return to main! */
-
- return(quit);
+ return done;
}
#define MAX_VEL 10
}
#define MAX_VEL 10
@@
-421,8
+416,8
@@
void display_credits()
}
}
- timer
_init(&timer,
SDL_GetTicks());
- timer
_start(&timer,
50);
+ timer
.init(
SDL_GetTicks());
+ timer
.start(
50);
scroll = 0;
speed = 2;
scroll = 0;
speed = 2;
@@
-510,7
+505,7
@@
void display_credits()
if(timer_get_left(&timer) < 0)
{
frame++;
if(timer_get_left(&timer) < 0)
{
frame++;
- timer
_start(&timer,
50);
+ timer
.start(
50);
}
}
string_list_free(&names);
}
}
string_list_free(&names);