Changeset 8965 in orxonox.OLD
- Timestamp:
- Jun 30, 2006, 4:09:47 PM (18 years ago)
- Location:
- branches/terrain
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/terrain/acinclude.m4
r8962 r8965 304 304 if test -e ${_lua_lib_directory}/liblua.a || test -e ${_lua_lib_directory}/liblua.dylib ; then 305 305 LUA_LIB_DIRECTORY=${_lua_lib_directory} 306 LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llua lib -ldl"306 LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llua -llualib -ldl" 307 307 break 308 308 fi -
branches/terrain/src/lib/graphics/importer/terrain/terrain.cc
r8950 r8965 39 39 return; 40 40 } 41 PRINTF(2)( "Loaded the elevation map\n" ); 41 42 heightfield.height = tmpData->h; 42 43 heightfield.width = tmpData->w; -
branches/terrain/src/world_entities/terrain_entity.cc
r8929 r8965 137 137 PRINTF(0)( "%s not found\n", detailmap.c_str() ); 138 138 } 139 else 140 PRINTF(0)( "loaded %s\n", detailmap.c_str() ); 139 141 TiXmlElement *repeat = (TiXmlElement*)detail->FirstChild( "repeat" ); 140 142 if ( repeat ) { … … 152 154 info->alpha = (Texture*)manager->load( alphamap, 153 155 IMAGE, RP_GAME, (int)GL_TEXTURE_2D ); 156 if ( !info->alpha ) 157 PRINTF(0)( "%s not found\n", alphamap.c_str() ); 158 else 159 PRINTF(0)( "loaded %s\n", alphamap.c_str() ); 154 160 } 155 161 }
Note: See TracChangeset
for help on using the changeset viewer.