thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A bit of cleanup.

Browse source
This commit is contained in:
Joel Teichroeb 2011-05-23 20:03:46 -07:00
parent 917ddfe3ca
commit a8724370c5
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/grim/gfx_opengl.cpp
View file

@ -808,7 +808,7 @@ void GfxOpenGL::createFont(Font *font) {
int size = 0;
for (int i = 0; i < 256; ++i) {
int width = font->getCharDataWidth(i), height = font->getCharDataHeight(i);
int m = width > height ? width : height;
int m = MAX(width, height);
if (m > size)
size = m;
}
@ -838,15 +838,11 @@ void GfxOpenGL::createFont(Font *font) {
glGenTextures(1, texture);
uint start = (int)font->getCharData(0);
uint start = (uint)font->getCharData(0);
for (int i = 0, row = 0; i < 256; ++i) {
int width = font->getCharDataWidth(i), height = font->getCharDataHeight(i);
uint d = (uint)font->getCharData(i) - start;
for (int x = 0; x < height; ++x) {
// TODO: Make this line use less magic
uint a = row * size * size * bpp * charsHigh;
uint b = x * size * charsWide * bpp;
uint c = 0;
@ -870,8 +866,6 @@ void GfxOpenGL::createFont(Font *font) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size * charsWide, size * charsHigh, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
delete[] data;
delete[] temp;
}