mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity

Compile fix for win32/MSVC that creeped up for some reason

Browse source
This commit is contained in:
fgenesis 2012-04-06 20:57:26 +02:00
parent fc7fa440da
commit 1a20ff5d59
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BBGE/Base.h
View file

@ -120,6 +120,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced #pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced
#endif #endif
#undef GetCharWidth
#include <string.h> #include <string.h>
#include <string> #include <string>

5
ExternalLibs/glfont2/glfont2.cpp
View file

@ -19,7 +19,6 @@ using namespace std;
#endif #endif
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
*/ */
#include "Base.h"
#include "SDL_endian.h" #include "SDL_endian.h"
@ -91,10 +90,6 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
header.end_char = read_int(input); header.end_char = read_int(input);
input.seekg(4, ios::cur); // skip chars field input.seekg(4, ios::cur); // skip chars field
std::ostringstream os;
os << "tex_width: " << header.tex_width << " tex_height: " << header.tex_height;
debugLog(os.str());
//Allocate space for character array //Allocate space for character array
num_chars = header.end_char - header.start_char + 1; num_chars = header.end_char - header.start_char + 1;
if ((header.chars = new GLFontChar[num_chars]) == NULL) if ((header.chars = new GLFontChar[num_chars]) == NULL)