fly/flightgear
1
0
Fork 0
Code Activity

Rename FontStatus enum labels because ERROR is already a macro under Windows

Browse source
This commit is contained in:
fredb 2008-05-14 09:51:11 +00:00
parent 4db30b5abb
commit 87b6632ba6
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/GUI/SafeTexFont.cxx
View file

@ -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;
}

8
src/GUI/SafeTexFont.hxx
View file

@ -31,7 +31,7 @@ namespace flightgear
class SafeTexFont : public fntTexFont
{
public:
SafeTexFont() : _status(NOT_LOADED) {}
SafeTexFont() : _status(e_NOT_LOADED) {}
/** Load the texture for this font.
* @param mag OpenGL texture magnification; default is GL_NEAREST
* @param min OpenGL texture minification; default is
@ -46,9 +46,9 @@ public:
void puts(sgVec3 curpos, float pointsize, float italic, const char *s);
enum FontStatus
{
ERROR = -1,
NOT_LOADED = 0,
LOADED = 1
e_ERROR = -1,
e_NOT_LOADED = 0,
e_LOADED = 1
};
FontStatus getStatus() { return _status; }
std::string& fntError() { return _error; }