[Scummvm-git-logs] scummvm master -> 48c09fcc18e31d4fb9678dc29b641a4760355cdc
whiterandrek
whiterandrek at gmail.com
Thu May 28 23:21:21 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
48c09fcc18 PETKA: removed unused functions
Commit: 48c09fcc18e31d4fb9678dc29b641a4760355cdc
https://github.com/scummvm/scummvm/commit/48c09fcc18e31d4fb9678dc29b641a4760355cdc
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T02:21:08+03:00
Commit Message:
PETKA: removed unused functions
Changed paths:
engines/petka/q_system.cpp
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index f1844e0317..4d37790a01 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -52,48 +52,6 @@ QSystem::~QSystem() {
}
-static Common::String readString(Common::ReadStream &readStream) {
- uint32 stringSize = readStream.readUint32LE();
- byte *data = (byte *)malloc(stringSize + 1);
- readStream.read(data, stringSize);
- data[stringSize] = '\0';
- Common::String str((char *)data);
- return str;
-}
-
-static void readObject(QMessageObject &obj, Common::SeekableReadStream &stream,
- const Common::INIFile &namesIni, const Common::INIFile &castIni) {
- obj._id = stream.readUint16LE();
- obj._name = readString(stream);
- obj._reactions.resize(stream.readUint32LE());
-
- for (uint i = 0; i < obj._reactions.size(); ++i) {
- QReaction *reaction = &obj._reactions[i];
- reaction->opcode = stream.readUint16LE();
- reaction->status = stream.readByte();
- reaction->senderId = stream.readUint16LE();
- reaction->messages.resize(stream.readUint32LE());
- for (uint j = 0; j < reaction->messages.size(); ++j) {
- QMessage *msg = &reaction->messages[j];
- msg->objId = stream.readUint16LE();
- msg->opcode = stream.readUint16LE();
- msg->arg1 = stream.readUint16LE();
- msg->arg2 = stream.readUint16LE();
- msg->arg3 = stream.readUint16LE();
- }
- }
-
- namesIni.getKey(obj._name, "all", obj._nameOnScreen);
-
- Common::String rgbString;
- if (castIni.getKey(obj._name, "all", rgbString)) {
- int r, g, b;
- sscanf(rgbString.c_str(), "%d %d %d", &r, &g, &b);
- obj._dialogColor = g_vm->_system->getScreenFormat().RGBToColor((byte)r, (byte)g, (byte)b);
- }
-}
-
-
bool QSystem::init() {
Common::ScopedPtr<Common::SeekableReadStream> stream(g_vm->openFile("script.dat", true));
if (!stream)
More information about the Scummvm-git-logs
mailing list