[Scummvm-git-logs] scummvm master -> 24cc7b3d5a05b0b503b9c33457efc9ccff3c31fd
whiterandrek
whiterandrek at gmail.com
Sat May 30 10:27:15 UTC 2020
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8eaf9ebcdc PETKA: fixed crash
a34569c959 PETKA: use show method for objects in startup and map interfaces
0b9dc3a371 PETKA: simplified onClick in QObjectStar
7a19e0e442 PETKA: use ARRAYSIZE macro
3a95f037af PETKA: use Engine method to quit game
c80e99433b PETKA: use xOffset when passing mouse event to current interface
24cc7b3d5a PETKA: use non-const point in interface methods
Commit: 8eaf9ebcdceff2a3b487a6f1509f24b260f4d7fb
https://github.com/scummvm/scummvm/commit/8eaf9ebcdceff2a3b487a6f1509f24b260f4d7fb
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:01:34+03:00
Commit Message:
PETKA: fixed crash
Changed paths:
engines/petka/interfaces/startup.cpp
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index 6792412ca5..3290a13044 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -59,7 +59,7 @@ void InterfaceStartup::start(int id) {
Sound *s = g_vm->soundMgr()->addSound(g_vm->resMgr()->findSoundName(bg->_musicId), Audio::Mixer::kMusicSoundType);
s->play(true);
- const BGInfo *info = g_vm->getQSystem()->_mainInterface->findBGInfo(id);
+ const BGInfo *info = g_vm->getQSystem()->_mainInterface->findBGInfo(bg->_id);
for (uint i = 0; i < info->attachedObjIds.size(); ++i) {
QMessageObject *obj = g_vm->getQSystem()->findObject(info->attachedObjIds[i]);
obj->_z = 1;
Commit: a34569c959e6fff7bfaa241b02f781dbd84ebdf2
https://github.com/scummvm/scummvm/commit/a34569c959e6fff7bfaa241b02f781dbd84ebdf2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:02:48+03:00
Commit Message:
PETKA: use show method for objects in startup and map interfaces
Changed paths:
engines/petka/interfaces/map.cpp
engines/petka/interfaces/startup.cpp
engines/petka/objects/object.cpp
diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index cfa08983f2..3519398104 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -122,11 +122,8 @@ void InterfaceMap::onMouseMove(const Common::Point p) {
show = true;
_objUnderCursor = obj;
}
- if (obj->_isShown != show) {
- obj->_isShown = show;
- flc->setFrame(1);
- g_vm->videoSystem()->addDirtyRect(Common::Point(obj->_x, obj->_y), *flc);
- }
+ if (obj->_isShown != show)
+ obj->show(obj->_isShown == 0);
}
}
}
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index 3290a13044..58ae41c6e4 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -107,11 +107,8 @@ void InterfaceStartup::onMouseMove(const Common::Point p) {
show = true;
_objUnderCursor = obj;
}
- if (obj->_isShown != show) {
- obj->_isShown = show;
- flc->setFrame(1);
- g_vm->videoSystem()->addDirtyRect(flc->getBounds());
- }
+ if (obj->_isShown != show)
+ obj->show(obj->_isShown == 0);
}
}
}
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index a2b14ff892..244d0aebbf 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -496,11 +496,9 @@ void QObject::updateZ() {
}
void QObject::show(bool v) {
- if (g_vm->getQSystem()->_mainInterface->findObject(_resourceId)) {
- FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
- if (flc) {
- g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), *flc);
- }
+ FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
+ if (flc) {
+ g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), *flc);
}
QMessageObject::show(v);
}
Commit: 0b9dc3a371a122c26efa688425907230546bea64
https://github.com/scummvm/scummvm/commit/0b9dc3a371a122c26efa688425907230546bea64
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:21:13+03:00
Commit Message:
PETKA: simplified onClick in QObjectStar
Changed paths:
engines/petka/objects/object_star.cpp
diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index 60eac2f501..e768086f13 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -67,13 +67,9 @@ void QObjectStar::onMouseMove(int x, int y) {
void QObjectStar::onClick(int x, int y) {
uint button = findButtonIndex(x - _x, y - _y);
- if (button >= sizeof(_buttonRects) / sizeof(Common::Rect)) {
- show(0);
- return;
- }
if (button == kCaseButtonIndex) {
g_vm->getQSystem()->getCase()->show(1);
- } else {
+ } else if (button < ARRAYSIZE(_buttonRects)) {
QObjectCursor *cursor = g_vm->getQSystem()->getCursor();
cursor->setAction(button - 1);
}
Commit: 7a19e0e442a272db3ce86c07609360a32486c1e3
https://github.com/scummvm/scummvm/commit/7a19e0e442a272db3ce86c07609360a32486c1e3
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:27:14+03:00
Commit Message:
PETKA: use ARRAYSIZE macro
Changed paths:
engines/petka/interfaces/save_load.cpp
engines/petka/objects/object_star.cpp
diff --git a/engines/petka/interfaces/save_load.cpp b/engines/petka/interfaces/save_load.cpp
index 9866c24945..af4abd8b1e 100644
--- a/engines/petka/interfaces/save_load.cpp
+++ b/engines/petka/interfaces/save_load.cpp
@@ -115,7 +115,7 @@ void InterfaceSaveLoad::onMouseMove(const Common::Point p) {
}
int InterfaceSaveLoad::findSaveLoadRectIndex(const Common::Point p) {
- for (uint i = 0; i < sizeof(_saveRects) / sizeof(Common::Rect); ++i) {
+ for (uint i = 0; i < ARRAYSIZE(_saveRects); ++i) {
if (_saveRects[i].contains(p)) {
return i;
}
diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index e768086f13..438f25f17b 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -78,7 +78,7 @@ void QObjectStar::onClick(int x, int y) {
uint QObjectStar::findButtonIndex(int16 x, int16 y) const {
uint i = 0;
- for (i = 0; i < sizeof(_buttonRects) / sizeof(Common::Rect); ++i) {
+ for (i = 0; i < ARRAYSIZE(_buttonRects); ++i) {
if (_buttonRects[i].contains(x, y))
return i;
}
Commit: 3a95f037af5eec0b7994ffc2b936dd936201110c
https://github.com/scummvm/scummvm/commit/3a95f037af5eec0b7994ffc2b936dd936201110c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:31:15+03:00
Commit Message:
PETKA: use Engine method to quit game
Changed paths:
engines/petka/interfaces/startup.cpp
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index 58ae41c6e4..632619e132 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -79,7 +79,7 @@ void InterfaceStartup::onLeftButtonDown(const Common::Point p) {
return;
switch (_objUnderCursor->_resourceId) {
case kExit:
- g_system->quit();
+ Engine::quitGame();
break;
case kCredits:
g_vm->playVideo(g_vm->openFile(kCreditsVideoName, false));
@@ -90,6 +90,8 @@ void InterfaceStartup::onLeftButtonDown(const Common::Point p) {
case kNewGame:
g_vm->loadPart(1);
break;
+ default:
+ break;
}
}
Commit: c80e99433b299a278051f9b4358663252bf7954f
https://github.com/scummvm/scummvm/commit/c80e99433b299a278051f9b4358663252bf7954f
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:41:02+03:00
Commit Message:
PETKA: use xOffset when passing mouse event to current interface
Changed paths:
engines/petka/q_system.cpp
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 041440b3f0..73a5671fec 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -305,15 +305,24 @@ QObjectStar *QSystem::getStar() const {
void QSystem::onEvent(const Common::Event &event) {
switch (event.type) {
- case Common::EVENT_MOUSEMOVE:
- _currInterface->onMouseMove(event.mouse);
+ case Common::EVENT_MOUSEMOVE: {
+ Common::Point p = event.mouse;
+ p.x += _xOffset;
+ _currInterface->onMouseMove(p);
break;
- case Common::EVENT_LBUTTONDOWN:
- _currInterface->onLeftButtonDown(event.mouse);
+ }
+ case Common::EVENT_LBUTTONDOWN: {
+ Common::Point p = event.mouse;
+ p.x += _xOffset;
+ _currInterface->onLeftButtonDown(p);
break;
- case Common::EVENT_RBUTTONDOWN:
- _currInterface->onRightButtonDown(event.mouse);
+ }
+ case Common::EVENT_RBUTTONDOWN: {
+ Common::Point p = event.mouse;
+ p.x += _xOffset;
+ _currInterface->onRightButtonDown(p);
break;
+ }
case Common::EVENT_KEYDOWN:
switch (event.kbd.keycode) {
case Common::KEYCODE_1:
Commit: 24cc7b3d5a05b0b503b9c33457efc9ccff3c31fd
https://github.com/scummvm/scummvm/commit/24cc7b3d5a05b0b503b9c33457efc9ccff3c31fd
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-30T11:53:19+03:00
Commit Message:
PETKA: use non-const point in interface methods
Changed paths:
engines/petka/interfaces/interface.h
engines/petka/interfaces/main.cpp
engines/petka/interfaces/main.h
engines/petka/interfaces/map.cpp
engines/petka/interfaces/map.h
engines/petka/interfaces/panel.cpp
engines/petka/interfaces/panel.h
engines/petka/interfaces/save_load.cpp
engines/petka/interfaces/save_load.h
engines/petka/interfaces/sequence.cpp
engines/petka/interfaces/sequence.h
engines/petka/interfaces/startup.cpp
engines/petka/interfaces/startup.h
diff --git a/engines/petka/interfaces/interface.h b/engines/petka/interfaces/interface.h
index 10b06c70f6..cb82951bdd 100644
--- a/engines/petka/interfaces/interface.h
+++ b/engines/petka/interfaces/interface.h
@@ -40,9 +40,9 @@ public:
virtual void start(int id) {};
virtual void stop();
- virtual void onLeftButtonDown(const Common::Point p) {};
- virtual void onRightButtonDown(const Common::Point p) {};
- virtual void onMouseMove(const Common::Point p) {};
+ virtual void onLeftButtonDown(Common::Point p) {};
+ virtual void onRightButtonDown(Common::Point p) {};
+ virtual void onMouseMove(Common::Point p) {};
void setText(const Common::U32String &text, uint16 textColor, uint16 outlineColor);
void setTextPhrase(const Common::U32String &text, uint16 textColor, uint16 outlineColor);
diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index d194903469..1f9274833a 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -151,7 +151,7 @@ void InterfaceMain::unloadRoom(bool fromSave) {
_objs.push_back(sys->getChapay());
}
-void InterfaceMain::onLeftButtonDown(const Common::Point p) {
+void InterfaceMain::onLeftButtonDown(Common::Point p) {
QObjectCursor *cursor = g_vm->getQSystem()->getCursor();
if (!cursor->_isShown) {
_dialog.next(-1);
@@ -192,7 +192,7 @@ void InterfaceMain::onLeftButtonDown(const Common::Point p) {
}
}
-void InterfaceMain::onRightButtonDown(const Common::Point p) {
+void InterfaceMain::onRightButtonDown(Common::Point p) {
QObjectStar *star = g_vm->getQSystem()->getStar();
QObjectCase *objCase = g_vm->getQSystem()->getCase();
QObjectCursor *cursor = g_vm->getQSystem()->getCursor();
@@ -206,7 +206,7 @@ void InterfaceMain::onRightButtonDown(const Common::Point p) {
}
}
-void InterfaceMain::onMouseMove(const Common::Point p) {
+void InterfaceMain::onMouseMove(Common::Point p) {
QMessageObject *prevObj = (QMessageObject *)_objUnderCursor;
_objUnderCursor = nullptr;
diff --git a/engines/petka/interfaces/main.h b/engines/petka/interfaces/main.h
index 43c37e7dcf..0d3f3fc61b 100644
--- a/engines/petka/interfaces/main.h
+++ b/engines/petka/interfaces/main.h
@@ -49,9 +49,9 @@ public:
void unloadRoom(bool fromSave);
- void onLeftButtonDown(const Common::Point p) override;
- void onRightButtonDown(const Common::Point p) override;
- void onMouseMove(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
+ void onRightButtonDown(Common::Point p) override;
+ void onMouseMove(Common::Point p) override;
void setTextChoice(const Common::Array<Common::U32String> &choices, uint16 color, uint16 selectedColor);
void setTextDescription(const Common::U32String &text, int frame);
diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index 3519398104..55f15626b0 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -97,7 +97,7 @@ void InterfaceMap::stop() {
Interface::stop();
}
-void InterfaceMap::onLeftButtonDown(const Common::Point p) {
+void InterfaceMap::onLeftButtonDown(Common::Point p) {
for (int i = _objs.size() - 1; i >= 0; --i) {
if (_objs[i]->isInPoint(p.x, p.y)) {
_objs[i]->onClick(p.x, p.y);
@@ -106,7 +106,7 @@ void InterfaceMap::onLeftButtonDown(const Common::Point p) {
}
}
-void InterfaceMap::onMouseMove(const Common::Point p) {
+void InterfaceMap::onMouseMove(Common::Point p) {
QVisibleObject *oldObj = _objUnderCursor;
_objUnderCursor = nullptr;
@@ -146,7 +146,7 @@ void InterfaceMap::onMouseMove(const Common::Point p) {
}
}
-void InterfaceMap::onRightButtonDown(const Common::Point p) {
+void InterfaceMap::onRightButtonDown(Common::Point p) {
stop();
}
diff --git a/engines/petka/interfaces/map.h b/engines/petka/interfaces/map.h
index 5df2d334ec..2511b9b32a 100644
--- a/engines/petka/interfaces/map.h
+++ b/engines/petka/interfaces/map.h
@@ -32,9 +32,9 @@ public:
void start(int id) override;
void stop() override;
- void onLeftButtonDown(const Common::Point p) override;
- void onRightButtonDown(const Common::Point p) override;
- void onMouseMove(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
+ void onRightButtonDown(Common::Point p) override;
+ void onMouseMove(Common::Point p) override;
private:
int _savedXOffset;
diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index b110bb002a..ff452c4d2f 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -147,7 +147,7 @@ void InterfacePanel::stop() {
Interface::stop();
}
-void InterfacePanel::onLeftButtonDown(const Common::Point p) {
+void InterfacePanel::onLeftButtonDown(Common::Point p) {
int i = 0;
for (i = _objs.size() - 1; i > 0; --i) {
if (_objs[i]->isInPoint(p.x, p.y)) {
@@ -211,7 +211,7 @@ void InterfacePanel::onLeftButtonDown(const Common::Point p) {
}
}
-void InterfacePanel::onMouseMove(const Common::Point p) {
+void InterfacePanel::onMouseMove(Common::Point p) {
bool found = false;
for (uint i = _objs.size() - 1; i > 0; --i) {
QMessageObject *obj = (QMessageObject *)_objs[i];
@@ -315,7 +315,7 @@ void InterfacePanel::applySettings() {
g_vm->syncSoundSettings();
}
-void InterfacePanel::onRightButtonDown(const Common::Point p) {
+void InterfacePanel::onRightButtonDown(Common::Point p) {
stop();
}
diff --git a/engines/petka/interfaces/panel.h b/engines/petka/interfaces/panel.h
index 01952706a0..5730ac47e2 100644
--- a/engines/petka/interfaces/panel.h
+++ b/engines/petka/interfaces/panel.h
@@ -34,9 +34,9 @@ public:
void start(int id) override;
void stop() override;
- void onLeftButtonDown(const Common::Point p) override;
- void onRightButtonDown(const Common::Point p) override;
- void onMouseMove(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
+ void onRightButtonDown(Common::Point p) override;
+ void onMouseMove(Common::Point p) override;
private:
void readSettings();
diff --git a/engines/petka/interfaces/save_load.cpp b/engines/petka/interfaces/save_load.cpp
index af4abd8b1e..442edb3ecb 100644
--- a/engines/petka/interfaces/save_load.cpp
+++ b/engines/petka/interfaces/save_load.cpp
@@ -89,7 +89,7 @@ void InterfaceSaveLoad::stop() {
Interface::stop();
}
-void InterfaceSaveLoad::onLeftButtonDown(const Common::Point p) {
+void InterfaceSaveLoad::onLeftButtonDown(Common::Point p) {
int index = findSaveLoadRectIndex(p);
if (index == -1) {
if (_prevPageRect.contains(p) && _page > 0) {
@@ -104,17 +104,17 @@ void InterfaceSaveLoad::onLeftButtonDown(const Common::Point p) {
}
}
-void InterfaceSaveLoad::onRightButtonDown(const Common::Point p) {
+void InterfaceSaveLoad::onRightButtonDown(Common::Point p) {
stop();
}
-void InterfaceSaveLoad::onMouseMove(const Common::Point p) {
+void InterfaceSaveLoad::onMouseMove(Common::Point p) {
QObjectCursor *cursor = g_vm->getQSystem()->getCursor();
cursor->_animate = findSaveLoadRectIndex(p) != -1 || _nextPageRect.contains(p) || _prevPageRect.contains(p);
cursor->setCursorPos(p.x, p.y, 0);
}
-int InterfaceSaveLoad::findSaveLoadRectIndex(const Common::Point p) {
+int InterfaceSaveLoad::findSaveLoadRectIndex(Common::Point p) {
for (uint i = 0; i < ARRAYSIZE(_saveRects); ++i) {
if (_saveRects[i].contains(p)) {
return i;
diff --git a/engines/petka/interfaces/save_load.h b/engines/petka/interfaces/save_load.h
index 7bcf092c1a..dce63e158f 100644
--- a/engines/petka/interfaces/save_load.h
+++ b/engines/petka/interfaces/save_load.h
@@ -41,12 +41,12 @@ public:
bool loadMode() { return _loadMode; }
- void onLeftButtonDown(const Common::Point p) override;
- void onRightButtonDown(const Common::Point p) override;
- void onMouseMove(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
+ void onRightButtonDown(Common::Point p) override;
+ void onMouseMove(Common::Point p) override;
private:
- int findSaveLoadRectIndex(const Common::Point p);
+ int findSaveLoadRectIndex(Common::Point p);
private:
bool _loadMode;
diff --git a/engines/petka/interfaces/sequence.cpp b/engines/petka/interfaces/sequence.cpp
index b58fcee14a..f9e61883aa 100644
--- a/engines/petka/interfaces/sequence.cpp
+++ b/engines/petka/interfaces/sequence.cpp
@@ -78,7 +78,7 @@ void InterfaceSequence::stop() {
Interface::stop();
}
-void InterfaceSequence::onLeftButtonDown(const Common::Point p) {
+void InterfaceSequence::onLeftButtonDown(Common::Point p) {
QVisibleObject *obj = findObject(-2);
if (obj) {
obj->onClick(p.x, p.y);
diff --git a/engines/petka/interfaces/sequence.h b/engines/petka/interfaces/sequence.h
index 695b1b1d7c..b962eb5d2d 100644
--- a/engines/petka/interfaces/sequence.h
+++ b/engines/petka/interfaces/sequence.h
@@ -36,7 +36,7 @@ public:
void start(int id) override;
void stop() override;
- void onLeftButtonDown(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
private:
void removeObjects();
diff --git a/engines/petka/interfaces/startup.cpp b/engines/petka/interfaces/startup.cpp
index 632619e132..9fd555ab9c 100644
--- a/engines/petka/interfaces/startup.cpp
+++ b/engines/petka/interfaces/startup.cpp
@@ -74,7 +74,7 @@ void InterfaceStartup::start(int id) {
initCursor(kStartupCursorId, 1, 0);
}
-void InterfaceStartup::onLeftButtonDown(const Common::Point p) {
+void InterfaceStartup::onLeftButtonDown(Common::Point p) {
if (!_objUnderCursor)
return;
switch (_objUnderCursor->_resourceId) {
@@ -95,7 +95,7 @@ void InterfaceStartup::onLeftButtonDown(const Common::Point p) {
}
}
-void InterfaceStartup::onMouseMove(const Common::Point p) {
+void InterfaceStartup::onMouseMove(Common::Point p) {
_objUnderCursor = nullptr;
bool found = false;
for (int i = _objs.size() - 1; i > 0; --i) {
diff --git a/engines/petka/interfaces/startup.h b/engines/petka/interfaces/startup.h
index c70e00e28a..c86f2ae6fe 100644
--- a/engines/petka/interfaces/startup.h
+++ b/engines/petka/interfaces/startup.h
@@ -32,8 +32,8 @@ public:
void start(int id) override;
void stop() override;
- void onLeftButtonDown(const Common::Point p) override;
- void onMouseMove(const Common::Point p) override;
+ void onLeftButtonDown(Common::Point p) override;
+ void onMouseMove(Common::Point p) override;
};
} // End of namespace Petka
More information about the Scummvm-git-logs
mailing list