diff options
author | Einar Johan Trøan Sømåen | 2012-07-18 18:31:56 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-18 18:31:56 +0200 |
commit | 136ae9857f3401f5dea13c63c3c0702b08040e2a (patch) | |
tree | ab51032b31e1f27e9e96e30babb234e1d9bd8758 /engines/wintermute/UI/UITiledImage.cpp | |
parent | 95c0efb93720fa2415693cd138b14144cd7b0bb6 (diff) | |
download | scummvm-rg350-136ae9857f3401f5dea13c63c3c0702b08040e2a.tar.gz scummvm-rg350-136ae9857f3401f5dea13c63c3c0702b08040e2a.tar.bz2 scummvm-rg350-136ae9857f3401f5dea13c63c3c0702b08040e2a.zip |
WINTERMUTE: Rename ERRORCODE (formerly HRESULT) to bool
Diffstat (limited to 'engines/wintermute/UI/UITiledImage.cpp')
-rw-r--r-- | engines/wintermute/UI/UITiledImage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp index fc8f43ee2f..12e392a18f 100644 --- a/engines/wintermute/UI/UITiledImage.cpp +++ b/engines/wintermute/UI/UITiledImage.cpp @@ -64,7 +64,7 @@ CUITiledImage::~CUITiledImage() { //////////////////////////////////////////////////////////////////////////
-ERRORCODE CUITiledImage::display(int x, int y, int width, int height) {
+bool CUITiledImage::display(int x, int y, int width, int height) {
if (!_image) return STATUS_FAILED;
int tileWidth = _middleMiddle.right - _middleMiddle.left;
@@ -119,14 +119,14 @@ ERRORCODE CUITiledImage::display(int x, int y, int width, int height) { //////////////////////////////////////////////////////////////////////////
-ERRORCODE CUITiledImage::loadFile(const char *filename) {
+bool CUITiledImage::loadFile(const char *filename) {
byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "CUITiledImage::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
- ERRORCODE ret;
+ bool ret;
_filename = new char [strlen(filename) + 1];
strcpy(_filename, filename);
@@ -158,7 +158,7 @@ TOKEN_DEF(HORIZONTAL_TILES) TOKEN_DEF(EDITOR_PROPERTY)
TOKEN_DEF_END
//////////////////////////////////////////////////////////////////////////
-ERRORCODE CUITiledImage::loadBuffer(byte *buffer, bool complete) {
+bool CUITiledImage::loadBuffer(byte *buffer, bool complete) {
TOKEN_TABLE_START(commands)
TOKEN_TABLE(TILED_IMAGE)
TOKEN_TABLE(TEMPLATE)
@@ -307,7 +307,7 @@ ERRORCODE CUITiledImage::loadBuffer(byte *buffer, bool complete) { }
//////////////////////////////////////////////////////////////////////////
-ERRORCODE CUITiledImage::saveAsText(CBDynBuffer *buffer, int indent) {
+bool CUITiledImage::saveAsText(CBDynBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "TILED_IMAGE\n");
buffer->putTextIndent(indent, "{\n");
@@ -350,7 +350,7 @@ void CUITiledImage::correctSize(int *width, int *height) { //////////////////////////////////////////////////////////////////////////
-ERRORCODE CUITiledImage::persist(CBPersistMgr *persistMgr) {
+bool CUITiledImage::persist(CBPersistMgr *persistMgr) {
CBObject::persist(persistMgr);
persistMgr->transfer(TMEMBER(_downLeft));
|