libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed every font name to be platform independent, added font loader routine

Browse Source 
svn-id: r25935
This commit is contained in:
Nicola Mettifogo 2007-03-02 22:18:37 +00:00
parent 0c39e0e3db
commit c122d83c0e
9 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/parallaction/callables.cpp
View File

@ -285,7 +285,7 @@ void _c_finito(void *parm) {
_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 @@ void _c_finito(void *parm) {
_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 @@ void _c_testResult(void *parm) {
_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]);

2
engines/parallaction/dialogue.cpp
View File

@ -231,7 +231,7 @@ void runDialogue(SpeakData *data) {
openTalk(_vm->_characterName, &_characterFace);
_vm->_graphics->setFont("comiccnv");
_vm->_graphics->setFont("comic");
Cnv v6E;
StaticCnv v5C, v48;

7
engines/parallaction/disk.cpp
View File

@ -109,4 +109,11 @@ void loadPointer(StaticCnv* cnv) {
_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

2
engines/parallaction/disk.h
View File

@ -76,7 +76,7 @@ void openLocation(const char *name, char* script);
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

2
engines/parallaction/graphics.cpp
View File

@ -800,7 +800,7 @@ void Graphics::setFont(const char* name) {
if (_font._array != NULL)
freeCnv(&_font);
loadExternalCnv(name, &_font);
loadFont(name, &_font);
}

2
engines/parallaction/intro.cpp
View File

@ -132,7 +132,7 @@ void _c_startIntro(void *parm) {
void _c_endIntro(void *parm) {
_vm->_graphics->setFont("slidecnv");
_vm->_graphics->setFont("slide");
_vm->_graphics->_proportionalFont = false;
uint16 _di;

6
engines/parallaction/location.cpp
View File

@ -46,7 +46,7 @@ void Parallaction::parseLocation(const char *filename) {
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 @@ void Parallaction::changeLocation(char *location) {
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 @@ void Parallaction::doLocationEnterTransition() {
jobEraseAnimations(NULL, NULL);
jobDisplayAnimations(NULL, NULL);
_vm->_graphics->setFont("comiccnv");
_vm->_graphics->setFont("comic");
_vm->_graphics->swapBuffers();
_vm->_graphics->copyScreen(Graphics::kBitFront, Graphics::kBitBack);

4
engines/parallaction/menu.cpp
View File

@ -104,7 +104,7 @@ void Menu::start() {
_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 @@ void Menu::selectCharacter() {
_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);

4
engines/parallaction/zone.cpp
View File

@ -374,7 +374,7 @@ void displayCharacterComment(ExamineData *data) {
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 @@ void displayItemComment(ExamineData *data) {
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);