sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Prevent crashing when no sprites is supplied

scene_man
En Yi 2023-05-27 17:01:20 +08:00
parent 542c7cf57c
commit 332fe33e8e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scenes/game_systems.c
View File

@ -1067,17 +1067,21 @@ void sprite_animation_system(Scene_t* scene)
{ {
Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx); Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx);
// Update animation state // Update animation state
unsigned int next_idx = p_cspr->current_idx;
if (p_cspr->transition_func != NULL) if (p_cspr->transition_func != NULL)
{ {
unsigned int spr_idx = p_cspr->transition_func(p_ent); next_idx = p_cspr->transition_func(p_ent);
if (p_cspr->current_idx != spr_idx)
{
p_cspr->current_idx = spr_idx;
p_cspr->sprites[spr_idx].sprite->current_frame = 0;
}
} }
if (p_cspr->pause) return; if (p_cspr->pause) return;
bool reset = p_cspr->current_idx != next_idx;
p_cspr->current_idx = next_idx;
SpriteRenderInfo_t spr = p_cspr->sprites[p_cspr->current_idx]; SpriteRenderInfo_t spr = p_cspr->sprites[p_cspr->current_idx];
if (spr.sprite == NULL) continue;
if (reset) spr.sprite->current_frame = 0;
// Animate it (handle frame count) // Animate it (handle frame count)
spr.sprite->elapsed++; spr.sprite->elapsed++;
if (spr.sprite->elapsed == spr.sprite->speed) if (spr.sprite->elapsed == spr.sprite->speed)