projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed timer_type to Timer
[supertux.git]
/
src
/
title.cpp
diff --git
a/src/title.cpp
b/src/title.cpp
index
3acba93
..
deddd5a
100644
(file)
--- a/
src/title.cpp
+++ b/
src/title.cpp
@@
-46,7
+46,7
@@
static texture_type logo;
static texture_type img_choose_subset;
static bool walking;
static texture_type img_choose_subset;
static bool walking;
-static
timer_type
random_timer;
+static
Timer
random_timer;
static SDL_Event event;
static SDLKey key;
static SDL_Event event;
static SDLKey key;
@@
-98,7
+98,7
@@
void draw_demo(GameSession* session, double frame_ratio)
global_frame_counter++;
tux->key_event(SDLK_RIGHT,DOWN);
global_frame_counter++;
tux->key_event(SDLK_RIGHT,DOWN);
- if(
timer_check(&random_timer
))
+ if(
random_timer.check(
))
{
if(walking)
tux->key_event(SDLK_UP,UP);
{
if(walking)
tux->key_event(SDLK_UP,UP);
@@
-107,7
+107,7
@@
void draw_demo(GameSession* session, double frame_ratio)
}
else
{
}
else
{
-
timer_start(&random_timer,
rand() % 3000 + 3000);
+
random_timer.start(
rand() % 3000 + 3000);
walking = !walking;
}
walking = !walking;
}
@@
-139,7
+139,7
@@
bool title(void)
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;
@@
-173,7
+173,7
@@
bool 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)
{
while (!done)
{
@@
-389,7
+389,7
@@
void display_credits()
{
int done;
int scroll, speed;
{
int done;
int scroll, speed;
-
timer_type
timer;
+
Timer
timer;
int n,d;
int length;
FILE* fi;
int n,d;
int length;
FILE* fi;
@@
-416,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;
@@
-502,10
+502,10
@@
void display_credits()
SDL_Delay(35);
SDL_Delay(35);
- if(timer
_get_left(&timer
) < 0)
+ if(timer
.get_left(
) < 0)
{
frame++;
{
frame++;
- timer
_start(&timer,
50);
+ timer
.start(
50);
}
}
string_list_free(&names);
}
}
string_list_free(&names);