diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2020-05-30 00:12:00 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2020-05-30 00:12:00 -0700 |
commit | ff88e63d814b7f4c4aab69e40b56eb578946cb0a (patch) | |
tree | 1d59d4becd99e5312020bc333a1bcd4dd83f7a52 | |
parent | fe7bce3a25167d1cc7c99681b07a804e899a08e3 (diff) |
libstage: bump libstage version
Newer libstage cleans up the parent/adopt conf naming a bit, fixup
relevant call sites to reflect that.
m--------- | libstage | 0 | ||||
-rw-r--r-- | src/game.c | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libstage b/libstage -Subproject fc879e25fd4b45ec3520b4bd0cbfb4bec4ad159 +Subproject 19acc6de674d44d44f8d3bcb66568de3e5abfe3 @@ -265,7 +265,7 @@ static ix2_search_status_t virus_search(void *cb_context, ix2_object_t *ix2_obje switch (entity->any.type) { case ENTITY_TYPE_BABY: /* convert baby into inanimate virus (off the viruses array) */ - (void) virus_node_new(&(stage_conf_t){ .parent = entity->any.node, .adopt = 1, .name = "baby-virus", .active = 1, .alpha = 1.f }, &entity->any.model_x); + (void) virus_node_new(&(stage_conf_t){ .stage = entity->any.node, .replace = 1, .name = "baby-virus", .active = 1, .alpha = 1.f }, &entity->any.model_x); sfx_play(sfx.baby_infected); entity->any.type = ENTITY_TYPE_VIRUS; @@ -277,7 +277,7 @@ static ix2_search_status_t virus_search(void *cb_context, ix2_object_t *ix2_obje case ENTITY_TYPE_ADULT: /* convert adult into inanimate virus (off the viruses array) */ - (void) virus_node_new(&(stage_conf_t){ .parent = entity->any.node, .adopt = 1, .name = "adult-virus", .active = 1, .alpha = 1.f }, &entity->any.model_x); + (void) virus_node_new(&(stage_conf_t){ .stage = entity->any.node, .replace = 1, .name = "adult-virus", .active = 1, .alpha = 1.f }, &entity->any.model_x); sfx_play(sfx.adult_infected); search->game->state = GAME_STATE_OVER; return IX2_SEARCH_STOP_HIT; @@ -370,11 +370,11 @@ static ix2_search_status_t adult_search(void *cb_context, ix2_object_t *ix2_obje return IX2_SEARCH_MORE_MISS; /* convert adult into inanimate virus (off the viruses array) */ - (void) virus_node_new(&(stage_conf_t){ .parent = game->adult->entity.node, .adopt = 1, .name = "adult-virus", .active = 1, .alpha = 1.f }, &game->adult->entity.model_x); + (void) virus_node_new(&(stage_conf_t){ .stage = game->adult->entity.node, .replace = 1, .name = "adult-virus", .active = 1, .alpha = 1.f }, &game->adult->entity.model_x); sfx_play(sfx.adult_infected); if (game->adult->holding) { - (void) virus_node_new(&(stage_conf_t){ .parent = game->adult->holding->any.node, .adopt = 1, .name = "baby-virus", .active = 1, .alpha = 1.f }, &game->adult->holding->any.model_x); + (void) virus_node_new(&(stage_conf_t){ .stage = game->adult->holding->any.node, .replace = 1, .name = "baby-virus", .active = 1, .alpha = 1.f }, &game->adult->holding->any.model_x); sfx_play(sfx.baby_infected); } game->state = GAME_STATE_OVER; |