1 files changed, 82 insertions, 1 deletions

diff --git a/engines/illusions/fontresource.cpp b/engines/illusions/fontresource.cpp
index e0f48d051c..adfb135da5 100644
--- a/engines/illusions/fontresource.cpp
+++ b/engines/illusions/fontresource.cpp
@@ -22,6 +22,7 @@
 
 #include "illusions/illusions.h"
 #include "illusions/fontresource.h"
+#include "illusions/dictionary.h"
 
 namespace Illusions {
 
@@ -30,11 +31,19 @@ namespace Illusions {
 void FontResourceLoader::load(Resource *resource) {
 	debug("FontResourceLoader::load() Loading font %08X from %s...", resource->_resId, resource->_filename.c_str());
 
-    // TODO
+	// TODO
+	FontResource *fontResource = new FontResource();
+	fontResource->load(resource);
+	resource->_refId = fontResource;
+
+	_vm->_dict->addFont(resource->_resId, fontResource);
 	
 }
 
 void FontResourceLoader::unload(Resource *resource) {
+	FontResource *fontResource = _vm->_dict->findFont(resource->_resId);
+	delete fontResource;
+	_vm->_dict->removeFont(resource->_resId);
 }
 
 void FontResourceLoader::buildFilename(Resource *resource) {
@@ -46,4 +55,76 @@ bool FontResourceLoader::isFlag(int flag) {
 		flag == kRlfLoadFile;
 }
 
+// CharInfo
+
+void CharInfo::load(byte *dataStart, Common::SeekableReadStream &stream) {
+	_width = stream.readUint16LE();
+	_field_2 = stream.readUint16LE();
+	uint32 pixelsOffs = stream.readUint32LE();
+	_pixels = dataStart + pixelsOffs;
+	debug("CharInfo::load() _width: %d; _field_2: %d; pixelsOffs: %08X",
+		_width, _field_2, pixelsOffs);
+}
+
+// CharRange
+
+void CharRange::load(byte *dataStart, Common::SeekableReadStream &stream) {
+	_firstChar = stream.readUint16LE();
+	_lastChar = stream.readUint16LE();
+	uint count = _lastChar - _firstChar + 1;
+	uint32 charInfosOffs = stream.readUint32LE();
+	_charInfos = new CharInfo[count];
+	for (uint i = 0; i < count; ++i) {
+		stream.seek(charInfosOffs + i * 8);
+		_charInfos[i].load(dataStart, stream);
+	}
+	debug("CharRange::load() _firstChar: %d; _lastChar: %d; charInfosOffs: %08X",
+		_firstChar, _lastChar, charInfosOffs);
+}
+
+CharInfo *CharRange::getCharInfo(uint16 c) {
+	return &_charInfos[c - _firstChar];
+}
+
+bool CharRange::containsChar(uint16 c) {
+	return c >= _firstChar && c <= _lastChar;
+}
+
+// FontResource
+
+FontResource::FontResource() {
+}
+
+FontResource::~FontResource() {
+}
+
+void FontResource::load(Resource *resource) {
+	byte *data = resource->_data;
+	uint32 dataSize = resource->_dataSize;
+	Common::MemoryReadStream stream(data, dataSize, DisposeAfterUse::NO);
+
+	_totalSize = stream.readUint32LE();
+	_charHeight = stream.readUint16LE();
+	_field_6 = stream.readUint16LE();
+	_colorIndex = stream.readUint16LE();
+	_lineIncr = stream.readUint16LE();
+	_widthC = stream.readUint16LE();
+	_charRangesCount = stream.readUint16LE();
+	uint32 charRangesOffs = stream.pos();
+	_charRanges = new CharRange[_charRangesCount];
+	for (uint i = 0; i < _charRangesCount; ++i) {
+		stream.seek(charRangesOffs + i * 8);
+		_charRanges[i].load(data, stream);
+	}
+	debug("FontResource::load() _charHeight: %d; _field_6: %d; _colorIndex: %d; _lineIncr: %d; _widthC: %d; _charRangesCount: %d",
+		_charHeight, _field_6, _colorIndex, _lineIncr, _widthC, _charRangesCount);
+}
+
+CharInfo *FontResource::getCharInfo(uint16 c) {
+	for (uint i = 0; i < _charRangesCount; ++i)
+		if (_charRanges[i].containsChar(c))
+			return _charRanges[i].getCharInfo(c);
+	return 0;
+}
+
 } // End of namespace Illusions