diff options
| author | Johannes Schickel | 2012-04-04 15:27:42 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-04-04 15:27:42 -0700 |
| commit | d8aecf006a2425c632291e3fcbe0de6f661efcde (patch) | |
| tree | 83b72fb5513db68f528f283afc043df2aef50bb9 | |
| parent | a6ba9f150a19765956d4fb9ba750782f05f74f48 (diff) | |
| parent | ab16233318136da52c0cb5b4abf54ac0a2a78f4b (diff) | |
| download | scummvm-rg350-d8aecf006a2425c632291e3fcbe0de6f661efcde.tar.gz scummvm-rg350-d8aecf006a2425c632291e3fcbe0de6f661efcde.tar.bz2 scummvm-rg350-d8aecf006a2425c632291e3fcbe0de6f661efcde.zip | |
Merge pull request #221 from klusark/const
Fix casting away const
| -rw-r--r-- | engines/scumm/script_v0.cpp | 2 | ||||
| -rw-r--r-- | graphics/surface.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 45901186cd..44b77f1d18 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -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); } diff --git a/graphics/surface.cpp b/graphics/surface.cpp index fcd702241a..c0f1046eae 100644 --- a/graphics/surface.cpp +++ b/graphics/surface.cpp @@ -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++) { |