summaryrefslogtreecommitdiff
path: root/src/engine/worldio.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/worldio.cpp')
-rw-r--r--src/engine/worldio.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/worldio.cpp b/src/engine/worldio.cpp
index ee936f0..591af3c 100644
--- a/src/engine/worldio.cpp
+++ b/src/engine/worldio.cpp
@@ -525,7 +525,7 @@ void loadc(stream *f, cube &c, const ivec &co, int size, bool &failed)
if(mapversion < 27)
{
static const ushort matconv[] = { MAT_AIR, MAT_WATER, MAT_CLIP, MAT_GLASS|MAT_CLIP, MAT_NOCLIP, MAT_LAVA|MAT_DEATH, MAT_GAMECLIP, MAT_DEATH };
- c.material = size_t(mat) < sizeof(matconv)/sizeof(matconv[0]) ? matconv[mat] : MAT_AIR;
+ c.material = size_t(mat) < sizeof(matconv)/sizeof(matconv[0]) ? (int) matconv[mat] : (int) MAT_AIR;
}
else c.material = convertoldmaterial(mat);
}