[Scummvm-git-logs] scummvm master -> 480532c2096451cd594cdce944e2345e738039c5
dreammaster
dreammaster at scummvm.org
Mon Jan 16 13:09:09 CET 2017
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c0047274f0 TITANIC: Further cleanup of chicken dispensor
4a14a56a5c DEVTOOLS: Add more strings to create_titanic
480532c209 TITANIC: Change chicken tooltips to use DAT strings
Commit: c0047274f09b74d03cc796ce35944586fbc66399
https://github.com/scummvm/scummvm/commit/c0047274f09b74d03cc796ce35944586fbc66399
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T07:03:49-05:00
Commit Message:
TITANIC: Further cleanup of chicken dispensor
Changed paths:
engines/titanic/game/chicken_dispensor.cpp
engines/titanic/game/chicken_dispensor.h
diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index c7e6cde..a1070c3 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -37,14 +37,14 @@ BEGIN_MESSAGE_MAP(CChickenDispensor, CBackground)
END_MESSAGE_MAP()
CChickenDispensor::CChickenDispensor() : CBackground(),
- _disabled(false), _dispenseMode(DISPENSE_NONE), _dragging(false) {
+ _disabled(false), _dispenseMode(DISPENSE_NONE), _dispensed(false) {
}
void CChickenDispensor::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_disabled, indent);
file->writeNumberLine(_dispenseMode, indent);
- file->writeNumberLine(_dragging, indent);
+ file->writeNumberLine(_dispensed, indent);
CBackground::save(file, indent);
}
@@ -52,14 +52,14 @@ void CChickenDispensor::load(SimpleFile *file) {
file->readNumber();
_disabled = file->readNumber();
_dispenseMode = (DispenseMode)file->readNumber();
- _dragging = file->readNumber();
+ _dispensed = file->readNumber();
CBackground::load(file);
}
bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
msg->execute("SGTRestLeverAnimation");
- DispenseMode dispenseMode = _dragging ? DISPENSE_NONE : _dispenseMode;
+ DispenseMode dispenseMode = _dispensed ? DISPENSE_NONE : _dispenseMode;
CPetControl *pet = getPetControl();
CGameObject *obj;
@@ -78,7 +78,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
}
if (dispenseMode != DISPENSE_NONE)
- _dragging = true;
+ _dispensed = true;
switch (dispenseMode) {
case DISPENSE_NONE:
@@ -92,7 +92,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
playSound("z#400.wav");
} else {
playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
- _dragging = true;
+ _dispensed = true;
}
_dispenseMode = DISPENSE_NONE;
break;
@@ -104,7 +104,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
playSound("z#400.wav");
} else {
playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
- _dragging = true;
+ _dispensed = true;
}
break;
@@ -124,12 +124,14 @@ bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) {
playSound("b#50.wav", 50);
CActMsg actMsg("Dispense Chicken");
actMsg.execute("Chicken");
- } else if (_dragging) {
+ } else if (_dispensed) {
+ // Chicken dispensed whilst dispensor is "disabled", which basically
+ // spits the chicken out at high speed directly into the SuccUBus
_cursorId = CURSOR_ARROW;
loadFrame(0);
setVisible(false);
if (_dispenseMode == DISPENSE_COLD)
- _dragging = false;
+ _dispensed = false;
} else {
// Doors closing as the view is being left
loadFrame(0);
@@ -159,7 +161,7 @@ bool CChickenDispensor::LeaveViewMsg(CLeaveViewMsg *msg) {
bool CChickenDispensor::EnterViewMsg(CEnterViewMsg *msg) {
playSound("b#51.wav");
- _dragging = 0;
+ _dispensed = false;
_cursorId = CURSOR_ARROW;
return true;
}
@@ -169,7 +171,7 @@ bool CChickenDispensor::MouseDragStartMsg(CMouseDragStartMsg *msg) {
setVisible(false);
loadFrame(0);
_cursorId = CURSOR_ARROW;
- _dragging = 1;
+ _dispensed = true;
CVisibleMsg visibleMsg;
visibleMsg.execute("Chicken");
@@ -186,7 +188,7 @@ bool CChickenDispensor::TurnOff(CTurnOff *msg) {
if (getMovieFrame() != 16)
setVisible(false);
playMovie(16, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
- _dragging = false;
+ _dispensed = false;
return true;
}
diff --git a/engines/titanic/game/chicken_dispensor.h b/engines/titanic/game/chicken_dispensor.h
index da0a1db..e605da0 100644
--- a/engines/titanic/game/chicken_dispensor.h
+++ b/engines/titanic/game/chicken_dispensor.h
@@ -41,7 +41,7 @@ class CChickenDispensor : public CBackground {
public:
bool _disabled;
DispenseMode _dispenseMode;
- bool _dragging;
+ bool _dispensed;
public:
CLASSDEF;
CChickenDispensor();
Commit: 4a14a56a5ca8ed75981d6cbacf547d0b806e2d8e
https://github.com/scummvm/scummvm/commit/4a14a56a5ca8ed75981d6cbacf547d0b806e2d8e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T07:03:50-05:00
Commit Message:
DEVTOOLS: Add more strings to create_titanic
Changed paths:
devtools/create_titanic/create_titanic_dat.cpp
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index e542c7e..1457ee6 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -416,7 +416,7 @@ static const BedheadEntry OFF_RESTING_D_WRONG[1] = {
{ "Any", "Any", "Any", "ClosedWrong", 59, 70 }
};
-static const char *const STRINGS_EN[138] = {
+static const char *const STRINGS_EN[140] = {
"",
"You are standing outside the Pellerator.",
"I'm sorry, you cannot enter this pellerator at present as a bot is in the way.",
@@ -559,10 +559,12 @@ static const char *const STRINGS_EN[138] = {
"Your assigned room: ",
"A previously assigned room: ",
"Saved Chevron: ",
- "Current location: "
+ "Current location: ",
+ "A hot",
+ "A cold"
};
-static const char *const STRINGS_DE[183] = {
+static const char *const STRINGS_DE[185] = {
// TODO: Still many strings to translate to German
"",
"Sie befinden sich vor dem Pellerator.",
@@ -723,6 +725,8 @@ static const char *const STRINGS_DE[183] = {
"A previously assigned room: ",
"Saved Chevron: ",
"Current location: ",
+ "A hot",
+ "A cold",
"Sommer",
"Herbst",
@@ -1253,8 +1257,8 @@ void writeData() {
writeStringArray("TEXT/ITEM_NAMES", ITEM_NAMES, 46);
writeStringArray("TEXT/ITEM_IDS", ITEM_IDS, 40);
writeStringArray("TEXT/ROOM_NAMES", ROOM_NAMES, 34);
- writeStringArray("TEXT/STRINGS", STRINGS_EN, 138);
- writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 183);
+ writeStringArray("TEXT/STRINGS", STRINGS_EN, 140);
+ writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 185);
const int TEXT_PHRASES[3] = { 0x61D3C8, 0x618340, 0x61B1E0 };
const int TEXT_REPLACEMENTS1[3] = { 0x61D9B0, 0x61C788, 0x61B7C8 };
const int TEXT_REPLACEMENTS2[3] = { 0x61DD20, 0x61CAF8, 0x61BB38 };
Commit: 480532c2096451cd594cdce944e2345e738039c5
https://github.com/scummvm/scummvm/commit/480532c2096451cd594cdce944e2345e738039c5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T07:03:50-05:00
Commit Message:
TITANIC: Change chicken tooltips to use DAT strings
Changed paths:
engines/titanic/pet_control/pet_inventory_glyphs.cpp
engines/titanic/support/strings.h
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
index a994df0..e49e0c5 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -154,8 +154,8 @@ void CPetInventoryGlyph::getTooltip(CTextControl *text) {
CPETObjectStateMsg stateMsg(0);
stateMsg.execute(_item);
- text->setText(CString::format("%s %s",
- stateMsg._value ? "A hot" : "A cold",
+ CString temperature = g_vm->_strings[stateMsg._value ? A_HOT : A_COLD];
+ text->setText(CString::format("%s %s", temperature.c_str(),
g_vm->_itemDescriptions[itemIndex].c_str()
));
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index 1f231c4..d19386b 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -167,6 +167,8 @@ enum StringId {
PREVIOUSLY_ASSIGNED_ROOM,
SAVED_CHEVRON,
CURRENT_LOCATION,
+ A_HOT,
+ A_COLD,
// German version only
DE_SUMMER,
More information about the Scummvm-git-logs
mailing list