Skip to content

Commit

Permalink
Don't treat smoke puff model like an explosion
Browse files Browse the repository at this point in the history
'Like an explosion' makes it look glowing/fullbright-likes, which feels off
for something called 'smoke'.
  • Loading branch information
res2k committed Feb 27, 2022
1 parent 4a85185 commit 51c763c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions inc/refresh/models.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ typedef enum
{
MCLASS_REGULAR,
MCLASS_EXPLOSION,
MCLASS_FLASH,
MCLASS_SMOKE,
MCLASS_STATIC_LIGHT,
MCLASS_FLARE
Expand Down
2 changes: 1 addition & 1 deletion src/refresh/models.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ get_model_class(const char *name)
else if (!strcmp(name, "models/objects/r_explode/tris.md2"))
return MCLASS_EXPLOSION;
else if (!strcmp(name, "models/objects/flash/tris.md2"))
return MCLASS_SMOKE;
return MCLASS_FLASH;
else if (!strcmp(name, "models/objects/smoke/tris.md2"))
return MCLASS_SMOKE;
else if (!strcmp(name, "models/objects/minelite/light2/tris.md2"))
Expand Down
2 changes: 1 addition & 1 deletion src/refresh/vkpt/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2039,7 +2039,7 @@ prepare_entities(EntityUploadInfo* upload_info)
viewer_model_indices[viewer_model_num++] = i;
else if (entity->flags & RF_WEAPONMODEL)
viewer_weapon_indices[viewer_weapon_num++] = i;
else if (model->model_class == MCLASS_EXPLOSION || model->model_class == MCLASS_SMOKE)
else if (model->model_class == MCLASS_EXPLOSION || model->model_class == MCLASS_FLASH)
explosion_indices[explosion_num++] = i;
else
{
Expand Down

0 comments on commit 51c763c

Please sign in to comment.