Add urchin sprite and fix its spike collision
parent
2ee1e38094
commit
d3db15a018
|
@ -716,8 +716,9 @@ void spike_collision_system(Scene_t* scene)
|
||||||
p_ent->m_alive = false;
|
p_ent->m_alive = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else if (p_ent->m_tag != NO_ENT_TAG)
|
||||||
{
|
{
|
||||||
|
// Hack to avoid urchin destorying spikes
|
||||||
destroy_tile(data, tile_idx);
|
destroy_tile(data, tile_idx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
#include "raymath.h"
|
#include "raymath.h"
|
||||||
|
|
||||||
static SpriteRenderInfo_t item_sprite_map[21] = {0};
|
static SpriteRenderInfo_t item_sprite_map[22] = {0};
|
||||||
|
|
||||||
bool init_item_creation(Assets_t* assets)
|
bool init_item_creation(Assets_t* assets)
|
||||||
{
|
{
|
||||||
|
@ -45,6 +45,7 @@ bool init_item_creation(Assets_t* assets)
|
||||||
item_sprite_map[20].src_anchor = AP_BOT_CENTER;
|
item_sprite_map[20].src_anchor = AP_BOT_CENTER;
|
||||||
item_sprite_map[20].src_anchor = AP_BOT_CENTER;
|
item_sprite_map[20].src_anchor = AP_BOT_CENTER;
|
||||||
item_sprite_map[20].offset = (Vector2){0, TILE_SIZE >> 1};
|
item_sprite_map[20].offset = (Vector2){0, TILE_SIZE >> 1};
|
||||||
|
item_sprite_map[21].sprite = get_sprite(assets, "urchin");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -267,11 +268,11 @@ Entity_t* create_urchin(EntityManager_t* ent_manager)
|
||||||
CHitBoxes_t* p_hitbox = add_component(p_urchin, CHITBOXES_T);
|
CHitBoxes_t* p_hitbox = add_component(p_urchin, CHITBOXES_T);
|
||||||
p_hitbox->n_boxes = 1;
|
p_hitbox->n_boxes = 1;
|
||||||
p_hitbox->boxes[0] = (Rectangle){3, 3, 26, 26};
|
p_hitbox->boxes[0] = (Rectangle){3, 3, 26, 26};
|
||||||
p_hitbox->atk = 2;
|
p_hitbox->atk = 1;
|
||||||
|
|
||||||
CSprite_t* p_cspr = add_component(p_urchin, CSPRITE_T);
|
CSprite_t* p_cspr = add_component(p_urchin, CSPRITE_T);
|
||||||
p_cspr->sprites = item_sprite_map;
|
p_cspr->sprites = item_sprite_map;
|
||||||
p_cspr->current_idx = 0;
|
p_cspr->current_idx = 21;
|
||||||
|
|
||||||
|
|
||||||
return p_urchin;
|
return p_urchin;
|
||||||
|
|
Loading…
Reference in New Issue