[Scummvm-git-logs] scummvm master -> b92ad1ce7880abdd58527417851cf94ce50e4dcb
mgerhardy
martin.gerhardy at gmail.com
Wed Jan 6 06:54:07 UTC 2021
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
367fe4e2f1 TWINE: fixed rotating while attacking in auto mode
6c42253060 TWINE: fixed typo
b92ad1ce78 TWINE: reduced default debug output
Commit: 367fe4e2f1b0b1b994942111fa7f265aa2170c34
https://github.com/scummvm/scummvm/commit/367fe4e2f1b0b1b994942111fa7f265aa2170c34
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-06T07:48:58+01:00
Commit Message:
TWINE: fixed rotating while attacking in auto mode
https://bugs.scummvm.org/ticket/12046
Changed paths:
engines/twine/scene/movements.cpp
diff --git a/engines/twine/scene/movements.cpp b/engines/twine/scene/movements.cpp
index 2fbb3d1331..43c6cd1b34 100644
--- a/engines/twine/scene/movements.cpp
+++ b/engines/twine/scene/movements.cpp
@@ -342,7 +342,8 @@ void Movements::processMovementExecution(int actorIdx) {
void Movements::processRotationExecution(int actorIdx) {
ActorStruct *actor = _engine->_scene->getActor(actorIdx);
- if (_engine->_actor->autoAgressive && actor->isAttackAnimationActive()) {
+ if (!_engine->_actor->autoAgressive && _engine->_actor->autoAgressive && actor->isAttackAnimationActive()) {
+ // it is allowed to rotate in auto agressive mode - but not in manual mode.
return;
}
if (actor->isJumpAnimationActive()) {
Commit: 6c4225306089a9bb235c8102b7f8985e670de740
https://github.com/scummvm/scummvm/commit/6c4225306089a9bb235c8102b7f8985e670de740
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-06T07:51:57+01:00
Commit Message:
TWINE: fixed typo
Changed paths:
engines/twine/menu/menu.cpp
engines/twine/scene/actor.cpp
engines/twine/scene/actor.h
engines/twine/scene/movements.cpp
engines/twine/text.h
engines/twine/twine.cpp
diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index 18e5566d36..21c92f89b7 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -61,7 +61,7 @@ enum _MenuButtonTypes {
kCDVolume = 3,
kLineVolume = 4,
kMasterVolume = 5,
- kAgressiveMode = 6,
+ kAggressiveMode = 6,
kPolygonDetails = 7,
kShadowSettings = 8,
kSceneryZoom = 9
@@ -115,7 +115,7 @@ static MenuSettings createOptionsMenu() {
static MenuSettings createAdvancedOptionsMenu() {
MenuSettings settings;
settings.addButton(TextId::kReturnMenu);
- settings.addButton(TextId::kBehaviourAgressiveManual, MenuButtonTypes::kAgressiveMode);
+ settings.addButton(TextId::kBehaviourAggressiveManual, MenuButtonTypes::kAggressiveMode);
settings.addButton(TextId::kDetailsPolygonsHigh, MenuButtonTypes::kPolygonDetails);
settings.addButton(TextId::kDetailsShadowHigh, MenuButtonTypes::kShadowSettings);
settings.addButton(TextId::kScenaryZoomOn, MenuButtonTypes::kSceneryZoom);
@@ -326,11 +326,11 @@ int16 Menu::drawButtons(MenuSettings *menuSettings, bool hover) {
if (menuSettings == &advOptionsMenuState) {
int16 id = menuSettings->getButtonState(i);
switch (id) {
- case MenuButtonTypes::kAgressiveMode:
- if (_engine->_actor->autoAgressive) {
- menuSettings->setButtonTextId(i, TextId::kBehaviourAgressiveAuto);
+ case MenuButtonTypes::kAggressiveMode:
+ if (_engine->_actor->autoAggressive) {
+ menuSettings->setButtonTextId(i, TextId::kBehaviourAggressiveAuto);
} else {
- menuSettings->setButtonTextId(i, TextId::kBehaviourAgressiveManual);
+ menuSettings->setButtonTextId(i, TextId::kBehaviourAggressiveManual);
}
break;
case MenuButtonTypes::kPolygonDetails:
@@ -437,9 +437,9 @@ int32 Menu::processMenu(MenuSettings *menuSettings) {
const int16 id = menuSettings->getActiveButtonState();
if (menuSettings == &advOptionsMenuState) {
switch (id) {
- case MenuButtonTypes::kAgressiveMode:
+ case MenuButtonTypes::kAggressiveMode:
if (_engine->_input->toggleActionIfActive(TwinEActionType::UILeft) || _engine->_input->toggleActionIfActive(TwinEActionType::UIRight)) {
- _engine->_actor->autoAgressive = !_engine->_actor->autoAgressive;
+ _engine->_actor->autoAggressive = !_engine->_actor->autoAggressive;
}
break;
case MenuButtonTypes::kPolygonDetails:
@@ -579,7 +579,7 @@ int32 Menu::advoptionsMenu() {
}
case kQuitEngine:
return kQuitEngine;
- case TextId::kBehaviourAgressiveManual:
+ case TextId::kBehaviourAggressiveManual:
case TextId::kDetailsPolygonsHigh:
case TextId::kDetailsShadowHigh:
case TextId::kScenaryZoomOn:
diff --git a/engines/twine/scene/actor.cpp b/engines/twine/scene/actor.cpp
index 54164193f9..c2bf6158dd 100644
--- a/engines/twine/scene/actor.cpp
+++ b/engines/twine/scene/actor.cpp
@@ -166,8 +166,8 @@ void Actor::initSpriteActor(int32 actorIdx) {
}
int32 Actor::getTextIdForBehaviour() const {
- if (_engine->_actor->heroBehaviour == HeroBehaviourType::kAggressive && _engine->_actor->autoAgressive) {
- return TextId::kBehaviourAgressiveAuto;
+ if (_engine->_actor->heroBehaviour == HeroBehaviourType::kAggressive && _engine->_actor->autoAggressive) {
+ return TextId::kBehaviourAggressiveAuto;
}
// the other values are matching the text ids
return (int32)_engine->_actor->heroBehaviour;
diff --git a/engines/twine/scene/actor.h b/engines/twine/scene/actor.h
index 49a5143d55..fb33dcfc9e 100644
--- a/engines/twine/scene/actor.h
+++ b/engines/twine/scene/actor.h
@@ -292,8 +292,8 @@ public:
ShapeType shadowCollisionType = ShapeType::kNone; // shadowVar
HeroBehaviourType heroBehaviour = HeroBehaviourType::kNormal;
- /** Hero auto agressive mode */
- bool autoAgressive = true;
+ /** Hero auto aggressive mode */
+ bool autoAggressive = true;
/** Previous Hero behaviour */
HeroBehaviourType previousHeroBehaviour = HeroBehaviourType::kNormal;
/** Previous Hero angle */
diff --git a/engines/twine/scene/movements.cpp b/engines/twine/scene/movements.cpp
index 43c6cd1b34..ca20159c9e 100644
--- a/engines/twine/scene/movements.cpp
+++ b/engines/twine/scene/movements.cpp
@@ -227,7 +227,7 @@ bool Movements::processBehaviourExecution(int actorIdx) {
_engine->_animations->initAnim(AnimationTypes::kJump, 1, AnimationTypes::kStanding, actorIdx);
break;
case HeroBehaviourType::kAggressive:
- if (_engine->_actor->autoAgressive) {
+ if (_engine->_actor->autoAggressive) {
ActorStruct *actor = _engine->_scene->getActor(actorIdx);
heroMoved = true;
actor->angle = actor->move.getRealAngle(_engine->lbaTime);
@@ -292,7 +292,7 @@ bool Movements::processAttackExecution(int actorIdx) {
void Movements::processMovementExecution(int actorIdx) {
ActorStruct *actor = _engine->_scene->getActor(actorIdx);
- if (_engine->_actor->autoAgressive && actor->isAttackAnimationActive()) {
+ if (_engine->_actor->autoAggressive && actor->isAttackAnimationActive()) {
return;
}
if (actor->isJumpAnimationActive()) {
@@ -342,8 +342,8 @@ void Movements::processMovementExecution(int actorIdx) {
void Movements::processRotationExecution(int actorIdx) {
ActorStruct *actor = _engine->_scene->getActor(actorIdx);
- if (!_engine->_actor->autoAgressive && _engine->_actor->autoAgressive && actor->isAttackAnimationActive()) {
- // it is allowed to rotate in auto agressive mode - but not in manual mode.
+ if (!_engine->_actor->autoAggressive && _engine->_actor->autoAggressive && actor->isAttackAnimationActive()) {
+ // it is allowed to rotate in auto aggressive mode - but not in manual mode.
return;
}
if (actor->isJumpAnimationActive()) {
diff --git a/engines/twine/text.h b/engines/twine/text.h
index d02e5a69ff..dbd08930ac 100644
--- a/engines/twine/text.h
+++ b/engines/twine/text.h
@@ -55,9 +55,9 @@ namespace TextId {
enum _TextId {
kBehaviourNormal = 0,
kBehaviourSporty = 1,
- kBehaviourAgressiveManual = 2,
+ kBehaviourAggressiveManual = 2,
kBehaviourHiding = 3,
- kBehaviourAgressiveAuto = 4,
+ kBehaviourAggressiveAuto = 4,
kUseProtopack = 5,
kSendell = 6,
kMusicVolume = 10,
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 209134ce33..e06a34b829 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -247,7 +247,7 @@ Common::Error TwinEEngine::run() {
}
}
- ConfMan.setInt("combatauto", _actor->autoAgressive ? 1 : 0);
+ ConfMan.setInt("combatauto", _actor->autoAggressive ? 1 : 0);
ConfMan.setInt("shadow", cfgfile.ShadowMode);
ConfMan.setInt("scezoom", cfgfile.SceZoom ? 1 : 0);
ConfMan.setInt("polygondetails", cfgfile.PolygonDetails);
@@ -384,7 +384,7 @@ void TwinEEngine::initConfigurations() {
cfgfile.CrossFade = ConfGetBoolOrDefault("crossfade", false);
cfgfile.WallCollision = ConfGetBoolOrDefault("wallcollision", false);
- _actor->autoAgressive = ConfGetBoolOrDefault("combatauto", true);
+ _actor->autoAggressive = ConfGetBoolOrDefault("combatauto", true);
cfgfile.ShadowMode = ConfGetIntOrDefault("shadow", 2);
cfgfile.SceZoom = ConfGetBoolOrDefault("scezoom", false);
cfgfile.PolygonDetails = ConfGetIntOrDefault("polygondetails", 2);
@@ -397,7 +397,7 @@ void TwinEEngine::initConfigurations() {
debug("UseAutoSaving: %s", (cfgfile.UseAutoSaving ? "true" : "false"));
debug("CrossFade: %s", (cfgfile.CrossFade ? "true" : "false"));
debug("WallCollision: %s", (cfgfile.WallCollision ? "true" : "false"));
- debug("AutoAgressive: %s", (_actor->autoAgressive ? "true" : "false"));
+ debug("AutoAggressive: %s", (_actor->autoAggressive ? "true" : "false"));
debug("ShadowMode: %i", cfgfile.ShadowMode);
debug("PolygonDetails: %i", cfgfile.PolygonDetails);
debug("SceZoom: %s", (cfgfile.SceZoom ? "true" : "false"));
Commit: b92ad1ce7880abdd58527417851cf94ce50e4dcb
https://github.com/scummvm/scummvm/commit/b92ad1ce7880abdd58527417851cf94ce50e4dcb
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-06T07:53:33+01:00
Commit Message:
TWINE: reduced default debug output
Changed paths:
engines/twine/scene/actor.cpp
engines/twine/twine.cpp
diff --git a/engines/twine/scene/actor.cpp b/engines/twine/scene/actor.cpp
index c2bf6158dd..67b0f29832 100644
--- a/engines/twine/scene/actor.cpp
+++ b/engines/twine/scene/actor.cpp
@@ -240,7 +240,7 @@ void Actor::initModelActor(int32 bodyIdx, int16 actorIdx) {
return;
}
- debug("Load body %i for actor %i", bodyIdx, actorIdx);
+ debug(1, "Load body %i for actor %i", bodyIdx, actorIdx);
if (IS_HERO(actorIdx) && heroBehaviour == HeroBehaviourType::kProtoPack && localActor->armor != 0 && localActor->armor != 1) {
setBehaviour(HeroBehaviourType::kNormal);
@@ -329,7 +329,7 @@ void Actor::initActor(int16 actorIdx) {
} else {
actor->entity = -1;
- debug("Init actor %i with model %i", actorIdx, actor->body);
+ debug(1, "Init actor %i with model %i", actorIdx, actor->body);
initModelActor(actor->body, actorIdx);
actor->previousAnimIdx = -1;
@@ -485,7 +485,7 @@ ActorStruct::~ActorStruct() {
void ActorStruct::loadModel(int32 modelIndex) {
entity = modelIndex;
if (!staticFlags.bIsSpriteActor) {
- debug("Init actor with model %i", modelIndex);
+ debug(1, "Init actor with model %i", modelIndex);
entityDataSize = HQR::getAllocEntry(&entityDataPtr, Resources::HQR_FILE3D_FILE, modelIndex);
} else {
entityDataSize = 0;
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index e06a34b829..8ece5b0db8 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -389,18 +389,18 @@ void TwinEEngine::initConfigurations() {
cfgfile.SceZoom = ConfGetBoolOrDefault("scezoom", false);
cfgfile.PolygonDetails = ConfGetIntOrDefault("polygondetails", 2);
- debug("UseCD: %s", (cfgfile.UseCD ? "true" : "false"));
- debug("Sound: %s", (cfgfile.Sound ? "true" : "false"));
- debug("Movie: %i", cfgfile.Movie);
- debug("Fps: %i", cfgfile.Fps);
- debug("Debug: %s", (cfgfile.Debug ? "true" : "false"));
- debug("UseAutoSaving: %s", (cfgfile.UseAutoSaving ? "true" : "false"));
- debug("CrossFade: %s", (cfgfile.CrossFade ? "true" : "false"));
- debug("WallCollision: %s", (cfgfile.WallCollision ? "true" : "false"));
- debug("AutoAggressive: %s", (_actor->autoAggressive ? "true" : "false"));
- debug("ShadowMode: %i", cfgfile.ShadowMode);
- debug("PolygonDetails: %i", cfgfile.PolygonDetails);
- debug("SceZoom: %s", (cfgfile.SceZoom ? "true" : "false"));
+ debug(1, "UseCD: %s", (cfgfile.UseCD ? "true" : "false"));
+ debug(1, "Sound: %s", (cfgfile.Sound ? "true" : "false"));
+ debug(1, "Movie: %i", cfgfile.Movie);
+ debug(1, "Fps: %i", cfgfile.Fps);
+ debug(1, "Debug: %s", (cfgfile.Debug ? "true" : "false"));
+ debug(1, "UseAutoSaving: %s", (cfgfile.UseAutoSaving ? "true" : "false"));
+ debug(1, "CrossFade: %s", (cfgfile.CrossFade ? "true" : "false"));
+ debug(1, "WallCollision: %s", (cfgfile.WallCollision ? "true" : "false"));
+ debug(1, "AutoAggressive: %s", (_actor->autoAggressive ? "true" : "false"));
+ debug(1, "ShadowMode: %i", cfgfile.ShadowMode);
+ debug(1, "PolygonDetails: %i", cfgfile.PolygonDetails);
+ debug(1, "SceZoom: %s", (cfgfile.SceZoom ? "true" : "false"));
}
void TwinEEngine::initEngine() {
More information about the Scummvm-git-logs
mailing list