From 8ff399011dda10f5afa4669715115f5f4f8f2fe2 Mon Sep 17 00:00:00 2001 From: Pan7 Date: Wed, 22 Feb 2017 00:44:05 +0100 Subject: [PATCH] Fix gcc warning narrowing conversion of g_MaxWorldCoord --- radiant/map.cpp | 6 +++--- radiant/qe3.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radiant/map.cpp b/radiant/map.cpp index 37cf8e99..ce91b89d 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -57,12 +57,12 @@ bool g_bCancel_Map_LoadFile; // Hydra: moved this here // TTimo // need that in a variable, will have to tweak depending on the game -int g_MaxWorldCoord = 64 * 1024; -int g_MinWorldCoord = -64 * 1024; +vec_t g_MaxWorldCoord = 64 * 1024; +vec_t g_MinWorldCoord = -64 * 1024; // the max size we allow on brushes, this is dependant on world coords too // makes more sense to say smaller I think? -int g_MaxBrushSize = ( g_MaxWorldCoord - 1 ) * 2; +vec_t g_MaxBrushSize = ( g_MaxWorldCoord - 1 ) * 2; void AddRegionBrushes( void ); void RemoveRegionBrushes( void ); diff --git a/radiant/qe3.h b/radiant/qe3.h index ed755385..20f22278 100644 --- a/radiant/qe3.h +++ b/radiant/qe3.h @@ -115,9 +115,9 @@ extern _QERPlugMapTable g_MapTable; //++timo for BP conversion escaping FIXME: remove when mixing two formats! extern bool g_bCancel_Map_LoadFile; // used to be #defines, multiple engine support suggests we should go towards dynamic -extern int g_MaxWorldCoord; -extern int g_MinWorldCoord; -extern int g_MaxBrushSize; +extern vec_t g_MaxWorldCoord; +extern vec_t g_MinWorldCoord; +extern vec_t g_MaxBrushSize; /* // set to true when we are parsing a terrain entity extern bool g_bParseTerrain;