[Scummvm-git-logs] scummvm master -> 76c78aef8230abaa31ad6aa41755e3189676dd93
mgerhardy
noreply at scummvm.org
Sat Jun 11 11:11:45 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:
76c78aef82 TWINE: reduced visibility
Commit: 76c78aef8230abaa31ad6aa41755e3189676dd93
https://github.com/scummvm/scummvm/commit/76c78aef8230abaa31ad6aa41755e3189676dd93
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-06-11T13:11:36+02:00
Commit Message:
TWINE: reduced visibility
Changed paths:
engines/twine/scene/collision.cpp
engines/twine/scene/collision.h
diff --git a/engines/twine/scene/collision.cpp b/engines/twine/scene/collision.cpp
index 96bd069cc82..edd6dedbf9f 100644
--- a/engines/twine/scene/collision.cpp
+++ b/engines/twine/scene/collision.cpp
@@ -94,6 +94,7 @@ int32 Collision::getAverageValue(int32 start, int32 end, int32 maxDelay, int32 d
return (((end - start) * delay) / maxDelay) + start;
}
+// ReajustPos
void Collision::reajustActorPosition(IVec3 &processActor, ShapeType brickShape) const {
if (brickShape == ShapeType::kNone) {
return;
@@ -292,6 +293,7 @@ int32 Collision::checkCollisionWithActors(int32 actorIdx) {
return actor->_collision;
}
+// DoCornerReajustTwinkel
void Collision::checkHeroCollisionWithBricks(ActorStruct *actor, int32 x, int32 y, int32 z, int32 damageMask) {
IVec3 &processActor = actor->_processActor;
IVec3 &previousActor = actor->_previousActor;
@@ -325,6 +327,7 @@ void Collision::checkHeroCollisionWithBricks(ActorStruct *actor, int32 x, int32
processActor = _processCollision;
}
+// DoCornerReajust
void Collision::checkActorCollisionWithBricks(ActorStruct *actor, int32 x, int32 y, int32 z, int32 damageMask) {
IVec3 &processActor = actor->_processActor;
IVec3 &previousActor = actor->_previousActor;
diff --git a/engines/twine/scene/collision.h b/engines/twine/scene/collision.h
index 206d27f3568..fc08509e2a8 100644
--- a/engines/twine/scene/collision.h
+++ b/engines/twine/scene/collision.h
@@ -36,14 +36,14 @@ private:
TwinEEngine *_engine;
void handlePushing(const IVec3 &minsTest, const IVec3 &maxsTest, ActorStruct *actor, ActorStruct *actorTest);
+
+ /** Actor collision coordinate */
+ IVec3 _processCollision;
public:
Collision(TwinEEngine *engine);
/** Actor collision coordinate */
IVec3 _collision;
- /** Actor collision coordinate */
- IVec3 _processCollision;
-
/** Cause damage in current processed actor */
int32 _causeActorDamage = 0; //fieldCauseDamage
More information about the Scummvm-git-logs
mailing list