mirror of
https://gitlab.com/dosowisko.net/libsuperderpy.git
synced 2025-03-04 09:11:27 +01:00
some tweaks for obstacles
This commit is contained in:
parent
bd2e62f651
commit
db0ebca42d
2 changed files with 4 additions and 5 deletions
|
@ -100,7 +100,7 @@ bool GenerateObstacles(struct Game *game, struct TM_Action *action, enum TM_Acti
|
|||
*in = true;*/
|
||||
}
|
||||
else if (state == TM_ACTIONSTATE_RUNNING) {
|
||||
if (rand()%(10000/(int)tps(game, 60*85*game->level.speed_modifier))<=2) {
|
||||
if (rand()%(10000/(int)tps(game, 60*85*game->level.speed_modifier))<=3) {
|
||||
PrintConsole(game, "OBSTACLE %d", *count);
|
||||
(*count)++;
|
||||
struct Obstacle *obst = malloc(sizeof(struct Obstacle));
|
||||
|
@ -122,21 +122,20 @@ bool GenerateObstacles(struct Game *game, struct TM_Action *action, enum TM_Acti
|
|||
obst->data = NULL;
|
||||
obst->points = -5;
|
||||
obst->bitmap = &(game->level.obst_bmps.badmuffin);
|
||||
obst->speed = 1.2;
|
||||
} else if (rand()%100<=12) {
|
||||
obst->callback= &Obst_RotateSin;
|
||||
obst->data = malloc(sizeof(float));
|
||||
*((float*)obst->data) = 0;
|
||||
obst->points = 5;
|
||||
obst->bitmap = &(game->level.obst_bmps.muffin);
|
||||
} else if (rand()%100<=70) {
|
||||
} else if (rand()%100<=65) {
|
||||
obst->callback= &Obst_MoveUp;
|
||||
obst->bitmap = &(game->level.obst_bmps.pie);
|
||||
obst->data = malloc(sizeof(float));
|
||||
*((float*)obst->data) = 0.5+(rand()%25/100.0);
|
||||
obst->y*=1.8;
|
||||
obst->angle = ((rand()%50)/100.0)-0.25;
|
||||
} else if (rand()%100<=70) {
|
||||
} else if (rand()%100<=80) {
|
||||
obst->callback = &Obst_MoveSin;
|
||||
obst->data = malloc(sizeof(float));
|
||||
*((float*)obst->data) = 0;
|
||||
|
|
|
@ -30,7 +30,7 @@ void Obst_MoveUpDown(struct Game *game, struct Obstacle *obstacle) {
|
|||
}
|
||||
} else {
|
||||
obstacle->y += 0.5;
|
||||
if (obstacle->y>=100) {
|
||||
if (obstacle->y>=((al_get_display_height(game->display)-al_get_bitmap_height(*(obstacle->bitmap))/obstacle->rows)/(float)al_get_display_height(game->display))*100) {
|
||||
obstacle->data++;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue