FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't allow new command name to overwrite material name

Browse Source
This commit is contained in:
mfranz
2006-04-20 17:46:40 +00:00
parent fd7b5d3de7
commit a2a91520aa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/tgdb/apt_signs.cxx
View File

@@ -86,7 +86,7 @@ ssgBranch *sgMakeSign(SGMaterialLib *matlib, const string path, const string con
{
double sign_height = 1.0; // meter
bool lighted = true;
const char *newmat = "BlackSign";
string newmat = "BlackSign";
vector<element_info *> elements;
element_info *close = 0;
@@ -211,7 +211,7 @@ ssgBranch *sgMakeSign(SGMaterialLib *matlib, const string path, const string con
}
}
if (newmat) {
if (newmat.size()) {
material = matlib->find(newmat);
if (!material) {
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << newmat << '\'');
@@ -220,7 +220,7 @@ ssgBranch *sgMakeSign(SGMaterialLib *matlib, const string path, const string con
// set material states (lighted & unlighted)
lighted_state = material->get_state();
string u = string(newmat) + ".unlighted";
string u = newmat + ".unlighted";
SGMaterial *m = matlib->find(u);
if (m) {
@@ -230,7 +230,7 @@ ssgBranch *sgMakeSign(SGMaterialLib *matlib, const string path, const string con
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << u << '\'');
unlighted_state = lighted_state;
}
newmat = 0;
newmat = "";
}
SGMaterialGlyph *glyph = material->get_glyph(name);