[Scummvm-cvs-logs] SF.net SVN: scummvm: [25935] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Mar 2 23:18:38 CET 2007
Revision: 25935
http://scummvm.svn.sourceforge.net/scummvm/?rev=25935&view=rev
Author: peres001
Date: 2007-03-02 14:18:37 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
changed every font name to be platform independent, added font loader routine
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/callables.cpp
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/graphics.cpp
scummvm/trunk/engines/parallaction/intro.cpp
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/menu.cpp
scummvm/trunk/engines/parallaction/zone.cpp
Modified: scummvm/trunk/engines/parallaction/callables.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/callables.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -285,7 +285,7 @@
_vm->_graphics->palUnk0(_palette);
if (gameCompleted) {
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_graphics->_proportionalFont = false;
uint16 _ax = _vm->_graphics->getStringWidth(v4C[_language]);
_vm->_graphics->displayString((SCREEN_WIDTH - _ax)/2, 70, v4C[_language]);
@@ -304,7 +304,7 @@
_engineFlags |= kEngineChangeLocation;
} else {
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_graphics->_proportionalFont = false;
uint16 _ax = _vm->_graphics->getStringWidth(v8C[_language]);
_vm->_graphics->displayString((SCREEN_WIDTH - _ax)/2, 70, v8C[_language]);
@@ -355,7 +355,7 @@
_vm->parseLocation("common");
_vm->_archive.close();
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_graphics->_proportionalFont = false;
uint16 _ax = _vm->_graphics->getStringWidth(_slideText[0]);
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -231,7 +231,7 @@
openTalk(_vm->_characterName, &_characterFace);
- _vm->_graphics->setFont("comiccnv");
+ _vm->_graphics->setFont("comic");
Cnv v6E;
StaticCnv v5C, v48;
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -109,4 +109,11 @@
_vm->_graphics->loadExternalStaticCnv("pointer", cnv);
}
+void loadFont(const char* name, Cnv* cnv) {
+ char path[PATH_LEN];
+
+ sprintf(path, "%scnv", name);
+ _vm->_graphics->loadExternalCnv(path, cnv);
+}
+
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/disk.h 2007-03-02 22:18:37 UTC (rev 25935)
@@ -76,7 +76,7 @@
void openTalk(const char *name, Cnv *cnv);
void loadPointer(StaticCnv* cnv);
void loadHead(const char* name, StaticCnv* cnv);
-
+void loadFont(const char* name, Cnv* cnv);
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/graphics.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -800,7 +800,7 @@
if (_font._array != NULL)
freeCnv(&_font);
- loadExternalCnv(name, &_font);
+ loadFont(name, &_font);
}
Modified: scummvm/trunk/engines/parallaction/intro.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/intro.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/intro.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -132,7 +132,7 @@
void _c_endIntro(void *parm) {
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_graphics->_proportionalFont = false;
uint16 _di;
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -46,7 +46,7 @@
uint16 _si = 1;
_vm->_graphics->_proportionalFont = false;
- _vm->_graphics->setFont("topazcnv");
+ _vm->_graphics->setFont("topaz");
location_src = (char*)memAlloc(0x4000);
openLocation(filename, location_src);
@@ -372,7 +372,7 @@
debugC(1, kDebugLocation, "changeLocation: new background set");
_vm->_graphics->_proportionalFont = false;
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
uint16 _ax = strlen(_slideText[0]);
_ax <<= 3; // text width
@@ -478,7 +478,7 @@
jobEraseAnimations(NULL, NULL);
jobDisplayAnimations(NULL, NULL);
- _vm->_graphics->setFont("comiccnv");
+ _vm->_graphics->setFont("comic");
_vm->_graphics->swapBuffers();
_vm->_graphics->copyScreen(Graphics::kBitFront, Graphics::kBitBack);
Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/menu.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -104,7 +104,7 @@
_vm->_archive.open("disk1");
_vm->_graphics->_proportionalFont = false;
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_graphics->Graphics::loadBackground("intro.slide", Graphics::kBitBack);
_vm->_graphics->palUnk0(_palette);
@@ -314,7 +314,7 @@
_vm->_midiPlayer->stop();
_vm->_graphics->_proportionalFont = false;
- _vm->_graphics->setFont("slidecnv");
+ _vm->_graphics->setFont("slide");
_vm->_archive.open("disk1");
_vm->_graphics->loadBackground("password.slide", Graphics::kBitBack);
Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp 2007-03-02 22:12:57 UTC (rev 25934)
+++ scummvm/trunk/engines/parallaction/zone.cpp 2007-03-02 22:18:37 UTC (rev 25935)
@@ -374,7 +374,7 @@
v3C._data1 = NULL; //_characterFace.field_8[0];
v3C._data2 = NULL;
- _vm->_graphics->setFont("comiccnv");
+ _vm->_graphics->setFont("comic");
_vm->_graphics->flatBlitCnv(&v3C, 190, 80, Graphics::kBitFront, v3C._data1);
int16 v26, v28;
@@ -421,7 +421,7 @@
int16 v6A = 0, v6C = 0;
- _vm->_graphics->setFont("comiccnv");
+ _vm->_graphics->setFont("comic");
_vm->_graphics->getStringExtent(data->_description, 130, &v6C, &v6A);
_vm->_graphics->drawBalloon(0, 90, v6C, v6A, 0);
_vm->_graphics->flatBlitCnv(&cnv, 100, 152, Graphics::kBitFront, cnv._data1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list