aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/base')
-rw-r--r--engines/wintermute/base/base.cpp2
-rw-r--r--engines/wintermute/base/base_game.cpp25
-rw-r--r--engines/wintermute/base/base_object.cpp2
-rw-r--r--engines/wintermute/base/file/base_file_entry.cpp8
-rw-r--r--engines/wintermute/base/file/base_package.cpp18
-rw-r--r--engines/wintermute/base/file/dcpackage.h20
-rw-r--r--engines/wintermute/base/gfx/osystem/base_render_osystem.cpp2
-rw-r--r--engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp3
8 files changed, 28 insertions, 52 deletions
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index 687d2d52e6..d5163fa7a6 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -175,8 +175,6 @@ bool BaseClass::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent, "{\n");
buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", _editorPropsIter->_key.c_str());
buffer->putTextIndent(indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->_value.c_str());
- //buffer->putTextIndent(indent + 2, "NAME=\"%s\"\n", (char *)_editorPropsIter->first.c_str()); // <- TODO, remove
- //buffer->putTextIndent(indent + 2, "VALUE=\"%s\"\n", _editorPropsIter->second.c_str()); // <- TODO, remove
buffer->putTextIndent(indent, "}\n\n");
_editorPropsIter++;
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 20ed358ec2..cb53d37c2d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -1459,13 +1459,6 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
// PlayVideo
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PlayVideo") == 0) {
- /* stack->correctParams(0);
- stack->pushBool(false);
-
- return STATUS_OK;
- // TODO: ADDVIDEO
- */
-
_gameRef->LOG(0, "Warning: Game.PlayVideo() is now deprecated. Use Game.PlayTheora() instead.");
stack->correctParams(6);
@@ -1508,12 +1501,6 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
// PlayTheora
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PlayTheora") == 0) {
- /* stack->correctParams(0);
- stack->pushBool(false);
-
- return STATUS_OK;*/
- // TODO: ADDVIDEO
-
stack->correctParams(7);
const char *filename = stack->pop()->getString();
ScValue *valType = stack->pop();
@@ -1830,14 +1817,8 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
stack->correctParams(1);
const char *filename = stack->pop()->getString();
- // TODO: Replace with fileExists
- Common::SeekableReadStream *file = _fileManager->openFile(filename, false);
- if (!file) {
- stack->pushBool(false);
- } else {
- _fileManager->closeFile(file);
- stack->pushBool(true);
- }
+ bool exists = _fileManager->hasFile(filename); // Had absPathWarning = false
+ stack->pushBool(exists);
return STATUS_OK;
}
@@ -3933,7 +3914,7 @@ bool BaseGame::handleKeypress(Common::Event *event, bool printable) {
} else { /*if (event->type != SDL_TEXTINPUT)*/
applyEvent("Keypress");
return true;
- } //else return true;
+ }
return false;
}
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 76047ef4b4..5fbfc31924 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -138,7 +138,7 @@ bool BaseObject::cleanup() {
//////////////////////////////////////////////////////////////////////////
-void BaseObject::setCaption(const char *caption, int caseVal) { // TODO: rename Case to something usefull
+void BaseObject::setCaption(const char *caption, int caseVal) {
if (caseVal == 0) {
caseVal = 1;
}
diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index 7bf635b858..da1bfa7ac8 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -65,18 +65,16 @@ Common::SeekableReadStream *BaseFileEntry::createReadStream() const {
return NULL;
}
- // TODO: Cleanup
+
bool compressed = (_compressedLength != 0);
- /* _size = fileEntry->_length; */
if (compressed) {
- // TODO: Really, most of this logic might be doable directly in the fileEntry?
- // But for now, this should get us rolling atleast.
file = Common::wrapCompressedReadStream(new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES));
+ // file = Common::wrapCompressedReadStream(new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES), _length); // TODO: Uncomment on merge
} else {
file = new Common::SeekableSubReadStream(file, _offset, _offset + _length, DisposeAfterUse::YES);
}
- if (file->size() == 0) {
+ if (file->size() == 0) { // TODO: Cleanup on next merge (CBPkgFile is just a placeholder for the commented out wrap above.
file = new CBPkgFile(file, _length);
}
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index b41ae3c1bd..80d3b4a515 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -82,6 +82,24 @@ static bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset)
}
+void TPackageHeader::readFromStream(Common::ReadStream *stream) {
+ _magic1 = stream->readUint32LE();
+ _magic2 = stream->readUint32LE();
+ _packageVersion = stream->readUint32LE();
+
+ _gameVersion = stream->readUint32LE();
+
+ _priority = stream->readByte();
+ _cd = stream->readByte();
+ _masterIndex = stream->readByte();
+ stream->readByte(); // To align the next byte...
+
+ _creationTime = stream->readUint32LE();
+
+ stream->read(_desc, 100);
+ _numDirs = stream->readUint32LE();
+}
+
PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool searchSignature) {
uint32 absoluteOffset = 0;
_priority = 0;
diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h
index 4a51683260..ccebc5909c 100644
--- a/engines/wintermute/base/file/dcpackage.h
+++ b/engines/wintermute/base/file/dcpackage.h
@@ -50,24 +50,8 @@ struct TPackageHeader {
uint32 _creationTime;
char _desc[100];
uint32 _numDirs;
- // TODO: Move this out of the header.
- void readFromStream(Common::ReadStream *stream) {
- _magic1 = stream->readUint32LE();
- _magic2 = stream->readUint32LE();
- _packageVersion = stream->readUint32LE();
-
- _gameVersion = stream->readUint32LE();
-
- _priority = stream->readByte();
- _cd = stream->readByte();
- _masterIndex = stream->readByte();
- stream->readByte(); // To align the next byte...
-
- _creationTime = stream->readUint32LE();
-
- stream->read(_desc, 100);
- _numDirs = stream->readUint32LE();
- }
+ // base_package.cpp:
+ void readFromStream(Common::ReadStream *stream);
};
/*
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 917a76be85..b41df5f1e2 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -94,8 +94,6 @@ BaseRenderer *makeOSystemRenderer(BaseGame *inGame) {
return new BaseRenderOSystem(inGame);
}
-// TODO: Redo everything here.
-
//////////////////////////////////////////////////////////////////////////
BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) {
_renderSurface = new Graphics::Surface();
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index aa9cc8474a..5e6347fdef 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -57,7 +57,6 @@ BaseSurfaceOSystem::BaseSurfaceOSystem(BaseGame *inGame) : BaseSurface(inGame) {
//////////////////////////////////////////////////////////////////////////
BaseSurfaceOSystem::~BaseSurfaceOSystem() {
- //TODO
if (_surface) {
_surface->free();
delete _surface;
@@ -385,8 +384,8 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, float zoomX, flo
Common::Rect position;
position.left = x + offsetX;
position.top = y + offsetY;
- // TODO: Scaling...
+ // Crop off-by-ones:
if (position.left == -1) {
position.left = 0; // TODO: Something is wrong
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:01:15 +0000