ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221 from klusark/const

Browse Source 
Fix casting away const
This commit is contained in:
Johannes Schickel
2012-04-04 15:27:42 -07:00
parent a6ba9f150a ab16233318
commit d8aecf006a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/script_v0.cpp
+1 -1
View File
@@ -471,7 +471,7 @@ void ScummEngine_v0::drawSentenceLine() {
actorName = " ";
} else {
Actor *a = derefActor(actorId, "drawSentenceLine");
actorName = (char *)a->getActorName();
actorName = (const char *)a->getActorName();
}
_sentenceBuf += Common::String::format("%-13s", actorName);
}
graphics/surface.cpp
+2 -2
View File
@@ -295,7 +295,7 @@ Graphics::Surface *Surface::convertTo(const PixelFormat &dstFormat, const byte *
assert(palette);
for (int y = 0; y < h; y++) {
const byte *srcRow = (byte *)getBasePtr(0, y);
const byte *srcRow = (const byte *)getBasePtr(0, y);
byte *dstRow = (byte *)surface->getBasePtr(0, y);
for (int x = 0; x < w; x++) {
@@ -317,7 +317,7 @@ Graphics::Surface *Surface::convertTo(const PixelFormat &dstFormat, const byte *
} else {
// Converting from high color to high color
for (int y = 0; y < h; y++) {
const byte *srcRow = (byte *)getBasePtr(0, y);
const byte *srcRow = (const byte *)getBasePtr(0, y);
byte *dstRow = (byte *)surface->getBasePtr(0, y);
for (int x = 0; x < w; x++) {