[Scummvm-cvs-logs] SF.net SVN: scummvm: [25969] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun Mar 4 12:03:28 CET 2007
Revision: 25969
http://scummvm.svn.sourceforge.net/scummvm/?rev=25969&view=rev
Author: peres001
Date: 2007-03-04 03:03:27 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
separated slide from scenery loading to take care of filename aliases
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/menu.cpp
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-04 10:57:30 UTC (rev 25968)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-04 11:03:27 UTC (rev 25969)
@@ -414,4 +414,16 @@
return;
}
+void loadSlide(const char *filename) {
+ char path[PATH_LEN];
+ sprintf(path, "%s.slide", filename);
+ loadBackground(path);
+}
+
+void loadScenery(const char *filename) {
+ char path[PATH_LEN];
+ sprintf(path, "%s.dyn", filename);
+ loadBackground(path);
+}
+
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2007-03-04 10:57:30 UTC (rev 25968)
+++ scummvm/trunk/engines/parallaction/disk.h 2007-03-04 11:03:27 UTC (rev 25969)
@@ -81,7 +81,8 @@
void loadFont(const char* name, Cnv* cnv);
void loadStatic(const char* name, StaticCnv* cnv);
void loadFrames(const char* name, Cnv* cnv);
-void loadBackground(const char *filename);
+void loadSlide(const char *filename);
+void loadScenery(const char *filename);
void loadMaskAndPath(const char *name);
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-03-04 10:57:30 UTC (rev 25968)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-03-04 11:03:27 UTC (rev 25969)
@@ -278,10 +278,7 @@
_vm->_graphics->palUnk0(palette);
}
- char path[PATH_LEN];
- sprintf(path, "%s.dyn", background);
-
- loadBackground(path);
+ loadScenery(background);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
if (scumm_stricmp(background, mask)) {
@@ -365,10 +362,7 @@
*tmp = '\0';
if (!scumm_strnicmp(tmp+1, "slide", 5)) {
- char filename[200];
- sprintf(filename, "%s.slide", _newLocation);
-
- loadBackground(filename);
+ loadSlide(_newLocation);
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp 2007-03-04 10:57:30 UTC (rev 25968)
+++ scummvm/trunk/engines/parallaction/menu.cpp 2007-03-04 11:03:27 UTC (rev 25969)
@@ -106,19 +106,19 @@
_vm->_graphics->setFont("slide");
- loadBackground("intro.slide");
+ loadSlide("intro");
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
g_system->delayMillis(2000);
- loadBackground("minintro.slide");
+ loadSlide("minintro");
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
g_system->delayMillis(2000);
- loadBackground("lingua.slide");
+ loadSlide("lingua");
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
@@ -146,7 +146,7 @@
break;
}
- loadBackground("restore.slide");
+ loadSlide("restore");
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
@@ -167,7 +167,7 @@
const char **v14 = introMsg3;
- loadBackground("test.dyn");
+ loadScenery("test");
_vm->_graphics->palUnk0(_palette);
_vm->_graphics->swapBuffers();
@@ -317,7 +317,7 @@
_vm->_graphics->setFont("slide");
_vm->_archive.open("disk1");
- loadBackground("password.slide");
+ loadSlide("password");
_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
_vm->_graphics->palUnk0(_palette);
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