projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- more resolution fixes
[supertux.git]
/
src
/
gameloop.cpp
diff --git
a/src/gameloop.cpp
b/src/gameloop.cpp
index
78b4a88
..
251dafd
100644
(file)
--- a/
src/gameloop.cpp
+++ b/
src/gameloop.cpp
@@
-76,7
+76,7
@@
void
GameSession::restart_level()
{
game_pause = false;
GameSession::restart_level()
{
game_pause = false;
- exit_status = NONE;
+ exit_status =
ES_
NONE;
end_sequence = NO_ENDSEQUENCE;
fps_timer.init(true);
end_sequence = NO_ENDSEQUENCE;
fps_timer.init(true);
@@
-146,7
+146,7
@@
GameSession::levelintro(void)
char str[60];
if (get_level()->img_bkgd)
char str[60];
if (get_level()->img_bkgd)
- get_level()->
img_bkgd->draw(0, 0
);
+ get_level()->
draw_bg(
);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
@@
-183,7
+183,7
@@
GameSession::on_escape_press()
if(st_gl_mode == ST_GL_TEST)
{
if(st_gl_mode == ST_GL_TEST)
{
- exit_status = LEVEL_ABORT;
+ exit_status =
ES_
LEVEL_ABORT;
}
else if (!Menu::current())
{
}
else if (!Menu::current())
{
@@
-343,7
+343,11
@@
GameSession::process_events()
break;
case SDLK_DELETE:
if(debug_mode)
break;
case SDLK_DELETE:
if(debug_mode)
- tux.got_coffee = 1;
+ tux.got_power = tux.FIRE_POWER;
+ break;
+ case SDLK_HOME:
+ if(debug_mode)
+ tux.got_power = tux.ICE_POWER;
break;
case SDLK_INSERT:
if(debug_mode)
break;
case SDLK_INSERT:
if(debug_mode)
@@
-441,7
+445,7
@@
GameSession::check_end_conditions()
}
else if(end_sequence && !endsequence_timer.check())
{
}
else if(end_sequence && !endsequence_timer.check())
{
- exit_status = LEVEL_FINISHED;
+ exit_status =
ES_
LEVEL_FINISHED;
return;
}
else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)
return;
}
else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)
@@
-465,7
+469,7
@@
GameSession::check_end_conditions()
if(st_gl_mode != ST_GL_TEST)
drawendscreen();
if(st_gl_mode != ST_GL_TEST)
drawendscreen();
- exit_status = GAME_OVER;
+ exit_status =
ES_
GAME_OVER;
}
else
{ // Still has lives, so reset Tux to the levelstart
}
else
{ // Still has lives, so reset Tux to the levelstart
@@
-479,7
+483,7
@@
GameSession::check_end_conditions()
void
GameSession::action(double frame_ratio)
{
void
GameSession::action(double frame_ratio)
{
- if (exit_status == NONE)
+ if (exit_status ==
ES_
NONE)
{
// Update Tux and the World
world->action(frame_ratio);
{
// Update Tux and the World
world->action(frame_ratio);
@@
-529,7
+533,7
@@
GameSession::process_menu()
break;
case MNID_ABORTLEVEL:
st_pause_ticks_stop();
break;
case MNID_ABORTLEVEL:
st_pause_ticks_stop();
- exit_status = LEVEL_ABORT;
+ exit_status =
ES_
LEVEL_ABORT;
break;
}
}
break;
}
}
@@
-560,7
+564,7
@@
GameSession::run()
draw();
draw();
- while (exit_status == NONE)
+ while (exit_status ==
ES_
NONE)
{
/* Calculate the movement-factor */
double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
{
/* Calculate the movement-factor */
double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
@@
-717,7
+721,7
@@
GameSession::drawendscreen()
char str[80];
if (get_level()->img_bkgd)
char str[80];
if (get_level()->img_bkgd)
- get_level()->
img_bkgd->draw(0, 0
);
+ get_level()->
draw_bg(
);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
@@
-741,7
+745,7
@@
GameSession::drawresultscreen(void)
char str[80];
if (get_level()->img_bkgd)
char str[80];
if (get_level()->img_bkgd)
- get_level()->
img_bkgd->draw(0, 0
);
+ get_level()->
draw_bg(
);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
else
drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);