[Scummvm-git-logs] scummvm master -> cbdd5506e3fabfd29b0d88031f523117aa7b665a
dreammaster
dreammaster at scummvm.org
Sun Dec 25 00:29:03 CET 2016
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ea63ae3d74 DEVTOOLS: Add more strings to create_titanic
5bd028d9f3 TITANIC: More strings moved to titanic.dat
9e11746eba TITANIC: Fix dragging feather on nose holder
4c1da0fc22 TITANIC: Renamings on CDropTarget
cbdd5506e3 TITANIC: Renaming off frame fields in CSuccUBus
Commit: ea63ae3d74b9b44e6e9f2f96a9e116afd851f7cd
https://github.com/scummvm/scummvm/commit/ea63ae3d74b9b44e6e9f2f96a9e116afd851f7cd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-24T18:23:33-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 3822a9a..0454f87 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[133] = {
+static const char *const STRINGS_EN[137] = {
"",
"You are standing outside the Pellerator.",
"I'm sorry, you cannot enter this pellerator at present as a bot is in the way.",
@@ -554,10 +554,14 @@ static const char *const STRINGS_EN[133] = {
"1st class",
"2nd class",
"SGT class",
- "no class"
+ "no class",
+ "Your assigned room: ",
+ "A previously assigned room: ",
+ "Saved Chevron: ",
+ "Current location: "
};
-static const char *const STRINGS_DE[178] = {
+static const char *const STRINGS_DE[182] = {
// TODO: Still many strings to translate to German
"",
"Sie befinden sich vor dem Pellerator.",
@@ -712,6 +716,10 @@ static const char *const STRINGS_DE[178] = {
"2nd class",
"SGT class",
"no class",
+ "Your assigned room: ",
+ "A previously assigned room: ",
+ "Saved Chevron: ",
+ "Current location: ",
"Sommer",
"Herbst",
@@ -1242,8 +1250,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, 133);
- writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 178);
+ writeStringArray("TEXT/STRINGS", STRINGS_EN, 137);
+ writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 182);
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: 5bd028d9f3da31b17551b3851b40aca781db06b5
https://github.com/scummvm/scummvm/commit/5bd028d9f3da31b17551b3851b40aca781db06b5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-24T18:23:34-05:00
Commit Message:
TITANIC: More strings moved to titanic.dat
Changed paths:
engines/titanic/support/strings.h
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index e82f882..97928dc 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -162,6 +162,10 @@ enum StringId {
CLASS_2,
CLASS_3,
CLASS_NONE,
+ YOUR_ASSIGNED_ROOM,
+ PREVIOUSLY_ASSIGNED_ROOM,
+ SAVED_CHEVRON,
+ CURRENT_LOCATION,
// German version only
DE_SUMMER,
Commit: 9e11746eba734fd88ef8c8d1d17d16ef3dac3c99
https://github.com/scummvm/scummvm/commit/9e11746eba734fd88ef8c8d1d17d16ef3dac3c99
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-24T18:23:34-05:00
Commit Message:
TITANIC: Fix dragging feather on nose holder
Changed paths:
engines/titanic/game/nose_holder.cpp
engines/titanic/game/nose_holder.h
diff --git a/engines/titanic/game/nose_holder.cpp b/engines/titanic/game/nose_holder.cpp
index ac6c10d..6882e4f 100644
--- a/engines/titanic/game/nose_holder.cpp
+++ b/engines/titanic/game/nose_holder.cpp
@@ -33,19 +33,19 @@ BEGIN_MESSAGE_MAP(CNoseHolder, CDropTarget)
END_MESSAGE_MAP()
CNoseHolder::CNoseHolder() : CDropTarget(), _dragObject(nullptr),
- _field11C(0) {
+ _draggingFeather(false) {
}
void CNoseHolder::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_field11C, indent);
+ file->writeNumberLine(_draggingFeather, indent);
CDropTarget::save(file, indent);
}
void CNoseHolder::load(SimpleFile *file) {
file->readNumber();
- _field11C = file->readNumber();
+ _draggingFeather = file->readNumber();
CDropTarget::load(file);
}
@@ -78,13 +78,12 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) {
}
if (_dragObject) {
- if (!checkPoint(Point(_dragObject->_bounds.left,
- _dragObject->_bounds.top))) {
- _field11C = false;
- } else if (!_field11C) {
+ if (!checkPoint(Point(_dragObject->_bounds.left, _dragObject->_bounds.top), true)) {
+ _draggingFeather = false;
+ } else if (!_draggingFeather) {
CActMsg actMsg("Sneeze");
actMsg.execute(this);
- _field11C = true;
+ _draggingFeather = true;
}
}
@@ -92,7 +91,7 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) {
}
bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) {
- _field11C = false;
+ _draggingFeather = false;
_dragObject = nullptr;
if (_fieldF4) {
loadFrame(_dropFrame);
diff --git a/engines/titanic/game/nose_holder.h b/engines/titanic/game/nose_holder.h
index 7b3fbba..ef20b6f 100644
--- a/engines/titanic/game/nose_holder.h
+++ b/engines/titanic/game/nose_holder.h
@@ -36,7 +36,7 @@ class CNoseHolder : public CDropTarget {
bool EnterViewMsg(CEnterViewMsg *msg);
private:
CGameObject *_dragObject;
- int _field11C;
+ bool _draggingFeather;
public:
CLASSDEF;
CNoseHolder();
Commit: 4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab
https://github.com/scummvm/scummvm/commit/4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-24T18:23:34-05:00
Commit Message:
TITANIC: Renamings on CDropTarget
Changed paths:
engines/titanic/core/drop_target.cpp
engines/titanic/core/drop_target.h
engines/titanic/game/maitred/maitred_arm_holder.cpp
engines/titanic/game/nose_holder.cpp
engines/titanic/game/parrot/parrot_perch_holder.cpp
engines/titanic/game/restaurant_cylinder_holder.cpp
diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp
index f02efee..ffeab03 100644
--- a/engines/titanic/core/drop_target.cpp
+++ b/engines/titanic/core/drop_target.cpp
@@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CDropTarget, CGameObject)
END_MESSAGE_MAP()
CDropTarget::CDropTarget() : CGameObject(), _itemFrame(0),
- _itemMatchSize(0), _showItem(false), _fieldF4(0), _dropFrame(0),
+ _itemMatchSize(0), _showItem(false), _dropEnabled(false), _dropFrame(0),
_dragFrame(0), _dragCursorId(CURSOR_ARROW), _dropCursorId(CURSOR_HAND),
_clipFlags(20) {
}
@@ -48,7 +48,7 @@ void CDropTarget::save(SimpleFile *file, int indent) {
file->writeQuotedLine(_soundName, indent);
file->writeNumberLine(_showItem, indent);
file->writeQuotedLine(_itemName, indent);
- file->writeNumberLine(_fieldF4, indent);
+ file->writeNumberLine(_dropEnabled, indent);
file->writeNumberLine(_dropFrame, indent);
file->writeNumberLine(_dragFrame, indent);
file->writeQuotedLine(_clipName, indent);
@@ -68,7 +68,7 @@ void CDropTarget::load(SimpleFile *file) {
_soundName = file->readString();
_showItem = file->readNumber();
_itemName = file->readString();
- _fieldF4 = file->readNumber();
+ _dropEnabled = file->readNumber();
_dropFrame = file->readNumber();
_dragFrame = file->readNumber();
_clipName = file->readString();
@@ -119,7 +119,7 @@ bool CDropTarget::MouseDragStartMsg(CMouseDragStartMsg *msg) {
msg->_dragItem = dragItem;
CGameObject *obj = dynamic_cast<CGameObject *>(findByName(_itemName));
- if (_itemName.empty() || _fieldF4 || !obj)
+ if (_itemName.empty() || _dropEnabled || !obj)
return false;
CDropZoneLostObjectMsg lostMsg;
@@ -161,7 +161,7 @@ bool CDropTarget::EnterViewMsg(CEnterViewMsg *msg) {
bool CDropTarget::VisibleMsg(CVisibleMsg *msg) {
setVisible(msg->_visible);
- _fieldF4 = !msg->_visible;
+ _dropEnabled = !msg->_visible;
return true;
}
diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h
index e07b640..bdf8891 100644
--- a/engines/titanic/core/drop_target.h
+++ b/engines/titanic/core/drop_target.h
@@ -42,7 +42,7 @@ protected:
CString _soundName;
bool _showItem;
CString _itemName;
- int _fieldF4;
+ bool _dropEnabled;
int _dropFrame;
int _dragFrame;
CString _clipName;
diff --git a/engines/titanic/game/maitred/maitred_arm_holder.cpp b/engines/titanic/game/maitred/maitred_arm_holder.cpp
index 75d9564..51c1956 100644
--- a/engines/titanic/game/maitred/maitred_arm_holder.cpp
+++ b/engines/titanic/game/maitred/maitred_arm_holder.cpp
@@ -40,7 +40,7 @@ void CMaitreDArmHolder::load(SimpleFile *file) {
}
bool CMaitreDArmHolder::MaitreDArmHolder(CMaitreDArmHolder *msg) {
- _fieldF4 = 0;
+ _dropEnabled = false;
return true;
}
diff --git a/engines/titanic/game/nose_holder.cpp b/engines/titanic/game/nose_holder.cpp
index 6882e4f..d00c7b3 100644
--- a/engines/titanic/game/nose_holder.cpp
+++ b/engines/titanic/game/nose_holder.cpp
@@ -51,7 +51,7 @@ void CNoseHolder::load(SimpleFile *file) {
}
bool CNoseHolder::ActMsg(CActMsg *msg) {
- if (msg->_action == "Sneeze" && !_itemName.empty() && _fieldF4) {
+ if (msg->_action == "Sneeze" && !_itemName.empty() && _dropEnabled) {
CProximity prox;
prox._positioningMode = POSMODE_VECTOR;
playSound("z#35.wav", prox);
@@ -93,7 +93,7 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) {
bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) {
_draggingFeather = false;
_dragObject = nullptr;
- if (_fieldF4) {
+ if (_dropEnabled) {
loadFrame(_dropFrame);
setVisible(false);
}
@@ -102,7 +102,7 @@ bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) {
}
bool CNoseHolder::MovieEndMsg(CMovieEndMsg *msg) {
- if (_fieldF4) {
+ if (_dropEnabled) {
loadFrame(_dropFrame);
setVisible(false);
}
@@ -111,7 +111,7 @@ bool CNoseHolder::MovieEndMsg(CMovieEndMsg *msg) {
}
bool CNoseHolder::EnterViewMsg(CEnterViewMsg *msg) {
- if (_fieldF4)
+ if (_dropEnabled)
setVisible(false);
return CDropTarget::EnterViewMsg(msg);
diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp
index 205995c..ee1d308 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.cpp
+++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp
@@ -59,7 +59,7 @@ bool CParrotPerchHolder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
}
bool CParrotPerchHolder::StatusChangeMsg(CStatusChangeMsg *msg) {
- _fieldF4 = msg->_newStatus;
+ _dropEnabled = msg->_newStatus;
return true;
}
diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp
index adf029d..5fb8c97 100644
--- a/engines/titanic/game/restaurant_cylinder_holder.cpp
+++ b/engines/titanic/game/restaurant_cylinder_holder.cpp
@@ -71,7 +71,7 @@ bool CRestaurantCylinderHolder::EjectCylinderMsg(CEjectCylinderMsg *msg) {
if (_field118) {
playClip(hasCylinder ? "CloseHolder_Full" : "CloseHolder_Empty",
MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
- _fieldF4 = 1;
+ _dropEnabled = true;
} else {
playClip(hasCylinder ? "OpenHolder_Full" : "OpenHolder_Empty",
MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
@@ -109,7 +109,7 @@ bool CRestaurantCylinderHolder::MovieEndMsg(CMovieEndMsg *msg) {
readyMsg.execute(_target);
} else {
_field118 = true;
- _fieldF4 = false;
+ _dropEnabled = false;
_cursorId = findByName("Phonograph Cylinder") ? _dropCursorId : _dragCursorId;
}
Commit: cbdd5506e3fabfd29b0d88031f523117aa7b665a
https://github.com/scummvm/scummvm/commit/cbdd5506e3fabfd29b0d88031f523117aa7b665a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-24T18:23:34-05:00
Commit Message:
TITANIC: Renaming off frame fields in CSuccUBus
Changed paths:
engines/titanic/npcs/bilge_succubus.cpp
engines/titanic/npcs/parrot_succubus.cpp
engines/titanic/npcs/succubus.cpp
engines/titanic/npcs/succubus.h
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp
index d0a5dc1..b86d24b 100644
--- a/engines/titanic/npcs/bilge_succubus.cpp
+++ b/engines/titanic/npcs/bilge_succubus.cpp
@@ -182,13 +182,13 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CPetControl *pet = getPetControl();
if (msg->_endFrame == _endFrame12) {
- if (_startFrame10 >= 0)
+ if (_offStartFrame >= 0)
playSound("z#27.wav");
- } else if (msg->_endFrame == _endFrame10) {
+ } else if (msg->_endFrame == _offEndFrame) {
if (_startFrame11 >= 0)
playSound("z#30.wav");
} else {
- if (_endFrame9 == _endFrame10 && pet) {
+ if (_onEndFrame == _offEndFrame && pet) {
if (_v2) {
startTalking(this, getRandomNumber(1) ? 230062 : 230063);
} else if (!findMail(pet->getRoomFlags())) {
@@ -397,7 +397,7 @@ bool CBilgeSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
if (_enabled) {
_enabled = false;
- if (_startFrame10 >= 0)
+ if (_offStartFrame >= 0)
playSound("z#27.wav");
}
@@ -419,8 +419,8 @@ bool CBilgeSuccUBus::TurnOn(CTurnOn *msg) {
CPetControl *pet = getPetControl();
if (pet) {
- if (_startFrame9 >= 0) {
- playMovie(_startFrame9, _endFrame9, MOVIE_NOTIFY_OBJECT);
+ if (_onStartFrame >= 0) {
+ playMovie(_onStartFrame, _onEndFrame, MOVIE_NOTIFY_OBJECT);
playSound("z#26.wav");
}
@@ -452,8 +452,8 @@ bool CBilgeSuccUBus::TurnOff(CTurnOff *msg) {
_soundHandle = -1;
}
- if (_startFrame10 >= 0)
- playMovie(_startFrame10, _endFrame10, MOVIE_NOTIFY_OBJECT);
+ if (_offStartFrame >= 0)
+ playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT);
_enabled = false;
performAction(true);
diff --git a/engines/titanic/npcs/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp
index 657bde5..08866f1 100644
--- a/engines/titanic/npcs/parrot_succubus.cpp
+++ b/engines/titanic/npcs/parrot_succubus.cpp
@@ -78,7 +78,7 @@ bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
if (_enabled) {
_enabled = false;
} else {
- playMovie(_startFrame9, _endFrame9, 0);
+ playMovie(_onStartFrame, _onEndFrame, 0);
playSound("z#26.wav");
}
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index af859f9..194585e 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -61,10 +61,10 @@ CSuccUBus::CSuccUBus() : CTrueTalkNPC() {
_endFrame3 = 168;
_startFrame4 = 168;
_endFrame4 = 248;
- _startFrame9 = 0;
- _endFrame9 = 0x0E;
- _startFrame10 = 0x0E;
- _endFrame10 = 27;
+ _onStartFrame = 0;
+ _onEndFrame = 0x0E;
+ _offStartFrame = 0x0E;
+ _offEndFrame = 27;
_startFrame2 = 40;
_endFrame2 = 68;
_field140 = 1;
@@ -112,10 +112,10 @@ void CSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(_endFrame3, indent);
file->writeNumberLine(_startFrame4, indent);
file->writeNumberLine(_endFrame4, indent);
- file->writeNumberLine(_startFrame9, indent);
- file->writeNumberLine(_endFrame9, indent);
- file->writeNumberLine(_startFrame10, indent);
- file->writeNumberLine(_endFrame10, indent);
+ file->writeNumberLine(_onStartFrame, indent);
+ file->writeNumberLine(_onEndFrame, indent);
+ file->writeNumberLine(_offStartFrame, indent);
+ file->writeNumberLine(_offEndFrame, indent);
file->writeNumberLine(_startFrame2, indent);
file->writeNumberLine(_endFrame2, indent);
file->writeNumberLine(_field140, indent);
@@ -176,10 +176,10 @@ void CSuccUBus::load(SimpleFile *file) {
_endFrame3 = file->readNumber();
_startFrame4 = file->readNumber();
_endFrame4 = file->readNumber();
- _startFrame9 = file->readNumber();
- _endFrame9 = file->readNumber();
- _startFrame10 = file->readNumber();
- _endFrame10 = file->readNumber();
+ _onStartFrame = file->readNumber();
+ _onEndFrame = file->readNumber();
+ _offStartFrame = file->readNumber();
+ _offEndFrame = file->readNumber();
_startFrame2 = file->readNumber();
_endFrame2 = file->readNumber();
_field140 = file->readNumber();
@@ -340,8 +340,8 @@ bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
petDisplayMessage(2, BLANK);
if (_startFrame8 >= 0)
loadFrame(_startFrame8);
- else if (!_field15C && _startFrame9 >= 0)
- loadFrame(_startFrame9);
+ else if (!_field15C && _onStartFrame >= 0)
+ loadFrame(_onStartFrame);
petClear();
if (_soundHandle != -1) {
@@ -351,7 +351,7 @@ bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
if (_enabled) {
_enabled = false;
- if (_startFrame10 >= 0)
+ if (_offStartFrame >= 0)
playSound("z#27.wav", 100);
if (_field15C)
@@ -511,7 +511,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CPetControl *pet = getPetControl();
uint petRoomFlags = pet ? pet->getRoomFlags() : 0;
- if (msg->_endFrame == _endFrame10) {
+ if (msg->_endFrame == _offEndFrame) {
if (_startFrame11 >= 0)
playSound("z#30.wav", 100);
@@ -524,7 +524,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
}
}
- if (msg->_endFrame == _endFrame9) {
+ if (msg->_endFrame == _onEndFrame) {
bool flag = false;
if (pet && !mailExists(petRoomFlags)) {
@@ -661,8 +661,8 @@ bool CSuccUBus::TurnOn(CTurnOn *msg) {
playSound("z#30.wav", 100);
}
- if (_startFrame9 >= 0) {
- playMovie(_startFrame9, _endFrame9, MOVIE_NOTIFY_OBJECT);
+ if (_onStartFrame >= 0) {
+ playMovie(_onStartFrame, _onEndFrame, MOVIE_NOTIFY_OBJECT);
playSound("z#26.wav", 100);
}
@@ -689,9 +689,9 @@ bool CSuccUBus::TurnOff(CTurnOff *msg) {
_soundHandle = -1;
}
- if (_startFrame10 >= 0) {
+ if (_offStartFrame >= 0) {
playSound("z#27.wav", 100);
- playMovie(_startFrame10, _endFrame10, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+ playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
}
if (!_field15C && _startFrame11 >= 0)
diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h
index 7ca8037..bf0de00 100644
--- a/engines/titanic/npcs/succubus.h
+++ b/engines/titanic/npcs/succubus.h
@@ -60,10 +60,10 @@ protected:
int _endFrame3;
int _startFrame4;
int _endFrame4;
- int _startFrame9;
- int _endFrame9;
- int _startFrame10;
- int _endFrame10;
+ int _onStartFrame;
+ int _onEndFrame;
+ int _offStartFrame;
+ int _offEndFrame;
int _startFrame2;
int _endFrame2;
int _field140;
More information about the Scummvm-git-logs
mailing list