libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more robust font management

Browse Source 
svn-id: r26068
This commit is contained in:
Nicola Mettifogo 2007-03-10 21:23:22 +00:00
parent 344e9ba5a8
commit c80c3e3b3b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/parallaction/graphics.cpp
View File

@ -56,7 +56,6 @@ const byte _glyphWidths[126] = {
0x05, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06, 0x05, 0x05, 0x05, 0x05
};
Cnv Graphics::_font;
bool Graphics::_proportionalFont = false;
Point Graphics::_labelPosition[2] = { { 0, 0 }, { 0, 0 } };
StaticCnv Graphics::_mouseComposedArrow;
@ -797,9 +796,7 @@ void Graphics::getStringExtent(char *text, uint16 maxwidth, int16* width, int16*
void Graphics::setFont(const char* name) {
if (_font._array != NULL)
freeCnv(&_font);
freeCnv(&_font);
_vm->_disk->loadFont(name, &_font);
}
@ -922,11 +919,20 @@ void Graphics::freeCnv(Cnv *cnv) {
// printf("Graphics::freeCnv()\n");
if (!cnv) return;
if (cnv->_count == 0) return;
if (!cnv->_array) return;
for (uint16 _si = 0; _si < cnv->_count; _si++) {
free(cnv->_array[_si]);
if (cnv->_array[_si]) {
free(cnv->_array[_si]);
}
cnv->_array[_si] = NULL;
}
if (cnv->_array) free(cnv->_array);
if (cnv->_array)
free(cnv->_array);
cnv->_count = 0;
cnv->_array = NULL;
return;
@ -1126,6 +1132,7 @@ Graphics::Graphics(Parallaction* vm) :
initMouse( 0 );
_font._count = 0;
_font._array = NULL;
return;

2
engines/parallaction/graphics.h
View File

@ -156,7 +156,7 @@ protected:
static byte _mouseArrow[256];
static StaticCnv _mouseComposedArrow;
static Cnv _font;
Cnv _font;
protected: