]> git.mxchange.org Git - simgear.git/blobdiff - simgear/scene/material/mat.cxx
Use bool instead of int to represent boolean values
[simgear.git] / simgear / scene / material / mat.cxx
index 6dde0c519b74b77a8c2439ac7aca45f3f7328d78..2d488f345eb7db8da34c8bbebbba5b3a9fcdd932 100644 (file)
@@ -100,11 +100,6 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
   {
     string tname = textures[i]->getStringValue();
     string otname = tname;
-    if (season && strncmp(season, "summer", 6))
-    {
-        if (tname.substr(0,7) == "Terrain")
-            tname.insert(7,"."+string(season));
-    }
 
     if (tname == "") {
         tname = "unknown.rgb";
@@ -308,7 +303,7 @@ void SGMaterial::set_state( osg::StateSet *s )
 }
 
 void SGMaterial::assignTexture( osg::StateSet *state, const std::string &fname,
-                 int _wrapu, int _wrapv, int _mipmap )
+                 bool _wrapu, bool _wrapv, bool _mipmap )
 {
    osg::Texture2D* texture = SGLoadTexture2D(fname, 0, _wrapu, _wrapv,
                                              mipmap ? -1 : 0);