[Scummvm-cvs-logs] CVS: scummvm/saga font.cpp,1.40,1.41 font.h,1.21,1.22 interface.cpp,1.162,1.163 sfuncs.cpp,1.179,1.180

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16933

Modified Files:
	font.cpp font.h interface.cpp sfuncs.cpp 
Log Message:
some Font fixes

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- font.cpp	3 Nov 2005 18:20:11 -0000	1.40
+++ font.cpp	19 Nov 2005 12:41:23 -0000	1.41
@@ -624,7 +624,7 @@
 	}
 }
 
-FontId Font::knownFont2FontIdx(KnownFont font) {
+Font::FontId Font::knownFont2FontIdx(KnownFont font) {
 	FontId fontId = kSmallFont;
 
 	if (_vm->getGameType() == GType_ITE) {

Index: font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- font.h	3 Nov 2005 22:23:23 -0000	1.21
+++ font.h	19 Nov 2005 12:41:23 -0000	1.22
@@ -53,16 +53,6 @@
 #define TEXT_MARGIN 10
 #define TEXT_LINESPACING 2
 
-enum FontId {
-	kSmallFont,
-	kMediumFont,
-	kBigFont,
-	kIHNMUnknown,
-	kIHNMFont8,
-	kIHNMUnknown2,
-	kIHNMMainFont
-};
-
 enum FontEffectFlags {
 	kFontNormal   = 0,
 	kFontOutline  = 1 << 0,
@@ -151,7 +141,17 @@
 	}
 	
  private:
-	 FontId knownFont2FontIdx(KnownFont font);
+	 enum FontId {
+		 kSmallFont,
+		 kMediumFont,
+		 kBigFont,
+		 kIHNMUnknown,
+		 kIHNMFont8,
+		 kIHNMUnknown2,
+		 kIHNMMainFont
+	 };
+
+	 Font::FontId knownFont2FontIdx(KnownFont font);
 
 	 int getStringWidth(FontId fontId, const char *text, size_t count, FontEffectFlags flags);
 	 int getHeight(FontId fontId, const char *text, int width, FontEffectFlags flags);
@@ -168,7 +168,6 @@
 		 return _fonts[fontId];
 	 }
 
-public:
 	int getHeight(FontId fontId) {
 		 return getFont(fontId)->normal.header.charHeight;
 	 }

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- interface.cpp	3 Nov 2005 18:20:12 -0000	1.162
+++ interface.cpp	19 Nov 2005 12:41:23 -0000	1.163
@@ -780,7 +780,7 @@
 	_optionPanel.calcPanelButtonRect(_optionSaveFilePanel, rect);
 	rect.top++;
 	rect2 = rect;
-	fontHeight = _vm->_font->getHeight(kSmallFont);
+	fontHeight = _vm->_font->getHeight(kKnownFontSmall);
 	for (j = 0; j < _vm->getDisplayInfo().optionSaveFileVisible; j++) {
 		bgColor = kITEColorDarkGrey0C;
 		fgColor = kITEColorBrightWhite;
@@ -1041,7 +1041,7 @@
 	drawButtonBox(ds, rect, kEdit, _textInput);
 	rect.left += 4;
 	rect.top += 4;
-	rect.setHeight(_vm->_font->getHeight(kSmallFont));
+	rect.setHeight(_vm->_font->getHeight(kKnownFontSmall));
 
 	i = 0;
 	while ((ch[0] = _textInputString[i++]) != 0) {
@@ -1251,7 +1251,7 @@
 	} else {
 		if (_optionPanel.currentButton == _optionSaveFilePanel) {
 			_optionPanel.calcPanelButtonRect(_optionSaveFilePanel, rect);
-			_optionSaveFileTitleNumber = (mousePoint.y - rect.top) / (_vm->_font->getHeight(kSmallFont) + 1);
+			_optionSaveFileTitleNumber = (mousePoint.y - rect.top) / (_vm->_font->getHeight(kKnownFontSmall) + 1);
 
 			if (_optionSaveFileTitleNumber >= _vm->getDisplayInfo().optionSaveFileVisible) {
 				_optionSaveFileTitleNumber = _vm->getDisplayInfo().optionSaveFileVisible - 1;

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- sfuncs.cpp	3 Nov 2005 18:20:12 -0000	1.179
+++ sfuncs.cpp	19 Nov 2005 12:41:23 -0000	1.180
@@ -1308,7 +1308,7 @@
 	textEntry.color = kITEColorBrightWhite;
 	textEntry.effectColor = kITEColorBlack;
 	textEntry.point.x = _vm->getDisplayWidth() / 2;
-	textEntry.point.y = (_vm->_scene->getHeight() - _vm->_font->getHeight(kMediumFont)) / 2;
+	textEntry.point.y = (_vm->_scene->getHeight() - _vm->_font->getHeight(kKnownFontMedium)) / 2;
 	textEntry.font = kKnownFontMedium;
 	textEntry.flags = (FontEffectFlags)(kFontOutline | kFontCentered);
 	textEntry.text = thread->_strings->getString(stringId);