diff options
| m--------- | external/RodeoKit | 0 | ||||
| -rw-r--r-- | src/bullet.c | 4 | ||||
| -rw-r--r-- | src/enemies.c | 4 | ||||
| -rw-r--r-- | src/player.c | 2 | ||||
| -rw-r--r-- | src/wall.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/external/RodeoKit b/external/RodeoKit -Subproject 6c2fb4e1cf6866fb1a21fc2f940af5722abdeac +Subproject d518023bb61dec8dd776e5cf7b2b23e66b2cdfd diff --git a/src/bullet.c b/src/bullet.c index fdd4b3a..d0c69cd 100644 --- a/src/bullet.c +++ b/src/bullet.c @@ -15,8 +15,8 @@ static cvec_bullet_t bullets = {0}; void init_bullets(void) { - player_bullet_collision_world = rodeo_collision_2d_collection_create(); - enemy_bullet_collision_world = rodeo_collision_2d_collection_create(); + player_bullet_collision_world = rodeo_collision_2d_collection_create(50); + enemy_bullet_collision_world = rodeo_collision_2d_collection_create(150); bullet_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/bullet.png")); pop_sound = rodeo_audio_sound_create_from_path(cstr_lit("assets/pop.wav")); } diff --git a/src/enemies.c b/src/enemies.c index 4ba5d28..65ad182 100644 --- a/src/enemies.c +++ b/src/enemies.c @@ -20,8 +20,8 @@ static uint32_t ghost_count = 0; void init_enemies(void) { - collision_enemies_collection = rodeo_collision_2d_collection_create(); - collision_ghosts_collection = rodeo_collision_2d_collection_create(); + collision_enemies_collection = rodeo_collision_2d_collection_create(50); + collision_ghosts_collection = rodeo_collision_2d_collection_create(50); //enemies = cvec_enemy_t_init(); //squid_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/squid.png")); //hinotamatchi_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/hinotamatchi.png")); diff --git a/src/player.c b/src/player.c index 98d32d2..7ed932f 100644 --- a/src/player.c +++ b/src/player.c @@ -53,7 +53,7 @@ init_player(void) player.aim_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/aim.png")); player.heart_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/heart.png")); player.sprite.config.texture = player.texture; - player_collision_collection = rodeo_collision_2d_collection_create(); + player_collision_collection = rodeo_collision_2d_collection_create(1); player.item = rodeo_collision_2d_item_create( player_collision_collection, (rodeo_collision_2d_item_data_t){ @@ -16,7 +16,6 @@ init_wall(void) logo_texture = rodeo_gfx_texture_2d_create_from_path(cstr_lit("assets/tojam2023_tagline_header_clear.png")); uint16_t window_width = 1600; uint16_t window_height = 900; - collision_wall_world = rodeo_collision_2d_collection_create(); float walls[][4] = { {0, -10, window_width, 10}, {0, window_height, window_width, 10}, @@ -33,12 +32,13 @@ init_wall(void) {764,200,72,500}, {550,414,501,72} }; - int numwalls = sizeof(walls)/sizeof(walls[0]); + int32_t numwalls = sizeof(walls)/sizeof(walls[0]); + collision_wall_world = rodeo_collision_2d_collection_create(numwalls + 4); new_wall(0, -10, window_width, 10); new_wall(0, window_height, window_width, 10); new_wall(-10, 0, 10, window_height); new_wall(window_width, 0, 10, window_height); - for (int i = 0; i < numwalls; ++i) { + for (int32_t i = 0; i < numwalls; ++i) { new_wall(walls[i][0], walls[i][1], walls[i][2], walls[i][3]); } } |