[Scummvm-git-logs] scummvm master -> 0b43a381d52caf3742e083605cc42edfb736183c
dreammaster
noreply at scummvm.org
Sun Oct 6 20:57:20 UTC 2024
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:
0b43a381d5 M4: RIDDLE: Implemented refresh_left_arrow & refresh_right_arrow
Commit: 0b43a381d52caf3742e083605cc42edfb736183c
https://github.com/scummvm/scummvm/commit/0b43a381d52caf3742e083605cc42edfb736183c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-06T13:57:15-07:00
Commit Message:
M4: RIDDLE: Implemented refresh_left_arrow & refresh_right_arrow
Changed paths:
engines/m4/riddle/gui/gui_cheapo.cpp
engines/m4/riddle/gui/interface.cpp
diff --git a/engines/m4/riddle/gui/gui_cheapo.cpp b/engines/m4/riddle/gui/gui_cheapo.cpp
index e46d64649b7..aa1de7ea49c 100644
--- a/engines/m4/riddle/gui/gui_cheapo.cpp
+++ b/engines/m4/riddle/gui/gui_cheapo.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "m4/riddle/gui/gui_cheapo.h"
#include "m4/riddle/gui/gui_cheapo.h"
#include "m4/riddle/vars.h"
#include "m4/core/errors.h"
@@ -178,9 +179,6 @@ void Inventory::highlight_part(int16 index) {
}
void Inventory::draw(GrBuff *myBuffer) {
- if (!INTERFACE_VISIBLE)
- return;
-
if (!_must_redraw1 && !_must_redraw2 && !_must_redraw_all)
return;
diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index 56d776a9e67..5f9b0ede3d2 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -237,33 +237,41 @@ bool Interface::eventHandler(void *bufferPtr, int32 eventType, int32 event, int3
}
void Interface::refresh_right_arrow() {
-#ifdef TODO
if (_inventory->need_right() || _inventory->need_left()) {
- _btnScrollRight->set_sprite_unknown(63);
- _btnScrollRight->set_sprite_relaxed(64);
- _btnScrollRight->set_sprite_picked(66);
- _btnScrollRight->set_sprite_over(65);
_btnScrollRight->unhide();
+
+ if (_inventory->need_right()) {
+ _btnScrollRight->set_sprite_relaxed(133);
+ _btnScrollRight->set_sprite_picked(135);
+ _btnScrollRight->set_sprite_over(134);
+ } else {
+ _btnScrollRight->set_sprite_relaxed(136);
+ _btnScrollRight->set_sprite_picked(136);
+ _btnScrollRight->set_sprite_over(136);
+ }
} else {
_btnScrollRight->hide();
_btnScrollLeft->hide();
}
-#endif
}
void Interface::refresh_left_arrow() {
-#ifdef TODO
if (_inventory->need_right() || _inventory->need_left()) {
- _btnScrollLeft->set_sprite_unknown(59);
- _btnScrollLeft->set_sprite_relaxed(60);
- _btnScrollLeft->set_sprite_picked(62);
- _btnScrollLeft->set_sprite_over(61);
_btnScrollLeft->unhide();
+
+ if (_inventory->need_left()) {
+ _btnScrollLeft->set_sprite_relaxed(129);
+ _btnScrollLeft->set_sprite_picked(131);
+ _btnScrollLeft->set_sprite_over(130);
+ } else {
+ _btnScrollLeft->set_sprite_relaxed(132);
+ _btnScrollLeft->set_sprite_picked(132);
+ _btnScrollLeft->set_sprite_over(132);
+ }
} else {
_btnScrollRight->hide();
_btnScrollLeft->hide();
}
-#endif
}
void Interface::trackIcons() {
More information about the Scummvm-git-logs
mailing list