summaryrefslogtreecommitdiff
path: root/src/engine/renderva.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/renderva.cpp')
-rw-r--r--src/engine/renderva.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/renderva.cpp b/src/engine/renderva.cpp
index 6194659..0788948 100644
--- a/src/engine/renderva.cpp
+++ b/src/engine/renderva.cpp
@@ -124,7 +124,7 @@ void findvisiblevas(vector<vtxarray *> &vas, bool resetocclude = false)
loopv(vas)
{
vtxarray &v = *vas[i];
- int prevvfc = resetocclude ? VFC_NOT_VISIBLE : v.curvfc;
+ int prevvfc = resetocclude ? (int) VFC_NOT_VISIBLE : (int) v.curvfc;
v.curvfc = isvisiblecube(v.o, v.size);
if(v.curvfc!=VFC_NOT_VISIBLE)
{
@@ -1059,7 +1059,7 @@ static void changebatchtmus(renderstate &cur, int pass, geombatch &b)
bool changed = false;
extern bool brightengeom;
extern int fullbright;
- int lmid = brightengeom && (b.es.lmid < LMID_RESERVED || (fullbright && editmode)) ? LMID_BRIGHT : b.es.lmid;
+ int lmid = brightengeom && (b.es.lmid < LMID_RESERVED || (fullbright && editmode)) ? (int) LMID_BRIGHT : (int) b.es.lmid;
if(cur.textures[1]!=lightmaptexs[lmid].id)
{
glActiveTexture_(GL_TEXTURE1);