ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #402 from Pan7/fixnarrow 

Fix gcc warning narrowing conversion of g_MaxWorldCoord
This commit is contained in:
Timothee "TTimo" Besset 2017-02-25 14:46:49 -06:00 committed by GitHub
parent 55edfadcd9 8ff399011d
commit ceb9a38be5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radiant/map.cpp
View File

@ -57,12 +57,12 @@ bool g_bCancel_Map_LoadFile; // Hydra: moved this here
// TTimo // TTimo
// need that in a variable, will have to tweak depending on the game // need that in a variable, will have to tweak depending on the game
int g_MaxWorldCoord = 64 * 1024; vec_t g_MaxWorldCoord = 64 * 1024;
int g_MinWorldCoord = -64 * 1024; vec_t g_MinWorldCoord = -64 * 1024;
// the max size we allow on brushes, this is dependant on world coords too // the max size we allow on brushes, this is dependant on world coords too
// makes more sense to say smaller I think? // 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 AddRegionBrushes( void );
void RemoveRegionBrushes( void ); void RemoveRegionBrushes( void );

6
radiant/qe3.h
View File

@ -115,9 +115,9 @@ extern _QERPlugMapTable g_MapTable;
//++timo for BP conversion escaping FIXME: remove when mixing two formats! //++timo for BP conversion escaping FIXME: remove when mixing two formats!
extern bool g_bCancel_Map_LoadFile; extern bool g_bCancel_Map_LoadFile;
// used to be #defines, multiple engine support suggests we should go towards dynamic // used to be #defines, multiple engine support suggests we should go towards dynamic
extern int g_MaxWorldCoord; extern vec_t g_MaxWorldCoord;
extern int g_MinWorldCoord; extern vec_t g_MinWorldCoord;
extern int g_MaxBrushSize; extern vec_t g_MaxBrushSize;
/* /*
// set to true when we are parsing a terrain entity // set to true when we are parsing a terrain entity
extern bool g_bParseTerrain; extern bool g_bParseTerrain;