projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- reduced menu fadness a bit (ie. balanced the edges)
[supertux.git]
/
src
/
gameloop.cpp
diff --git
a/src/gameloop.cpp
b/src/gameloop.cpp
index
3b8ceb2
..
e9b402f
100644
(file)
--- a/
src/gameloop.cpp
+++ b/
src/gameloop.cpp
@@
-296,7
+296,8
@@
void game_event(void)
/* --- GAME ACTION! --- */
/* --- GAME ACTION! --- */
-int game_action(void)
+int
+GameSession::action()
{
unsigned int i;
{
unsigned int i;
@@
-464,7
+465,8
@@
int game_action(void)
/* --- GAME DRAW! --- */
/* --- GAME DRAW! --- */
-void game_draw(void)
+void
+GameSession::draw()
{
int y,x;
{
int y,x;
@@
-655,7
+657,7
@@
GameSession::run()
while (SDL_PollEvent(&event))
{}
while (SDL_PollEvent(&event))
{}
-
game_
draw();
+ draw();
do
{
jump = false;
do
{
jump = false;
@@
-721,7
+723,7
@@
GameSession::run()
frame_ratio = 1;
while(z >= 1)
{*/
frame_ratio = 1;
while(z >= 1)
{*/
- if (
game_
action() == 0)
+ if (action() == 0)
{
/* == 0: no more lives */
/* == -1: continues */
{
/* == 0: no more lives */
/* == -1: continues */
@@
-747,7
+749,7
@@
GameSession::run()
game_draw();
else
jump = true;*/ /*FIXME: Implement this tweak right.*/
game_draw();
else
jump = true;*/ /*FIXME: Implement this tweak right.*/
-
game_
draw();
+ draw();
/* Time stops in pause mode */
if(game_pause || show_menu )
/* Time stops in pause mode */
if(game_pause || show_menu )
@@
-817,10
+819,8
@@
GameSession::run()
return(quit);
}
return(quit);
}
-
/* Load graphics/sounds shared between all levels: */
/* Load graphics/sounds shared between all levels: */
-
-void loadshared(void)
+void loadshared()
{
int i;
{
int i;