X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fsplash.cxx;h=f2be9494582caeb3c0be04fd76c3674556fe0534;hb=c4b2e54551a0c3384f6c041ffe89187942993f16;hp=21ddc0e806ce1c0a1870ae00a5333d2f323a0c28;hpb=8497f9b1acddd448156d2cb62d884ebb3cebd29b;p=flightgear.git diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx index 21ddc0e80..f2be94945 100644 --- a/src/Main/splash.cxx +++ b/src/Main/splash.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include #include @@ -58,7 +58,7 @@ static GLubyte *splash_texbuf; void fgSplashInit ( void ) { int width, height; - FG_LOG( FG_GENERAL, FG_INFO, "Initializing splash screen" ); + SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" ); #ifdef GL_VERSION_1_1 xglGenTextures(1, &splash_texid); xglBindTexture(GL_TEXTURE_2D, splash_texid); @@ -79,7 +79,7 @@ void fgSplashInit ( void ) { char num_str[256]; sprintf(num_str, "%d", num); - FGPath tpath( globals->get_fg_root() ); + SGPath tpath( globals->get_fg_root() ); tpath.append( "Textures/Splash" ); tpath.concat( num_str ); tpath.concat( ".rgb" ); @@ -88,12 +88,12 @@ void fgSplashInit ( void ) { read_rgb_texture(tpath.c_str(), &width, &height)) == NULL ) { // Try compressed - FGPath fg_tpath = tpath; + SGPath fg_tpath = tpath; fg_tpath.concat( ".gz" ); if ( (splash_texbuf = read_rgb_texture(fg_tpath.c_str(), &width, &height)) == NULL ) { - FG_LOG( FG_GENERAL, FG_ALERT, + SG_LOG( SG_GENERAL, SG_ALERT, "Error in loading splash screen texture " << tpath.str() ); exit(-1); }