PINK: added more constants

engines/pink/constants.h

@@ -138,13 +138,41 @@ enum {
     kBroMinorVersion = 0,
 };
 
+enum {
+    kTimersUpdateTime = 0x64,
+    kCursorsUpdateTime = 0xC8
+};
+
+enum {
+    kSampleRate = 22050
+};
+
 static const char *kPinkGame = "PinkGame";
 
 static const char *kPokus = "pokus";
 static const char *kPeril = "peril";
 
 static const char *kUndefined = "UNDEFINED";
 
+
+static const char *kCloseAction = "Close";
+static const char *kIdleAction = "Idle";
+static const char *kOpenAction = "Open";
+static const char *kPlayAction = "Play";
+static const char *kShowAction = "Show";
+static const char *kHideAction = "Hide";
+
+static const char *kInventoryWindowActor = "InventoryWindow";
+static const char *kInventoryItemActor = "InventoryItem";
+static const char *kInventoryRightArrowActor = "InventoryWindow";
+static const char *kInventoryLeftArrowActor = "InventoryWindow";
+
+static const char *kCursorNameExitUp = "ExitUp";
+static const char *kCursorNameExitLeft = "ExitLeft";
+static const char *kCursorNameExitRight = "ExitRight";
+static const char *kCursorNameExitForward = "ExitForward";
+
+
 } // End of namespace Pink
 
 #endif

engines/pink/cursor_mgr.cpp

@@ -53,7 +53,7 @@ void CursorMgr::update() {
         return;
 
     uint newTime = _game->getTotalPlayTime();
-    if (newTime - _time > 0xC8){
+    if (newTime - _time > kCursorsUpdateTime){
         _time = newTime;
         _isSecondFrame = !_isSecondFrame;
         _game->setCursor(_firstFrameIndex + _isSecondFrame);
@@ -62,15 +62,16 @@ void CursorMgr::update() {
 
 void CursorMgr::setCursor(Common::String &cursorName, Common::Point point) {
     uint index;
-    if (cursorName == "ExitLeft") {
+    if (cursorName == kCursorNameExitLeft) {
         index = kExitLeftCursor;
     }
-    else if (cursorName == "ExitRight"){
+    else if (cursorName == kCursorNameExitRight){
         index = kExitRightCursor;
     }
-    else if (cursorName == "ExitForward" || cursorName == "ExitUp")
+    else if (cursorName == kCursorNameExitForward || cursorName == kCursorNameExitUp)
         index = kExitForwardCursor;
     else assert(0);
+
     setCursor(index, point);
 }
 

engines/pink/cursor_mgr.h

@@ -50,6 +50,7 @@ class CursorMgr : public Object {
 
     uint _time;
     uint _firstFrameIndex;
+
     bool _isPlayingAnimation;
     bool _isSecondFrame;
 };

engines/pink/objects/actors/actor.cpp

@@ -62,7 +62,7 @@ GamePage *Actor::getPage() const {
 
 void Actor::init(bool unk) {
     if (!_action) {
-        _action = findAction({"Idle"});
+        _action = findAction(kIdleAction);
     }
 
     if (!_action) {
@@ -75,7 +75,7 @@ void Actor::init(bool unk) {
 }
 
 void Actor::hide() {
-    setAction({"Hide"});
+    setAction(kHideAction);
 }
 
 void Actor::endAction() {

engines/pink/objects/handlers/handler_mgr.cpp

@@ -1,6 +1,24 @@
-//
-// Created by andrei on 3/21/18.
-//
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
 
 #include "handler_mgr.h"
 #include "handler.h"

engines/pink/objects/inventory.cpp

@@ -113,13 +113,13 @@ bool InventoryMgr::start(bool playOpening) {
             return false;
     }
 
-    _window = _lead->getPage()->findActor("InventoryWindow");
-    _itemActor = _lead->getPage()->findActor("InventoryItem");
-    _rightArrow = _lead->getPage()->findActor("InventoryRightArrow");
-    _leftArrow = _lead->getPage()->findActor("InventoryLeftArrow");
+    _window = _lead->getPage()->findActor(kInventoryWindowActor);
+    _itemActor = _lead->getPage()->findActor(kInventoryItemActor);
+    _rightArrow = _lead->getPage()->findActor(kInventoryRightArrowActor);
+    _leftArrow = _lead->getPage()->findActor(kInventoryLeftArrowActor);
 
     if (playOpening){
-        _window->setAction("Open");
+        _window->setAction(kOpenAction);
         _state = kOpening;
     }
 
@@ -130,16 +130,17 @@ void InventoryMgr::update() {
     if (_state == kOpening && !_window->isPlaying()){
         _state = kReady;
         _itemActor->setAction(_item->getName());
-        _window->setAction("Show");
-        _leftArrow->setAction("Show");
-        _rightArrow->setAction("Show");
+        _window->setAction(kShowAction);
+        _leftArrow->setAction(kShowAction);
+        _rightArrow->setAction(kShowAction);
     }
     else if (_state == kClosing && !_window->isPlaying()){
-        _window->setAction("Idle");
+        _window->setAction(kIdleAction);
 
         _lead->onInventoryClosed(_isClickedOnItem);
 
         _state = kIdle;
+
         _window = nullptr;
         _itemActor = nullptr;
         _isClickedOnItem = false;
@@ -164,10 +165,10 @@ void InventoryMgr::onClick(Common::Point point) {
 void InventoryMgr::close() {
     _state = kClosing;
 
-    _window->setAction("Close");
-    _itemActor->setAction("Idle");
-    _leftArrow->setAction("Idle");
-    _rightArrow->setAction("Idle");
+    _window->setAction(kCloseAction);
+    _itemActor->setAction(kIdleAction);
+    _leftArrow->setAction(kIdleAction);
+    _rightArrow->setAction(kIdleAction);
 }
 
 void InventoryMgr::showNextItem(bool direction) {

engines/pink/objects/sequences/sequencer.cpp

@@ -104,7 +104,7 @@ void Sequencer::skipToLastSubSequence() {
 
 void Sequencer::updateTimers() {
     uint time = _page->getGame()->getTotalPlayTime();
-    if (time - _time <= 0x64) {
+    if (time - _time <= kTimersUpdateTime) {
         return;
     }
 

engines/pink/sound.cpp

@@ -25,6 +25,7 @@
 #include <audio/decoders/adpcm.h>
 #include <common/substream.h>
 #include "sound.h"
+#include "constants.h"
 
 namespace Pink {
 
@@ -76,7 +77,7 @@ void Sound::setBalance(int8 balance) {
 }
 
 uint32 Sound::getCurrentSample() {
-    return _mixer->getSoundElapsedTime(_handle) * 22050 / 1000;
+    return _mixer->getSoundElapsedTime(_handle) * kSampleRate / 1000;
 }
 
 } // End of namespace Pink