[Scummvm-git-logs] scummvm master -> 9b95bfd218130843cd970a8ed5f64a120f69fc79
aquadran
noreply at scummvm.org
Mon May 30 14:38:18 UTC 2022
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:
9b95bfd218 AGS: Silence const casts
Commit: 9b95bfd218130843cd970a8ed5f64a120f69fc79
https://github.com/scummvm/scummvm/commit/9b95bfd218130843cd970a8ed5f64a120f69fc79
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2022-05-30T16:38:11+02:00
Commit Message:
AGS: Silence const casts
Changed paths:
engines/ags/engine/ac/overlay.cpp
engines/ags/engine/ac/string.cpp
diff --git a/engines/ags/engine/ac/overlay.cpp b/engines/ags/engine/ac/overlay.cpp
index a236892a8bc..770d8a7689a 100644
--- a/engines/ags/engine/ac/overlay.cpp
+++ b/engines/ags/engine/ac/overlay.cpp
@@ -306,7 +306,7 @@ static void dispose_overlay(ScreenOverlay &over) {
over.ddb = nullptr;
// invalidate script object and dispose it if there are no more refs
if (over.associatedOverlayHandle > 0) {
- ScriptOverlay *scover = (ScriptOverlay *)ccGetObjectAddressFromHandle(over.associatedOverlayHandle);
+ ScriptOverlay *scover = (ScriptOverlay *)const_cast<char *>(ccGetObjectAddressFromHandle(over.associatedOverlayHandle));
if (scover) scover->overlayId = -1;
ccAttemptDisposeObject(over.associatedOverlayHandle);
}
diff --git a/engines/ags/engine/ac/string.cpp b/engines/ags/engine/ac/string.cpp
index 5dbac47218d..8cf0ca3f398 100644
--- a/engines/ags/engine/ac/string.cpp
+++ b/engines/ags/engine/ac/string.cpp
@@ -256,7 +256,7 @@ DynObjectRef CreateNewScriptStringObj(const char *fromText, bool reAllocate) {
if (reAllocate) {
str = new ScriptString(fromText);
} else { // TODO: refactor to avoid const casts!
- str = new ScriptString((char *)fromText, true);
+ str = new ScriptString(const_cast<char *>(fromText), true);
}
void *obj_ptr = str->GetTextPtr();
int32_t handle = ccRegisterManagedObject(obj_ptr, str);
More information about the Scummvm-git-logs
mailing list