[Scummvm-git-logs] scummvm master -> 1a532a481f8133d2dbb0d97d7956f824a2c140a7

[sev-]

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:
1a532a481f EFH: Const correctness


Commit: 1a532a481f8133d2dbb0d97d7956f824a2c140a7
    https://github.com/scummvm/scummvm/commit/1a532a481f8133d2dbb0d97d7956f824a2c140a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-07T18:57:12+01:00

Commit Message:
EFH: Const correctness

Changed paths:
    engines/efh/efh.h
    engines/efh/graphics.cpp
    engines/efh/script.cpp


diff --git a/engines/efh/efh.h b/engines/efh/efh.h
index 3bf5fbd7ad0..49d9d9ab418 100644
--- a/engines/efh/efh.h
+++ b/engines/efh/efh.h
@@ -486,8 +486,8 @@ private:
 	void synchronize(Common::Serializer &s);
 
 	// Script
-	uint8 *script_readNumberArray(uint8 *buffer, int16 destArraySize, int16 *destArray);
-	uint8 *script_getNumber(uint8 *srcBuffer, int16 *retBuf);
+	const uint8 *script_readNumberArray(const uint8 *buffer, int16 destArraySize, int16 *destArray);
+	const uint8 *script_getNumber(const uint8 *srcBuffer, int16 *retBuf);
 	int16 script_parse(Common::String str, int16 posX, int16 posY, int16 maxX, int16 maxY, bool scriptExecuteFlag);
 
 	// Sound
@@ -557,7 +557,7 @@ private:
 	};
 
 	BitmapRef _mapBitmapRefArr[19];
-	
+
 	MapSpecialTileStruct _mapSpecialTiles[19][100];
 	MapMonster _mapMonsters[19][64];
 	uint8 _mapGameMaps[19][64][64];
diff --git a/engines/efh/graphics.cpp b/engines/efh/graphics.cpp
index 7460a660f3b..bc403f9dc0b 100644
--- a/engines/efh/graphics.cpp
+++ b/engines/efh/graphics.cpp
@@ -210,7 +210,7 @@ void EfhEngine::displayRawDataAtPos(uint8 *imagePtr, int16 posX, int16 posY) {
 
 void EfhEngine::drawString(const char *str, int16 startX, int16 startY, uint16 textColor) {
 	debugC(1, kDebugGraphics, "drawString %s %d %d %d", str, startX, startY, textColor);
-	uint8 *curPtr = (uint8 *)str;
+	const uint8 *curPtr = (const uint8 *)str;
 	uint16 lineHeight = _fontDescr._charHeight + _fontDescr._extraVerticalSpace;
 	int16 minX = startX;
 
diff --git a/engines/efh/script.cpp b/engines/efh/script.cpp
index 80233c3293d..7486e2854ea 100644
--- a/engines/efh/script.cpp
+++ b/engines/efh/script.cpp
@@ -24,10 +24,10 @@
 
 namespace Efh {
 
-uint8 *EfhEngine::script_readNumberArray(uint8 *srcBuffer, int16 destArraySize, int16 *destArray) {
+const uint8 *EfhEngine::script_readNumberArray(const uint8 *srcBuffer, int16 destArraySize, int16 *destArray) {
 	debugC(6, kDebugScript, "script_readNumberArray");
 
-	uint8 *buffer = srcBuffer;
+	const uint8 *buffer = srcBuffer;
 	for (int i = 0; i < destArraySize; ++i) {
 		buffer++;
 		buffer = script_getNumber(buffer, &destArray[i]);
@@ -36,10 +36,10 @@ uint8 *EfhEngine::script_readNumberArray(uint8 *srcBuffer, int16 destArraySize,
 	return buffer;
 }
 
-uint8 *EfhEngine::script_getNumber(uint8 *srcBuffer, int16 *retBuf) {
+const uint8 *EfhEngine::script_getNumber(const uint8 *srcBuffer, int16 *retBuf) {
 	debugC(6, kDebugScript, "script_getNumber");
 
-	uint8 *buffer = srcBuffer;
+	const uint8 *buffer = srcBuffer;
 	int16 retVal = 0;
 	for (;;) {
 		uint8 curChar = *buffer;
@@ -66,7 +66,7 @@ int16 EfhEngine::script_parse(Common::String stringBuffer, int16 posX, int16 pos
 	int16 numbLines = (1 + maxY - posY) / 9;
 	int16 width = maxX - posX;
 	int16 spaceWidth = getStringWidth(" ");
-	uint8 *buffer = (uint8 *)stringBuffer.c_str();
+	const uint8 *buffer = (const uint8 *)stringBuffer.c_str();
 	char nextWord[80];
 	Common::String curLine = "";
 	memset(nextWord, 0, sizeof(nextWord));
@@ -490,4 +490,3 @@ int16 EfhEngine::script_parse(Common::String stringBuffer, int16 posX, int16 pos
 }
 
 } // End of namespace Efh
-