Try to fix OSX no-graphics STK
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
#include "graphics/stk_tex_manager.hpp"
|
||||
#include "guiengine/engine.hpp"
|
||||
#include "guiengine/skin.hpp"
|
||||
#include "modes/profile_world.hpp"
|
||||
#include "utils/string_utils.hpp"
|
||||
|
||||
#include <array>
|
||||
@@ -208,7 +209,7 @@ void FontWithFace::insertGlyph(wchar_t c, const GlyphInfo& gi)
|
||||
|
||||
const unsigned int cur_tex = m_spritebank->getTextureCount() -1;
|
||||
#ifndef SERVER_ONLY
|
||||
if (bits->buffer != NULL)
|
||||
if (bits->buffer != NULL && !ProfileWorld::isNoGraphics())
|
||||
{
|
||||
video::ITexture* tex = m_spritebank->getTexture(cur_tex);
|
||||
glBindTexture(GL_TEXTURE_2D, tex->getOpenGLTextureName());
|
||||
|
||||
@@ -45,7 +45,7 @@ std::string SeparateProcess::getCurrentExecutableLocation()
|
||||
#elif defined (__APPLE__)
|
||||
char path[1024];
|
||||
unsigned buf_size = 1024;
|
||||
if (_NSGetExecutablePath(path, &buf_size) != 0)
|
||||
if (_NSGetExecutablePath(path, &buf_size) == 0)
|
||||
{
|
||||
return file_manager->getFileSystem()->getAbsolutePath(path).c_str();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user