commit 8b37c4ac57d611ce7022521a6af8a244d813ff79
parent 6d083f7766ee054fcd6e7f04e5e613200d498ab5
Author: William Casarin <jb55@jb55.com>
Date: Sun, 21 Jul 2019 15:42:30 -0700
add barrel
Diffstat:
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/game.c b/src/game.c
@@ -182,9 +182,7 @@ void game_init(struct game *game, int width, int height) {
assert(res->player_id.index == entity_player);
struct model *pmodel;
- player->model_id = get_static_model(model_pirate_officer, &pmodel);
-
- pmodel->shading = SHADING_VERT_COLOR;
+ player->model_id = get_static_model(model_barrel, &pmodel);
node_set_label(pnode, "player");
/* node_rotate(pnode, V3(-5.0,0,0)); */
diff --git a/src/model.c b/src/model.c
@@ -13,6 +13,7 @@ static struct model_def static_model_defs[NUM_STATIC_MODELS] = {
MODELDEF(tower),
MODELDEF(icosphere),
MODELDEF(pirate_officer),
+ MODELDEF(barrel),
};
static struct resource_manager dyn_modelman;
diff --git a/src/static_resources.h b/src/static_resources.h
@@ -7,6 +7,7 @@ enum static_model {
model_tower,
model_icosphere,
model_pirate_officer,
+ model_barrel,
NUM_STATIC_MODELS
};