PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-03-04 09:11:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

implement input data convention for gamestates

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-09-21 13:55:21 +02:00
parent 3b75879a1d
commit ca94680674
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/level.c
View file

@ -390,6 +390,7 @@ void Level_ProcessLogic(struct Game *game, ALLEGRO_EVENT *ev) {
}
void Level_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
game->level.current_level = game->level.input.current_level;
game->level.derpy_sheets = NULL;
game->level.derpy = NULL;
Pause_Preload(game);

25
src/main.h
View file

@ -52,14 +52,7 @@ enum gamestate_enum {
GAMESTATE_DISCLAIMER
};
/*! \brief Resources used by moonwalk level placeholder. */
struct Moonwalk {
ALLEGRO_BITMAP *fade_bitmap; /*!< Bitmap used on fade-in and fade-out animations. */
ALLEGRO_BITMAP *image; /*!< Background texture. */
int derpy_frame; /*!< Current frame of Derpy animation. */
int derpy_frame_tmp; /*!< Counter used to slow down Derpy animation. */
double derpy_pos; /*!< Position of Derpy on screen. */
};
/* TODO: move Obstacle and Spritesheet to level.h if possible */
/*! \brief Structure representing obstacles and power-ups flying through the level. */
struct Obstacle {
@ -97,8 +90,22 @@ struct Spritesheet {
struct Spritesheet* next; /*!< Next spritesheet in the queue. */
};
/* Gamestate structs */
/*! \brief Resources used by moonwalk level placeholder. */
struct Moonwalk {
ALLEGRO_BITMAP *fade_bitmap; /*!< Bitmap used on fade-in and fade-out animations. */
ALLEGRO_BITMAP *image; /*!< Background texture. */
int derpy_frame; /*!< Current frame of Derpy animation. */
int derpy_frame_tmp; /*!< Counter used to slow down Derpy animation. */
double derpy_pos; /*!< Position of Derpy on screen. */
};
/*! \brief Resources used by Level state. */
struct Level {
struct {
int current_level; /*!< Level number. */
} input; /*!< Gamestate input data. */
int current_level; /*!< Level number. */
float speed; /*!< Speed of the player. */
float speed_modifier; /*!< Modifier of the speed of the player. */
@ -260,7 +267,7 @@ struct Intro {
ALLEGRO_AUDIO_STREAM *audiostream; /*!< Audiostream used for Celestia voice. */
};
/*! \brief Resources used by Game state. */
/*! \brief Main struct of the game. */
struct Game {
ALLEGRO_DISPLAY *display; /*!< Main Allegro display. */
ALLEGRO_FONT *font; /*!< Main font used in game. */

2
src/map.c
View file

@ -80,7 +80,7 @@ int Map_Keydown(struct Game *game, ALLEGRO_EVENT *ev) {
al_play_sample_instance(game->map.click);
} else if (ev->keyboard.keycode==ALLEGRO_KEY_ENTER) {
al_play_sample_instance(game->map.click);
game->level.current_level = game->map.selected;
game->level.input.current_level = game->map.selected;
PrintConsole(game, "Selecting level %d...", game->map.selected);
UnloadGameState(game);
game->gamestate = GAMESTATE_LOADING;