[Scummvm-git-logs] scummvm master -> 28cc32ac0fa94486a205b810446192a7849c1dd2

[sev-]

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:
2a484dda5b DIRECTOR: Pass strings by references
28cc32ac0f DIRECTOR: Fix typo


Commit: 2a484dda5be9b890301b02451130d57da789ae86
    https://github.com/scummvm/scummvm/commit/2a484dda5be9b890301b02451130d57da789ae86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-21T23:55:10+02:00

Commit Message:
DIRECTOR: Pass strings by references

Changed paths:
    engines/director/score.cpp
    engines/director/score.h


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 0edfaad0e8..81cc9a57de 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -97,7 +97,7 @@ bool Score::processImmediateFrameScript(Common::String s, int id) {
 	return false;
 }
 
-uint16 Score::getLabel(Common::String label) {
+uint16 Score::getLabel(Common::String &label) {
 	if (!_labels) {
 		warning("Score::getLabel: No labels set");
 		return 0;
@@ -123,7 +123,7 @@ Common::String *Score::getLabelList() {
 	return res;
 }
 
-void Score::setStartToLabel(Common::String label) {
+void Score::setStartToLabel(Common::String &label) {
 	uint16 num = getLabel("label");
 
 	if (num == 0)
@@ -275,7 +275,7 @@ void Score::update() {
 	if (_waitForChannel) {
 		if (_soundManager->isChannelActive(_waitForChannel))
 			return;
-		
+
 		_waitForChannel = 0;
 	}
 
diff --git a/engines/director/score.h b/engines/director/score.h
index 006dd17c2b..40b26c7476 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -70,9 +70,9 @@ public:
 	void loadActions(Common::SeekableSubReadStreamEndian &stream);
 
 	static int compareLabels(const void *a, const void *b);
-	uint16 getLabel(Common::String label);
+	uint16 getLabel(Common::String &label);
 	Common::String *getLabelList();
-	void setStartToLabel(Common::String label);
+	void setStartToLabel(Common::String &label);
 	void gotoLoop();
 	void gotoNext();
 	void gotoPrevious();


Commit: 28cc32ac0fa94486a205b810446192a7849c1dd2
    https://github.com/scummvm/scummvm/commit/28cc32ac0fa94486a205b810446192a7849c1dd2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-21T23:55:47+02:00

Commit Message:
DIRECTOR: Fix typo

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 81cc9a57de..b30cfb029a 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -124,7 +124,7 @@ Common::String *Score::getLabelList() {
 }
 
 void Score::setStartToLabel(Common::String &label) {
-	uint16 num = getLabel("label");
+	uint16 num = getLabel(label);
 
 	if (num == 0)
 		warning("Label %s not found", label.c_str());