From 8582c1ad5770b6385381f524a4610934d115cd88 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 25 Sep 2010 19:48:26 +0000
Subject: SWORD25: Enforse code naming conventions in PackageManager and
Sword25Engine
svn-id: r53380
---
engines/sword25/gfx/animationresource.cpp | 10 +++++-----
engines/sword25/gfx/fontresource.cpp | 4 ++--
engines/sword25/gfx/graphicengine.cpp | 2 +-
engines/sword25/gfx/image/renderedimage.cpp | 2 +-
engines/sword25/gfx/image/swimage.cpp | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'engines/sword25/gfx')
diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp
index 6a1e3d4f2c..4a6bfc34db 100644
--- a/engines/sword25/gfx/animationresource.cpp
+++ b/engines/sword25/gfx/animationresource.cpp
@@ -73,15 +73,15 @@ AnimationResource::AnimationResource(const Common::String &filename) :
BS_ASSERT(_pPackage);
// Switch to the folder the specified Xml fiile is in
- Common::String oldDirectory = _pPackage->GetCurrentDirectory();
+ Common::String oldDirectory = _pPackage->getCurrentDirectory();
if (getFileName().contains('/')) {
Common::String dir = Common::String(getFileName().c_str(), strrchr(getFileName().c_str(), '/'));
- _pPackage->ChangeDirectory(dir);
+ _pPackage->changeDirectory(dir);
}
// Load the contents of the file
uint fileSize;
- char *xmlData = _pPackage->GetXmlFile(getFileName(), &fileSize);
+ char *xmlData = _pPackage->getXmlFile(getFileName(), &fileSize);
if (!xmlData) {
BS_LOG_ERRORLN("Could not read \"%s\".", getFileName().c_str());
return;
@@ -96,7 +96,7 @@ AnimationResource::AnimationResource(const Common::String &filename) :
free(xmlData);
// Switch back to the previous folder
- _pPackage->ChangeDirectory(oldDirectory);
+ _pPackage->changeDirectory(oldDirectory);
// Give an error message if there weren't any frames specified
if (_frames.empty()) {
@@ -172,7 +172,7 @@ bool AnimationResource::parserCallback_frame(ParserNode *node) {
BS_LOG_ERRORLN(" tag without file attribute occurred in \"%s\".", getFileName().c_str());
return false;
}
- frame.FileName = _pPackage->GetAbsolutePath(fileString);
+ frame.FileName = _pPackage->getAbsolutePath(fileString);
if (frame.FileName.empty()) {
BS_LOG_ERRORLN("Could not create absolute path for file specified in tag in \"%s\": \"%s\".",
getFileName().c_str(), fileString);
diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp
index d48f849743..9f23133a71 100644
--- a/engines/sword25/gfx/fontresource.cpp
+++ b/engines/sword25/gfx/fontresource.cpp
@@ -70,7 +70,7 @@ FontResource::FontResource(Kernel *pKernel, const Common::String &FileName) :
// Load the contents of the file
uint fileSize;
- char *xmlData = pPackage->GetXmlFile(getFileName(), &fileSize);
+ char *xmlData = pPackage->getXmlFile(getFileName(), &fileSize);
if (!xmlData) {
BS_LOG_ERRORLN("Could not read \"%s\".", getFileName().c_str());
return;
@@ -109,7 +109,7 @@ bool FontResource::parserCallback_font(ParserNode *node) {
BS_ASSERT(pPackage);
// Get the full path and filename for the bitmap resource
- _BitmapFileName = pPackage->GetAbsolutePath(bitmapFilename);
+ _BitmapFileName = pPackage->getAbsolutePath(bitmapFilename);
if (_BitmapFileName == "") {
BS_LOG_ERRORLN("Image file \"%s\" was specified in tag of \"%s\" but could not be found.",
_BitmapFileName.c_str(), getFileName().c_str());
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp
index fe19dc7df5..fa1c0300da 100644
--- a/engines/sword25/gfx/graphicengine.cpp
+++ b/engines/sword25/gfx/graphicengine.cpp
@@ -308,7 +308,7 @@ Resource *GraphicEngine::LoadResource(const Common::String &FileName) {
// Datei laden
byte *pFileData;
uint FileSize;
- if (!(pFileData = static_cast(pPackage->GetFile(FileName, &FileSize)))) {
+ if (!(pFileData = static_cast(pPackage->getFile(FileName, &FileSize)))) {
BS_LOG_ERRORLN("File \"%s\" could not be loaded.", FileName.c_str());
return 0;
}
diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp
index e6afffe3b0..96b6139a59 100644
--- a/engines/sword25/gfx/image/renderedimage.cpp
+++ b/engines/sword25/gfx/image/renderedimage.cpp
@@ -64,7 +64,7 @@ RenderedImage::RenderedImage(const Common::String &filename, bool &result) :
// Datei laden
byte *pFileData;
uint fileSize;
- if (!(pFileData = (byte *)pPackage->GetFile(filename, &fileSize))) {
+ if (!(pFileData = (byte *)pPackage->getFile(filename, &fileSize))) {
BS_LOG_ERRORLN("File \"%s\" could not be loaded.", filename.c_str());
return;
}
diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp
index b135be7209..ac4463ea16 100644
--- a/engines/sword25/gfx/image/swimage.cpp
+++ b/engines/sword25/gfx/image/swimage.cpp
@@ -61,7 +61,7 @@ SWImage::SWImage(const Common::String &filename, bool &result) :
// Datei laden
byte *pFileData;
uint fileSize;
- if (!(pFileData = (byte *)pPackage->GetFile(filename, &fileSize))) {
+ if (!(pFileData = (byte *)pPackage->getFile(filename, &fileSize))) {
BS_LOG_ERRORLN("File \"%s\" could not be loaded.", filename.c_str());
return;
}
--
cgit v1.2.3