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

add muffins :D (for now as obstracles)

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-05-18 23:40:02 +02:00
parent 10a786c431
commit 1fe1187085
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/level.c
View file

@ -191,10 +191,14 @@ bool GenerateObstracles(struct Game *game, struct TM_Action *action, enum TM_Act
obst->speed = 0; obst->speed = 0;
obst->points = -10; obst->points = -10;
obst->hit = false; obst->hit = false;
if (rand()%100<=50) {
obst->callback=Obst_MoveUpDown;
obst->bitmap = &(game->level.obst_bmps.pie); obst->bitmap = &(game->level.obst_bmps.pie);
} else {
obst->callback = NULL; obst->callback = NULL;
obst->bitmap = &(game->level.obst_bmps.muffin);
}
obst->data = (void*)(rand()%2); obst->data = (void*)(rand()%2);
if (rand()%100<=50) obst->callback=Obst_MoveUpDown;
if (game->level.obstracles) { if (game->level.obstracles) {
game->level.obstracles->prev = obst; game->level.obstracles->prev = obst;
obst->next = game->level.obstracles; obst->next = game->level.obstracles;
@ -612,7 +616,7 @@ void Level_UnloadBitmaps(struct Game *game) {
} }
void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, float)) { void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, float)) {
PROGRESS_INIT(10); PROGRESS_INIT(11);
int x = 0; int x = 0;
struct Spritesheet *tmp = game->level.derpy_sheets; struct Spritesheet *tmp = game->level.derpy_sheets;
while (tmp) { while (tmp) {
@ -648,6 +652,8 @@ void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, floa
PROGRESS; PROGRESS;
game->level.obst_bmps.pie = LoadScaledBitmap("menu/pie.png", al_get_display_width(game->display)*0.1, al_get_display_height(game->display)*0.1); game->level.obst_bmps.pie = LoadScaledBitmap("menu/pie.png", al_get_display_width(game->display)*0.1, al_get_display_height(game->display)*0.1);
PROGRESS; PROGRESS;
game->level.obst_bmps.muffin = LoadScaledBitmap("levels/muffin.png", al_get_display_width(game->display)*0.07, al_get_display_height(game->display)*0.1);
PROGRESS;
game->level.welcome = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)/2); game->level.welcome = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)/2);
PROGRESS; PROGRESS;
al_set_target_bitmap(game->level.welcome); al_set_target_bitmap(game->level.welcome);

1
src/main.h
View file

@ -99,6 +99,7 @@ struct Level {
struct Spritesheet* pony_sheets; /*!< List of sprite sheets of character rescued by Derpy. */ struct Spritesheet* pony_sheets; /*!< List of sprite sheets of character rescued by Derpy. */
struct { struct {
ALLEGRO_BITMAP *pie; ALLEGRO_BITMAP *pie;
ALLEGRO_BITMAP *muffin;
} obst_bmps; } obst_bmps;
struct Obstracle *obstracles; struct Obstracle *obstracles;
struct Moonwalk moonwalk; struct Moonwalk moonwalk;