[Scummvm-git-logs] scummvm master -> 3c132825198f4393f9d22ea01fa54f1f5aff7f48
lephilousophe
noreply at scummvm.org
Sat Jun 8 16:31:29 UTC 2024
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:
3c13282519 TWINE: Fix int vs int32 discrepancies
Commit: 3c132825198f4393f9d22ea01fa54f1f5aff7f48
https://github.com/scummvm/scummvm/commit/3c132825198f4393f9d22ea01fa54f1f5aff7f48
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-06-08T18:30:40+02:00
Commit Message:
TWINE: Fix int vs int32 discrepancies
Changed paths:
engines/twine/scene/scene.cpp
engines/twine/scene/scene.h
diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 1fc1188b7dd..bb68aded887 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -148,7 +148,7 @@ void Scene::setBonusParameterFlags(ActorStruct *act, uint16 bonusFlags) {
}
}
-bool Scene::loadSceneCubeXY(int numcube, int *cubex, int *cubey) {
+bool Scene::loadSceneCubeXY(int numcube, int32 *cubex, int32 *cubey) {
uint8 *scene = nullptr;
// numcube+1 because at 0 is SizeCube.MAX (size of the largest .SCC)
const int32 sceneSize = HQR::getAllocEntry(&scene, Resources::HQR_SCENE_FILE, numcube + 1);
diff --git a/engines/twine/scene/scene.h b/engines/twine/scene/scene.h
index a472efe69df..b044aba7bee 100644
--- a/engines/twine/scene/scene.h
+++ b/engines/twine/scene/scene.h
@@ -224,7 +224,7 @@ public:
void changeScene();
/** For the buggy to get the 2D coordinates of an exterior cube in the map */
- bool loadSceneCubeXY(int sceneNum, int *cubeX, int *cubeY);
+ bool loadSceneCubeXY(int sceneNum, int32 *cubeX, int32 *cubeY);
/** Process scene environment sound */
void processEnvironmentSound();
More information about the Scummvm-git-logs
mailing list