[Scummvm-git-logs] scummvm master -> f08fbcc5a3c48b1669fda0238797275c4d029e23

[whiterandrek]

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:
5684e9dd9d PINK: changed some field types in classes
f08fbcc5a3 PINK: changed engine status


Commit: 5684e9dd9db85b3f5ddfd0f1bd9794d85f6ea116
    https://github.com/scummvm/scummvm/commit/5684e9dd9db85b3f5ddfd0f1bd9794d85f6ea116
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-05T19:48:46+03:00

Commit Message:
PINK: changed some field types in classes

Changed paths:
    engines/pink/cursor_mgr.cpp
    engines/pink/cursor_mgr.h
    engines/pink/objects/actions/action_play_with_sfx.h
    engines/pink/objects/actions/action_sound.h
    engines/pink/objects/actors/pda_button_actor.h
    engines/pink/pda_mgr.h


diff --git a/engines/pink/cursor_mgr.cpp b/engines/pink/cursor_mgr.cpp
index 7e48e534b4..1a34fe0f58 100644
--- a/engines/pink/cursor_mgr.cpp
+++ b/engines/pink/cursor_mgr.cpp
@@ -32,7 +32,7 @@ CursorMgr::CursorMgr(PinkEngine *game, Page *page)
 	_time(0), _isPlayingAnimation(false),
 	_isSecondFrame(false), _firstFrameIndex(0)  {}
 
-void CursorMgr::setCursor(uint index, Common::Point point, const Common::String &itemName) {
+void CursorMgr::setCursor(byte index, Common::Point point, const Common::String &itemName) {
 	switch (index) {
 	case kClickableFirstFrameCursor:
 	case kPDAClickableFirstFrameCursor:
@@ -65,7 +65,7 @@ void CursorMgr::update() {
 }
 
 void CursorMgr::setCursor(const Common::String &cursorName, Common::Point point) {
-	uint index;
+	byte index;
 	if (cursorName == kCursorNameExitLeft)
 		index = kExitLeftCursor;
 	else if (cursorName == kCursorNameExitRight)
@@ -87,7 +87,7 @@ void CursorMgr::hideItem() {
 		_actor->setAction(kHideAction);
 }
 
-void CursorMgr::startAnimation(uint index) {
+void CursorMgr::startAnimation(byte index) {
 	if (_isPlayingAnimation)
 		return;
 
diff --git a/engines/pink/cursor_mgr.h b/engines/pink/cursor_mgr.h
index 99a0fd508b..08fbecf313 100644
--- a/engines/pink/cursor_mgr.h
+++ b/engines/pink/cursor_mgr.h
@@ -38,13 +38,13 @@ public:
 	CursorMgr(PinkEngine *game, Page *page);
 
 	void update();
-	void setCursor(uint index, Common::Point point, const Common::String &itemName);
+	void setCursor(byte index, Common::Point point, const Common::String &itemName);
 	void setCursor(const Common::String &cursorName, Common::Point point);
 
 	void setPage(Page *page) { _page = page; }
 
 private:
-	void startAnimation(uint index);
+	void startAnimation(byte index);
 
 	void showItem(const Common::String &itemName, Common::Point point);
 	void hideItem();
@@ -54,7 +54,7 @@ private:
 	PinkEngine *_game;
 	CursorActor *_actor;
 	uint _time;
-	uint _firstFrameIndex;
+	byte _firstFrameIndex;
 	bool _isPlayingAnimation;
 	bool _isSecondFrame;
 };
diff --git a/engines/pink/objects/actions/action_play_with_sfx.h b/engines/pink/objects/actions/action_play_with_sfx.h
index 4371aaaadc..434d2a0b6a 100644
--- a/engines/pink/objects/actions/action_play_with_sfx.h
+++ b/engines/pink/objects/actions/action_play_with_sfx.h
@@ -69,7 +69,7 @@ private:
 	ActionPlayWithSfx *_sprite;
 	Common::String _sfxName;
 	Sound _sound;
-	int32 _volume;
+	byte _volume;
 	int32 _frame;
 };
 
diff --git a/engines/pink/objects/actions/action_sound.h b/engines/pink/objects/actions/action_sound.h
index 4c90706f7f..e22fd5a0fe 100644
--- a/engines/pink/objects/actions/action_sound.h
+++ b/engines/pink/objects/actions/action_sound.h
@@ -45,7 +45,7 @@ public:
 private:
 	Common::String _fileName;
 	Sound _sound;
-	uint32 _volume;
+	byte _volume;
 	bool _isLoop;
 	bool _isBackground;
 };
diff --git a/engines/pink/objects/actors/pda_button_actor.h b/engines/pink/objects/actors/pda_button_actor.h
index cca1ee626e..8b842e82b3 100644
--- a/engines/pink/objects/actors/pda_button_actor.h
+++ b/engines/pink/objects/actors/pda_button_actor.h
@@ -65,8 +65,8 @@ private:
 
 	Command _command;
 
-	int _x;
-	int _y;
+	int16 _x;
+	int16 _y;
 
 	bool _hideOnStop;
 	bool _opaque;
diff --git a/engines/pink/pda_mgr.h b/engines/pink/pda_mgr.h
index 1ad9bfda59..c86c216568 100644
--- a/engines/pink/pda_mgr.h
+++ b/engines/pink/pda_mgr.h
@@ -81,10 +81,10 @@ private:
 	CursorMgr _cursorMgr;
 	Common::String _savedPage;
 	Common::Stack<Common::String> _previousPages;
-	uint16 _countryIndex;
-	uint16 _domainIndex;
-	uint16 _iteration;
-	uint16 _handFrame;
+	byte _countryIndex;
+	byte _domainIndex;
+	byte _iteration;
+	byte _handFrame;
 	enum LeftHandAction {
 		kLeft1,
 		kLeft2,


Commit: f08fbcc5a3c48b1669fda0238797275c4d029e23
    https://github.com/scummvm/scummvm/commit/f08fbcc5a3c48b1669fda0238797275c4d029e23
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-05T19:49:55+03:00

Commit Message:
PINK: changed engine status

Changed paths:
    engines/pink/pink.h


diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index 6294362e11..b4e7a86e33 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -54,8 +54,7 @@
  *      Fully Playable*
  *
  *  Known bugs:
- *      PDA is not usable(ActionText is not implemented)
- *      missing menu
+ *      PDA is partially usable(ActionText is not implemented)
  */
 
 struct ADGameDescription;