Autopilot: clean up the helpers code (which drives the various /internal/) properties...

[flightgear.git] / src / GUI / SafeTexFont.cxx

diff --git a/src/GUI/SafeTexFont.cxx b/src/GUI/SafeTexFont.cxx
index e40f4898b98d1009c3c91c8625c32daab28082bc..0fcfc6e4726cf015b5dc782986e9f45421550f60 100644 (file)
--- a/src/GUI/SafeTexFont.cxx
+++ b/src/GUI/SafeTexFont.cxx
@@ -26,7 +26,7 @@ int SafeTexFont::load(const char *fname, GLenum mag, GLenum min)
 {
     struct stat buf;
     if (stat(fname, &buf) == -1) {
-        _status = ERROR;
+        _status = e_ERROR;
         return FNT_FALSE;
     }
     _name = fname;
@@ -37,16 +37,16 @@ int SafeTexFont::load(const char *fname, GLenum mag, GLenum min)
 
 bool SafeTexFont::ensureTextureLoaded()
 {
-    if (_status != ERROR) {
-        if (_status == LOADED) {
+    if (_status != e_ERROR) {
+        if (_status == e_LOADED) {
             return true;
         } else {
             int loadStatus = fntTexFont::load(_name.c_str(), _mag, _min);
             if (loadStatus == FNT_TRUE) {
-                _status = LOADED;
+                _status = e_LOADED;
                 return true;
             } else {
-                _status = ERROR;
+                _status = e_ERROR;
                 _error = ulGetError();
                 return false;
             }