Changeset 8747 in orxonox.OLD

Timestamp:

Jun 23, 2006, 4:45:04 PM (18 years ago)

Author:

ponder

Message:

Added a boundary check to the getAltitude() method

Location:

branches/terrain

Files:

• acinclude.m4 (modified) (1 diff)
• src/lib/graphics/importer/terrain/terrain.h (modified) (1 diff)

branches/terrain/acinclude.m4

@@ -303 +303 @@
       if test -e ${_lua_lib_directory}/liblua.a  || test -e ${_lua_lib_directory}/liblua.dylib ; then
         LUA_LIB_DIRECTORY=${_lua_lib_directory}
-        LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llua"
+        LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llualib"
         break
       fi

branches/terrain/src/lib/graphics/importer/terrain/terrain.h

@@ -206 +206 @@
 inline float Terrain::getAltitude( int _x, int _z ) const
 {
+        if ( _x < 0 || _x > heightfield.width || _z < 0 || _z > heightfield.height )
+                return 0.0f;
         return heightfield.data[heightfield.pitch*_z+_x]/255.0f;        
 }