[Scummvm-git-logs] scummvm master -> 4a00d3717a3d989b5211841cd45fc148ba5e4003
aquadran
aquadran at gmail.com
Sun Oct 11 12:45:42 UTC 2020
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:
4a00d3717a WINTERMUTE: Fixed for int vs int32 types for AmmigaOS/MorphOS
Commit: 4a00d3717a3d989b5211841cd45fc148ba5e4003
https://github.com/scummvm/scummvm/commit/4a00d3717a3d989b5211841cd45fc148ba5e4003
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-11T14:45:36+02:00
Commit Message:
WINTERMUTE: Fixed for int vs int32 types for AmmigaOS/MorphOS
Changed paths:
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_actor_3dx.h
engines/wintermute/ad/ad_object_3d.cpp
engines/wintermute/ad/ad_object_3d.h
engines/wintermute/ad/ad_path3d.cpp
engines/wintermute/ad/ad_path3d.h
engines/wintermute/ad/ad_scene_geometry.cpp
engines/wintermute/ad/ad_scene_geometry.h
engines/wintermute/base/gfx/base_renderer3d.cpp
engines/wintermute/base/gfx/x/active_animation.h
engines/wintermute/base/gfx/x/animation_set.cpp
engines/wintermute/base/gfx/x/modelx.cpp
engines/wintermute/base/gfx/x/modelx.h
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 90d7b97966..ba4f01e426 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -1257,7 +1257,7 @@ void AdActor3DX::talk(const char *text, const char *sound, uint32 duration, cons
}
//////////////////////////////////////////////////////////////////////////
-int AdActor3DX::getHeight() {
+int32 AdActor3DX::getHeight() {
if (!_modelX) {
return 0;
} else {
@@ -2262,13 +2262,13 @@ bool AdActor3DX::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferUint32(TMEMBER(_defaultStopTransTime));
if (persistMgr->getIsSaving()) {
- int numItems = _transitionTimes.size();
+ int32 numItems = _transitionTimes.size();
persistMgr->transferSint32(TMEMBER(numItems));
for (uint32 i = 0; i < _transitionTimes.size(); i++) {
_transitionTimes[i]->persist(persistMgr);
}
} else {
- int numItems = _transitionTimes.size();
+ int32 numItems = _transitionTimes.size();
persistMgr->transferSint32(TMEMBER(numItems));
for (int i = 0; i < numItems; i++) {
BaseAnimationTransitionTime *trans = new BaseAnimationTransitionTime();
diff --git a/engines/wintermute/ad/ad_actor_3dx.h b/engines/wintermute/ad/ad_actor_3dx.h
index ecac126070..e87f29d8bc 100644
--- a/engines/wintermute/ad/ad_actor_3dx.h
+++ b/engines/wintermute/ad/ad_actor_3dx.h
@@ -51,9 +51,9 @@ public:
bool displayShadowVolume();
bool restoreDeviceObjects() override;
bool invalidateDeviceObjects() override;
- int _stateAnimChannel;
+ int32 _stateAnimChannel;
void talk(const char *text, const char *sound = nullptr, uint32 duration = 0, const char *stances = nullptr, TTextAlign align = TAL_CENTER) override;
- int getHeight() override;
+ int32 getHeight() override;
bool playAnim3DX(const char *name, bool setState);
bool playAnim3DX(int channel, const char *name, bool setState);
@@ -72,7 +72,7 @@ public:
Common::String _turnLeftAnimName;
Common::String _turnRightAnimName;
- int _talkAnimChannel;
+ int32 _talkAnimChannel;
TDirectWalkMode _directWalkMode;
TDirectTurnMode _directTurnMode;
@@ -81,7 +81,7 @@ public:
float _directWalkVelocity;
float _directTurnVelocity;
- int _goToTolerance;
+ int32 _goToTolerance;
DECLARE_PERSISTENT(AdActor3DX, AdObject3D)
bool _turningLeft;
diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
index bf09452d52..9423548ab0 100644
--- a/engines/wintermute/ad/ad_object_3d.cpp
+++ b/engines/wintermute/ad/ad_object_3d.cpp
@@ -120,7 +120,7 @@ bool AdObject3D::update() {
}
//////////////////////////////////////////////////////////////////////////
-bool AdObject3D::convert3DTo2D(Math::Matrix4 *worldMat, int *posX, int *posY) {
+bool AdObject3D::convert3DTo2D(Math::Matrix4 *worldMat, int32 *posX, int32 *posY) {
Math::Vector3d origin(0.0f, 0.0f, 0.0f);
_gameRef->_renderer3D->project(*worldMat, origin, *posX, *posY);
@@ -180,7 +180,7 @@ bool AdObject3D::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
else if (strcmp(name, "GetBonePosition2D") == 0) {
stack->correctParams(1);
const char *boneName = stack->pop()->getString();
- int x = 0, y = 0;
+ int32 x = 0, y = 0;
getBonePosition2D(boneName, &x, &y);
ScValue *val = stack->getPushValue();
@@ -583,7 +583,7 @@ ShadowVolume *AdObject3D::getShadowVolume() {
}
//////////////////////////////////////////////////////////////////////////
-bool AdObject3D::getBonePosition2D(const char *boneName, int *x, int *y) {
+bool AdObject3D::getBonePosition2D(const char *boneName, int32 *x, int32 *y) {
if (!_modelX) {
return false;
}
diff --git a/engines/wintermute/ad/ad_object_3d.h b/engines/wintermute/ad/ad_object_3d.h
index f75db251a5..f25ed55e7c 100644
--- a/engines/wintermute/ad/ad_object_3d.h
+++ b/engines/wintermute/ad/ad_object_3d.h
@@ -40,7 +40,7 @@ class ShadowVolume;
class AdObject3D : public AdObject {
public:
bool setupLights();
- bool convert3DTo2D(Math::Matrix4 *worldMat, int *posX, int *posY);
+ bool convert3DTo2D(Math::Matrix4 *worldMat, int32 *posX, int32 *posY);
bool skipTo(int x, int y, bool tolerant = false);
char *_tempSkelAnim;
Math::Vector3d _lastPosVector;
@@ -50,7 +50,7 @@ public:
bool update() override;
AdObject3D(BaseGame *inGame);
virtual ~AdObject3D();
- bool getBonePosition2D(const char *boneName, int *x, int *y);
+ bool getBonePosition2D(const char *boneName, int32 *x, int32 *y);
bool getBonePosition3D(const char *boneName, Math::Vector3d *pos, Math::Vector3d *offset = nullptr);
float _velocity;
diff --git a/engines/wintermute/ad/ad_path3d.cpp b/engines/wintermute/ad/ad_path3d.cpp
index 697bb795a4..61d1e9a40a 100644
--- a/engines/wintermute/ad/ad_path3d.cpp
+++ b/engines/wintermute/ad/ad_path3d.cpp
@@ -108,7 +108,7 @@ bool AdPath3D::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_ready));
if (persistMgr->getIsSaving()) {
- int j = _points.size();
+ int32 j = _points.size();
persistMgr->transferSint32("ArraySize", &j);
for (int i = 0; i < j; i++) {
persistMgr->transferFloat("x", &_points[i]->x());
@@ -116,7 +116,7 @@ bool AdPath3D::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferFloat("z", &_points[i]->z());
}
} else {
- int j = 0;
+ int32 j = 0;
persistMgr->transferSint32("ArraySize", &j);
for (int i = 0; i < j; i++) {
float x, y, z;
diff --git a/engines/wintermute/ad/ad_path3d.h b/engines/wintermute/ad/ad_path3d.h
index 2569ad8804..e072e9c637 100644
--- a/engines/wintermute/ad/ad_path3d.h
+++ b/engines/wintermute/ad/ad_path3d.h
@@ -49,7 +49,7 @@ public:
virtual ~AdPath3D();
bool _ready;
BaseArray<Math::Vector3d *> _points;
- int _currIndex;
+ int32 _currIndex;
DECLARE_PERSISTENT(AdPath3D, BaseClass)
};
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index 1449863d9e..fc82ed75ad 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -1167,7 +1167,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
int i;
//////////////////////////////////////////////////////////////////////////
- int numLights = _lights.size();
+ int32 numLights = _lights.size();
persistMgr->transferSint32(TMEMBER(numLights));
for (i = 0; i < numLights; i++) {
if (persistMgr->getIsSaving()) {
@@ -1200,7 +1200,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
createLights();
//////////////////////////////////////////////////////////////////////////
- int numBlocks = _blocks.size();
+ int32 numBlocks = _blocks.size();
persistMgr->transferSint32(TMEMBER(numBlocks));
for (i = 0; i < numBlocks; i++) {
if (persistMgr->getIsSaving()) {
@@ -1230,7 +1230,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
}
//////////////////////////////////////////////////////////////////////////
- int numPlanes = _planes.size();
+ int32 numPlanes = _planes.size();
persistMgr->transferSint32(TMEMBER(numPlanes));
for (i = 0; i < numPlanes; i++) {
if (persistMgr->getIsSaving()) {
@@ -1260,7 +1260,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
}
//////////////////////////////////////////////////////////////////////////
- int numGenerics = _generics.size();
+ int32 numGenerics = _generics.size();
persistMgr->transferSint32(TMEMBER(numGenerics));
for (i = 0; i < numGenerics; i++) {
if (persistMgr->getIsSaving()) {
@@ -1297,7 +1297,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
}
//////////////////////////////////////////////////////////////////////////
-bool AdSceneGeometry::convert3Dto2D(Math::Vector3d *pos, int *x, int *y) {
+bool AdSceneGeometry::convert3Dto2D(Math::Vector3d *pos, int32 *x, int32 *y) {
Math::Matrix4 worldMat;
worldMat.setToIdentity();
diff --git a/engines/wintermute/ad/ad_scene_geometry.h b/engines/wintermute/ad/ad_scene_geometry.h
index faae71fc01..6608d14dc1 100644
--- a/engines/wintermute/ad/ad_scene_geometry.h
+++ b/engines/wintermute/ad/ad_scene_geometry.h
@@ -81,7 +81,7 @@ public:
bool getPath(Math::Vector3d source, Math::Vector3d target, AdPath3D *path, bool rerun = false);
bool convert2Dto3D(int x, int y, Math::Vector3d *pos);
bool convert2Dto3DTolerant(int x, int y, Math::Vector3d *pos);
- bool convert3Dto2D(Math::Vector3d *pos, int *x, int *y);
+ bool convert3Dto2D(Math::Vector3d *pos, int32 *x, int32 *y);
BaseSprite *_wptMarker;
float _waypointHeight;
bool directPathExists(Math::Vector3d *p1, Math::Vector3d *p2);
@@ -98,11 +98,11 @@ public:
//bool SetActiveCameraTwin(char* Camera);
//bool SetActiveCameraTwin(int Camera);
Camera3D *getActiveCamera();
- int _activeCamera;
+ int32 _activeCamera;
bool setActiveLight(char *light);
bool setActiveLight(int light);
- int _activeLight;
+ int32 _activeLight;
void cleanup();
AdSceneGeometry(BaseGame *inGame);
diff --git a/engines/wintermute/base/gfx/base_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
index bc3d86ac1c..12b5563ad5 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
@@ -45,7 +45,7 @@ bool BaseRenderer3D::setDefaultAmbientLightColor() {
return true;
}
-void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int &x, int &y) {
+void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int32 &x, int32 &y) {
Math::Matrix4 tmp = worldMatrix;
tmp.transpose();
Math::Vector3d windowCoords;
diff --git a/engines/wintermute/base/gfx/x/active_animation.h b/engines/wintermute/base/gfx/x/active_animation.h
index fb2ac33695..9e3ea50a2a 100644
--- a/engines/wintermute/base/gfx/x/active_animation.h
+++ b/engines/wintermute/base/gfx/x/active_animation.h
@@ -63,7 +63,7 @@ public:
private:
ModelX *_model;
- int _currentFrame;
+ int32 _currentFrame;
uint32 _startTime;
bool _looping;
bool _finished;
diff --git a/engines/wintermute/base/gfx/x/animation_set.cpp b/engines/wintermute/base/gfx/x/animation_set.cpp
index 8dec7ddb0f..27d5b8d0c2 100644
--- a/engines/wintermute/base/gfx/x/animation_set.cpp
+++ b/engines/wintermute/base/gfx/x/animation_set.cpp
@@ -204,7 +204,7 @@ bool AnimationSet::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_looping));
// persist events
- int numEvents;
+ int32 numEvents;
if (persistMgr->getIsSaving()) {
numEvents = _events.size();
}
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
index 4d47d6eb83..b77fd0b3c3 100644
--- a/engines/wintermute/base/gfx/x/modelx.cpp
+++ b/engines/wintermute/base/gfx/x/modelx.cpp
@@ -559,8 +559,8 @@ void ModelX::updateBoundingRect() {
float z1 = _BBoxStart.z();
float z2 = _BBoxEnd.z();
- int screenX = 0;
- int screenY = 0;
+ int32 screenX = 0;
+ int32 screenY = 0;
_gameRef->_renderer3D->project(_lastWorldMat, Math::Vector3d(x1, y1, z1), screenX, screenY);
updateRect(&_boundingRect, screenX, screenY);
@@ -855,7 +855,7 @@ bool ModelX::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER(_parentModel));
// animation properties
- int numAnims;
+ int32 numAnims;
if (persistMgr->getIsSaving()) {
numAnims = _animationSets.size();
}
@@ -893,7 +893,7 @@ bool ModelX::persist(BasePersistenceManager *persistMgr) {
}
// persist material sprites
- int numMatSprites;
+ int32 numMatSprites;
if (persistMgr->getIsSaving()) {
numMatSprites = _matSprites.size();
}
diff --git a/engines/wintermute/base/gfx/x/modelx.h b/engines/wintermute/base/gfx/x/modelx.h
index 7fc613389a..ea1db982ad 100644
--- a/engines/wintermute/base/gfx/x/modelx.h
+++ b/engines/wintermute/base/gfx/x/modelx.h
@@ -197,8 +197,8 @@ private:
Rect32 _drawingViewport;
Math::Matrix4 _lastViewMat;
Math::Matrix4 _lastProjMat;
- int _lastOffsetX;
- int _lastOffsetY;
+ int32 _lastOffsetX;
+ int32 _lastOffsetY;
Math::Vector3d _BBoxStart;
Math::Vector3d _BBoxEnd;
More information about the Scummvm-git-logs
mailing list