diff --git a/src/battle/items.c b/src/battle/items.c index fdec377..07fb2d9 100644 --- a/src/battle/items.c +++ b/src/battle/items.c @@ -48,9 +48,9 @@ void loadItemDefs(void) STRNCPY(e->name, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH); STRNCPY(e->defName, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH); e->texture = getTexture(cJSON_GetObjectItem(node, "texture")->valuestring); - e->health = e->maxHealth = FPS; - + e->flags = EF_NO_HEALTH_BAR; + SDL_QueryTexture(e->texture, NULL, NULL, &e->w, &e->h); defTail->next = e; diff --git a/src/battle/jumpgate.c b/src/battle/jumpgate.c index 55ed412..2754fd1 100644 --- a/src/battle/jumpgate.c +++ b/src/battle/jumpgate.c @@ -48,6 +48,7 @@ Entity *spawnJumpgate(int side, long flags) jumpgate->draw = draw; jumpgate->side = side; jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID+EF_NO_HEALTH_BAR; + if (flags != -1 && flags & EF_DISABLED) { jumpgate->flags |= EF_DISABLED; @@ -88,6 +89,11 @@ static void addNodes(Entity *jumpgate, long flags) node->die = nodeDie; SDL_QueryTexture(node->texture, NULL, NULL, &node->w, &node->h); + if (jumpgate->side == SIDE_NONE) + { + node->flags |= EF_NO_HEALTH_BAR; + } + if (flags != -1) { node->flags = flags; diff --git a/src/battle/mine.c b/src/battle/mine.c index 12969ab..4765674 100644 --- a/src/battle/mine.c +++ b/src/battle/mine.c @@ -49,7 +49,7 @@ Entity *spawnMine(int type) mine->texture = (type == ET_MINE) ? mineNormal : shadowMine; mine->action = think; mine->die = die; - mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE+EF_NON_SOLID; + mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE+EF_NON_SOLID+EF_NO_HEALTH_BAR; if (type == ET_SHADOW_MINE) {