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

WAGE: Load fonts from wage.dat

Browse source
This commit is contained in:
Eugene Sandulenko 2015-12-31 18:50:34 +01:00
parent a3cc6cdddc
commit dad200e50e
2 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

46
engines/wage/gui.cpp
View file

@ -46,8 +46,10 @@
*/ */
#include "common/system.h" #include "common/system.h"
#include "common/unzip.h"
#include "graphics/fontman.h" #include "graphics/fontman.h"
#include "graphics/font.h" #include "graphics/font.h"
#include "graphics/fonts/bdf.h"
#include "wage/wage.h" #include "wage/wage.h"
#include "wage/design.h" #include "wage/design.h"
#include "wage/entities.h" #include "wage/entities.h"
@ -74,8 +76,11 @@ Gui::Gui() {
Common::Rect r(0, 0, _screen.w, _screen.h); Common::Rect r(0, 0, _screen.w, _screen.h);
_scrollPos = 0; _scrollPos = 0;
_builtInFonts = false;
Design::drawFilledRect(&_screen, r, kColorBlack, p, 1); Design::drawFilledRect(&_screen, r, kColorBlack, p, 1);
loadFonts();
} }
Gui::~Gui() { Gui::~Gui() {
@ -308,5 +313,46 @@ void Gui::renderConsole(Graphics::Surface *g, int x, int y, int width, int heigh
g->copyRectToSurface(_console, x - kConOverscan, y - kConOverscan, boundsR); g->copyRectToSurface(_console, x - kConOverscan, y - kConOverscan, boundsR);
} }
void Gui::loadFonts() {
Common::Archive *dat;
dat = Common::makeZipArchive("wage.dat");
if (!dat) {
warning("Could not find wage.dat. Falling back to built-in fonts");
_builtInFonts = true;
}
Common::ArchiveMemberList list;
dat->listMembers(list);
for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) {
Common::SeekableReadStream *stream = dat->createReadStreamForMember((*it)->getName());
Graphics::BdfFont *font = Graphics::BdfFont::loadFont(*stream);
delete stream;
Common::String fontName = (*it)->getName();
// Trim the .bdf extension
for (int i = fontName.size() - 1; i >= 0; --i) {
if (fontName[i] == '.') {
while ((uint)i < fontName.size()) {
fontName.deleteLastChar();
}
break;
}
}
FontMan.assignFontToName(fontName, font);
debug(2, " %s", fontName.c_str());
}
_builtInFonts = false;
delete dat;
}
} // End of namespace Wage } // End of namespace Wage

3
engines/wage/gui.h
View file

@ -73,6 +73,7 @@ private:
void renderConsole(Graphics::Surface *g, int x, int y, int width, int height); void renderConsole(Graphics::Surface *g, int x, int y, int width, int height);
void drawBox(Graphics::Surface *g, int x, int y, int w, int h); void drawBox(Graphics::Surface *g, int x, int y, int w, int h);
void fillRect(Graphics::Surface *g, int x, int y, int w, int h); void fillRect(Graphics::Surface *g, int x, int y, int w, int h);
void loadFonts();
private: private:
Graphics::Surface _screen; Graphics::Surface _screen;
@ -83,6 +84,8 @@ private:
Common::StringArray _out; Common::StringArray _out;
Common::StringArray _lines; Common::StringArray _lines;
uint _scrollPos; uint _scrollPos;
bool _builtInFonts;
}; };
} // End of namespace Wage } // End of namespace Wage