[Scummvm-git-logs] scummvm master -> 3563dc90b7ea80062214ea15c9a844558928ba33
whiterandrek
whiterandrek at gmail.com
Fri May 22 12:43:27 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3dfa26ab64 PETKA: removed unused fields in QMessageObject
3563dc90b7 PETKA: renamed field in QMessageObject
Commit: 3dfa26ab64f6510cea1a3edbff8d839a0bb5d595
https://github.com/scummvm/scummvm/commit/3dfa26ab64f6510cea1a3edbff8d839a0bb5d595
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-22T15:41:18+03:00
Commit Message:
PETKA: removed unused fields in QMessageObject
Changed paths:
engines/petka/interfaces/map.cpp
engines/petka/interfaces/panel.cpp
engines/petka/interfaces/startup.cpp
engines/petka/objects/object.cpp
engines/petka/objects/object.h
diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index 4bda5f02c1..4bcde7b1ff 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -60,9 +60,7 @@ void InterfaceMap::start(int id) {
obj->_z = 1;
obj->_x = 0;
obj->_y = 0;
- obj->_field24 = 1;
obj->_field20 = 1;
- obj->_field28 = 1;
obj->_animate = obj->_isShown;
_objs.push_back(obj);
}
@@ -136,7 +134,6 @@ void InterfaceMap::onMouseMove(const Common::Point p) {
flc->setFrame(1);
g_vm->videoSystem()->addDirtyRect(Common::Point(obj->_x, obj->_y), *flc);
obj->_field20 = frame;
- obj->_field24 = frame;
}
}
}
diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index 027a931ea0..693af363bf 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -110,9 +110,7 @@ void InterfacePanel::start(int id) {
obj->_z = 1;
obj->_x = _objectPoints[j].x;
obj->_y = _objectPoints[j].y;
- obj->_field24 = 1;
obj->_field20 = 1;
- obj->_field28 = 1;
obj->_animate = 0;
obj->_isShown = 1;
_objs.push_back(obj);
@@ -232,7 +230,6 @@ void InterfacePanel::onMouseMove(const Common::Point p) {
if (obj->_field20 == frame)
continue;
obj->_field20 = frame;
- obj->_field24 = frame;
int pointIndex;
switch (i) {
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index f6bb4d833a..848b8ba078 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -70,9 +70,7 @@ void InterfaceStartup::start(int id) {
obj->_z = 1;
obj->_x = 0;
obj->_y = 0;
- obj->_field24 = 1;
obj->_field20 = 1;
- obj->_field28 = 1;
obj->_animate = 0;
obj->_isShown = 0;
_objs.push_back(obj);
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index d70b17b17f..667e4e320f 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -402,14 +402,12 @@ void QMessageObject::show(bool v) {
QObject::QObject() {
_animate = true;
_updateZ = true;
- _field24 = true;
_field20 = true;
_sound = nullptr;
_x = 0;
_y = 0;
_walkX = -1;
_walkY = -1;
- _field28 = 0;
}
bool QObject::isInPoint(int x, int y) {
diff --git a/engines/petka/objects/object.h b/engines/petka/objects/object.h
index 43fd8c1cdf..5e7ab70b12 100644
--- a/engines/petka/objects/object.h
+++ b/engines/petka/objects/object.h
@@ -64,8 +64,6 @@ public:
int32 _walkY;
int32 _time;
int32 _field20;
- int32 _field24;
- int32 _field28;
int32 _isShown;
int32 _animate;
int _updateZ;
Commit: 3563dc90b7ea80062214ea15c9a844558928ba33
https://github.com/scummvm/scummvm/commit/3563dc90b7ea80062214ea15c9a844558928ba33
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-22T15:43:03+03:00
Commit Message:
PETKA: renamed field in QMessageObject
Changed paths:
engines/petka/interfaces/map.cpp
engines/petka/interfaces/panel.cpp
engines/petka/interfaces/startup.cpp
engines/petka/objects/object.cpp
engines/petka/objects/object.h
diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index 4bcde7b1ff..eac614793d 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -60,7 +60,7 @@ void InterfaceMap::start(int id) {
obj->_z = 1;
obj->_x = 0;
obj->_y = 0;
- obj->_field20 = 1;
+ obj->_frame = 1;
obj->_animate = obj->_isShown;
_objs.push_back(obj);
}
@@ -129,11 +129,11 @@ void InterfaceMap::onMouseMove(const Common::Point p) {
frame = 2;
_objUnderCursor = obj;
}
- if (obj->_field20 != frame) {
+ if (obj->_frame != frame) {
obj->_isShown = frame == 2;
flc->setFrame(1);
g_vm->videoSystem()->addDirtyRect(Common::Point(obj->_x, obj->_y), *flc);
- obj->_field20 = frame;
+ obj->_frame = frame;
}
}
}
diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index 693af363bf..c086636bf6 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -110,7 +110,7 @@ void InterfacePanel::start(int id) {
obj->_z = 1;
obj->_x = _objectPoints[j].x;
obj->_y = _objectPoints[j].y;
- obj->_field20 = 1;
+ obj->_frame = 1;
obj->_animate = 0;
obj->_isShown = 1;
_objs.push_back(obj);
@@ -220,16 +220,16 @@ void InterfacePanel::onMouseMove(const Common::Point p) {
bool found = false;
for (uint i = _objs.size() - 1; i > 0; --i) {
QMessageObject *obj = (QMessageObject *)_objs[i];
- int frame = 1;
+ byte frame = 1;
if (!found && obj->isInPoint(p.x, p.y)) {
found = true;
if ((i >= kNewGameButtonIndex && i <= kSaveButtonIndex) || (i >= kDecSpeechButtonIndex && i <= kIncSpeedButtonIndex)) {
frame = 2;
}
}
- if (obj->_field20 == frame)
+ if (obj->_frame == frame)
continue;
- obj->_field20 = frame;
+ obj->_frame = frame;
int pointIndex;
switch (i) {
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index 848b8ba078..7648dfd5b7 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -70,7 +70,7 @@ void InterfaceStartup::start(int id) {
obj->_z = 1;
obj->_x = 0;
obj->_y = 0;
- obj->_field20 = 1;
+ obj->_frame = 1;
obj->_animate = 0;
obj->_isShown = 0;
_objs.push_back(obj);
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 667e4e320f..5ed1be4743 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -402,7 +402,7 @@ void QMessageObject::show(bool v) {
QObject::QObject() {
_animate = true;
_updateZ = true;
- _field20 = true;
+ _frame = 1;
_sound = nullptr;
_x = 0;
_y = 0;
diff --git a/engines/petka/objects/object.h b/engines/petka/objects/object.h
index 5e7ab70b12..cde3240871 100644
--- a/engines/petka/objects/object.h
+++ b/engines/petka/objects/object.h
@@ -63,7 +63,7 @@ public:
int32 _walkX;
int32 _walkY;
int32 _time;
- int32 _field20;
+ byte _frame;
int32 _isShown;
int32 _animate;
int _updateZ;
More information about the Scummvm-git-logs
mailing list