PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-08 06:06:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

add cherries

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-05-23 10:34:36 +02:00
parent 47b2903935
commit 15e1822833
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/level.c
View file

@ -447,6 +447,7 @@ void Level_UnloadBitmaps(struct Game *game) {
al_destroy_bitmap(game->level.obst_bmps.pie1);
al_destroy_bitmap(game->level.obst_bmps.pie2);
al_destroy_bitmap(game->level.obst_bmps.pig);
al_destroy_bitmap(game->level.obst_bmps.cherry);
al_destroy_bitmap(game->level.obst_bmps.muffin);
al_destroy_bitmap(game->level.obst_bmps.badmuffin);
al_destroy_bitmap(game->level.obst_bmps.screwball);
@ -456,7 +457,7 @@ void Level_UnloadBitmaps(struct Game *game) {
}
void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, float)) {
PROGRESS_INIT(17);
PROGRESS_INIT(18);
int x = 0;
struct Spritesheet *tmp = game->level.derpy_sheets;
while (tmp) {
@ -500,6 +501,8 @@ void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, floa
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.obst_bmps.cherry = LoadScaledBitmap("levels/cherry.png", al_get_display_width(game->display)*0.03, al_get_display_height(game->display)*0.08);
PROGRESS;
game->level.obst_bmps.badmuffin = LoadScaledBitmap("levels/badmuffin.png", al_get_display_width(game->display)*0.07, al_get_display_height(game->display)*0.1);
PROGRESS;
game->level.owl = LoadScaledBitmap("levels/owl.png", al_get_display_width(game->display)*0.08, al_get_display_width(game->display)*0.08);

10
src/levels/actions.c
View file

@ -140,9 +140,15 @@ bool GenerateObstacles(struct Game *game, struct TM_Action *action, enum TM_Acti
obst->callback= &Obst_RotateSin;
obst->data = malloc(sizeof(float));
*((float*)obst->data) = 0;
obst->points = 5;
obst->points = 8;
obst->bitmap = &(game->level.obst_bmps.muffin);
} else if (rand()%100<=65) {
} else if (rand()%100<=12) {
obst->callback= &Obst_RotateSin;
obst->data = malloc(sizeof(float));
*((float*)obst->data) = 0;
obst->points = 4;
obst->bitmap = &(game->level.obst_bmps.cherry);
} else if (rand()%100<=65) {
obst->callback= &Obst_MoveUp;
if (rand()%100<=80) obst->bitmap = &(game->level.obst_bmps.pie1);
else {

1
src/main.h
View file

@ -141,6 +141,7 @@ struct Level {
ALLEGRO_BITMAP *pie2; /*!< Pie bitmap (crossed). */
ALLEGRO_BITMAP *muffin; /*!< Good muffin bitmap. */
ALLEGRO_BITMAP *badmuffin; /*!< Bad muffin bitmap. */
ALLEGRO_BITMAP *cherry; /*!< Cherry bitmap. */
ALLEGRO_BITMAP *pig; /*!< Pig spritesheet bitmap. */
ALLEGRO_BITMAP *screwball; /*!< Screwball spritesheet bitmap. */
} obst_bmps; /*!< Obstacle bitmaps. */