sem/cybershot-PSVita
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[ADD] player enemy collision

Browse Source
This commit is contained in:
SemvdH
2021-08-23 18:22:44 +02:00
parent e938165647
commit fcdf8b1066
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.c
View File

@@ -137,6 +137,18 @@ uint8_t bullet_hit_enemy(BULLET *bullet, ENEMY_SPRITE *enemy)
return 0; return 0;
} }
uint8_t enemy_hit_player(ENEMY_SPRITE *enemy)
{
if (enemy->enemy_type == SIMPLE)
{
return toolbox_is_collision(enemy->x, enemy->y, SIMPLE_ENEMY_SIZE, SIMPLE_ENEMY_SIZE, player_x, player_y - PLAYER_Y_OFFSET, PLAYER_WIDTH, PLAYER_HEIGTH);
}
else if (enemy->enemy_type == COMPLEX)
{
return toolbox_is_collision(enemy->x, enemy->y, COMPLEX_ENEMY_SIZE, COMPLEX_ENEMY_SIZE, player_x, player_y - PLAYER_Y_OFFSET, PLAYER_WIDTH, PLAYER_HEIGTH);
}
}
/** /**
* @brief checks the collision for all bullets * @brief checks the collision for all bullets
* *
@@ -174,8 +186,18 @@ void check_bullet_collisions()
SceBool check_player_collisions() SceBool check_player_collisions()
{ {
SceBool res = SCE_FALSE; SceBool res = SCE_FALSE;
for (int i = 0; i < enemy_count; i++)
{
if (enemies[i].active == ACTIVE)
{
if (enemy_hit_player(&enemies[i]))
{
res = SCE_TRUE;
break;
}
}
}
return res;
} }
// ################################################################ // ################################################################
@@ -274,12 +296,12 @@ void update_game()
if (player_y >= SCREEN_HEIGTH) if (player_y >= SCREEN_HEIGTH)
player_y = SCREEN_HEIGTH - 1; player_y = SCREEN_HEIGTH - 1;
SceBool player_collision = check_player_collisions(); if (check_player_collisions() == SCE_TRUE)
if (player_collision == SCE_TRUE)
{ {
current_state = GAMEOVER; current_state = GAMEOVER;
return; return;
} }
check_bullet_collisions(); check_bullet_collisions();
for (int i = 0; i < 255; i++) for (int i = 0; i < 255; i++)

3
src/sprites/sprites.h
View File

@@ -20,6 +20,9 @@
#define BULLET_HEIGTH 8 #define BULLET_HEIGTH 8
#define PLAYER_SCALE 3.0 #define PLAYER_SCALE 3.0
#define PLAYER_WIDTH (2.0 * 2 * PLAYER_SCALE)
#define PLAYER_HEIGTH (5.0 * PLAYER_SCALE)
#define PLAYER_Y_OFFSET (PLAYER_HEIGTH / 2) // the center y of the player is in the middle
#define SIMPLE_ENEMY_SIZE 9.0 #define SIMPLE_ENEMY_SIZE 9.0
#define COMPLEX_ENEMY_SIZE 9.0 #define COMPLEX_ENEMY_SIZE 9.0