diff --git a/Include/fg_constants.h b/Include/fg_constants.h index cf24ec67a..c925c7843 100644 --- a/Include/fg_constants.h +++ b/Include/fg_constants.h @@ -164,7 +164,7 @@ // Maximum nodes per tile -#define MAX_NODES 2000 +#define FG_MAX_NODES 2000 #endif // _FG_CONSTANTS_H diff --git a/Simulator/Objects/obj.cxx b/Simulator/Objects/obj.cxx index 4d976f6ce..c670fb366 100644 --- a/Simulator/Objects/obj.cxx +++ b/Simulator/Objects/obj.cxx @@ -62,7 +62,7 @@ FG_USING_STD(string); -static double normals[MAX_NODES][3]; +static double normals[FG_MAX_NODES][3]; // given three points defining a triangle, calculate the normal @@ -259,7 +259,7 @@ int fgObjLoad( const string& path, fgTILE *t) { if ( token == "vn" ) { // vertex normal - if ( vncount < MAX_NODES ) { + if ( vncount < FG_MAX_NODES ) { in >> normals[vncount][0] >> normals[vncount][1] >> normals[vncount][2]; @@ -271,7 +271,7 @@ int fgObjLoad( const string& path, fgTILE *t) { } } else if ( token == "v" ) { // node (vertex) - if ( t->ncount < MAX_NODES ) { + if ( t->ncount < FG_MAX_NODES ) { in >> t->nodes[t->ncount][0] >> t->nodes[t->ncount][1] >> t->nodes[t->ncount][2];