#endif
}
+#include <assert.h>
+
#include "Texture.hh"
#include "BaseDisplay.hh"
#include "Image.hh"
addTexture(BTexture::PipeCross);
else if (descr.find("elliptic") != string::npos)
addTexture(BTexture::Elliptic);
- else if (descr.find("diagonal") != string::npos)
- addTexture(BTexture::Diagonal);
else if (descr.find("horizontal") != string::npos)
addTexture(BTexture::Horizontal);
else if (descr.find("vertical") != string::npos)
addTexture(BTexture::Solid);
}
- if (descr.find("raised") != string::npos)
- addTexture(BTexture::Raised);
- else if (descr.find("sunken") != string::npos)
+ if (descr.find("sunken") != string::npos)
addTexture(BTexture::Sunken);
+ else if (descr.find("flatborder") != string::npos)
+ addTexture(BTexture::FlatBorder);
else if (descr.find("flat") != string::npos)
addTexture(BTexture::Flat);
else
addTexture(BTexture::Raised);
- if (! (texture() & BTexture::Flat)) {
+ if (! (texture() & (BTexture::Flat | BTexture::FlatBorder))) {
if (descr.find("bevel2") != string::npos)
addTexture(BTexture::Bevel2);
else