[Scummvm-git-logs] scummvm master -> 70ff8d6232d08f9bdf72d0bfedf09fbe4433abec

salty-horse ori at avtalion.name
Sat Sep 3 10:46:14 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
70ff8d6232 SCUMM HE: Constify string parameter


Commit: 70ff8d6232d08f9bdf72d0bfedf09fbe4433abec
    https://github.com/scummvm/scummvm/commit/70ff8d6232d08f9bdf72d0bfedf09fbe4433abec
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-09-03T11:45:43+03:00

Commit Message:
SCUMM HE: Constify string parameter

Changed paths:
    engines/scumm/he/intern_he.h
    engines/scumm/he/script_v72he.cpp



diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 8a562ea..bd3cdb2 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -291,7 +291,7 @@ public:
 
 	virtual byte *getStringAddress(ResId idx);
 	virtual int setupStringArray(int size);
-	virtual int setupStringArrayFromString(char *cStr);
+	virtual int setupStringArrayFromString(const char *cStr);
 	virtual void getStringFromArray(int arrayNumber, char *buffer, int maxLength);
 
 protected:
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index c764de7..a922af1 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -230,7 +230,7 @@ int ScummEngine_v72he::setupStringArray(int size) {
 	return readVar(0);
 }
 
-int ScummEngine_v72he::setupStringArrayFromString(char *cStr) {
+int ScummEngine_v72he::setupStringArrayFromString(const char *cStr) {
 	// this is PUI_ScummStringArrayFromCString() found in PUSERMAC.cpp
 	// I can see how its done up there in setupStringArray()
 	// yet I'd note that 'SCUMMVAR_user_reserved' var was used instead of 0





More information about the Scummvm-git-logs mailing list