[Scummvm-git-logs] scummvm branch-2-3 -> f18e8c4df14cb9f932c80cca1eb584a8726d8ab9
mgerhardy
martin.gerhardy at gmail.com
Wed Sep 8 18:06:31 UTC 2021
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8eb6b4dd0c TWINE: translated french comment
90cb25a821 TWINE: comments
0c07d45fcc TWINE: renamed variable
79ac125ee2 TWINE: added godmode debug command
20c1923908 TWINE: fixed holomap arrow clipping
f18e8c4df1 TWINE: fixed typos
Commit: 8eb6b4dd0c3e3515005ac11ebf369f38c1465511
https://github.com/scummvm/scummvm/commit/8eb6b4dd0c3e3515005ac11ebf369f38c1465511
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:02:53+02:00
Commit Message:
TWINE: translated french comment
Changed paths:
engines/twine/renderer/renderer.cpp
diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index 2d7c2ece4a..1dd5392c54 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -745,8 +745,8 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
int16 colorSize = stopColor - startColor;
- int16 stop = ptr1[screenHeight]; // stop
- int16 start = ptr1[0]; // start
+ int16 stop = ptr1[screenHeight];
+ int16 start = ptr1[0];
ptr1++;
uint8 *out2 = start + out;
@@ -761,7 +761,7 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
if (hsize == 0) {
if (start >= 0 && start < screenWidth) {
- *out2 = ((startColor + stopColor) / 2) / 256; // moyenne des 2 couleurs
+ *out2 = ((startColor + stopColor) / 2) / 256; // average of the 2 colors
}
} else if (hsize > 0) {
if (hsize == 1) {
@@ -770,7 +770,7 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
}
if (start >= 0 && start < screenWidth) {
- *(out2) = startColor / 256;
+ *out2 = startColor / 256;
}
} else if (hsize == 2) {
if (start >= -2 && start < screenWidth - 2) {
@@ -782,7 +782,7 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
}
if (start >= 0 && start < screenWidth) {
- *(out2) = startColor / 256;
+ *out2 = startColor / 256;
}
} else {
int32 currentXPos = start;
Commit: 90cb25a821e09e042e2ded752e9b32f5d93d8e22
https://github.com/scummvm/scummvm/commit/90cb25a821e09e042e2ded752e9b32f5d93d8e22
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:02:53+02:00
Commit Message:
TWINE: comments
Changed paths:
engines/twine/renderer/renderer.cpp
diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index 1dd5392c54..14c224a811 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -728,7 +728,7 @@ void Renderer::renderPolygonsTrame(int vtop, int32 vsize, uint8 color) const {
void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
uint8 *out = (uint8 *)_engine->_frontVideoBuffer.getBasePtr(0, vtop);
const int16 *ptr1 = &_polyTab[vtop];
- const int16 *ptr2 = &_polyTab2[vtop];
+ const int16 *ptr2 = &_polyTab2[vtop]; // color progression
const int screenWidth = _engine->width();
const int screenHeight = _engine->height();
int32 renderLoop = vsize;
@@ -826,7 +826,7 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
void Renderer::renderPolygonsDither(int vtop, int32 vsize) const {
uint8 *out = (uint8 *)_engine->_frontVideoBuffer.getBasePtr(0, vtop);
const int16 *ptr1 = &_polyTab[vtop];
- const int16 *ptr2 = &_polyTab2[vtop];
+ const int16 *ptr2 = &_polyTab2[vtop]; // color progression
const int screenWidth = _engine->width();
const int screenHeight = _engine->height();
@@ -839,8 +839,8 @@ void Renderer::renderPolygonsDither(int vtop, int32 vsize) const {
renderLoop = screenHeight;
}
for (int32 currentLine = 0; currentLine < renderLoop; ++currentLine) {
- int16 stop = ptr1[screenHeight]; // stop
- int16 start = ptr1[0]; // start
+ int16 stop = ptr1[screenHeight];
+ int16 start = ptr1[0];
ptr1++;
int32 hsize = stop - start;
if (hsize < 0) {
@@ -856,7 +856,7 @@ void Renderer::renderPolygonsDither(int vtop, int32 vsize) const {
if (hsize == 0) {
if (currentXPos >= 0 && currentXPos < screenWidth) {
- *out2 = (uint8)(((startColor + stopColor) / 2) / 256);
+ *out2 = (uint8)(((startColor + stopColor) / 2) / 256); // average of the 2 colors
}
} else {
int16 colorSize = stopColor - startColor;
Commit: 0c07d45fcccaf463dc650986743209ab3ae8d31e
https://github.com/scummvm/scummvm/commit/0c07d45fcccaf463dc650986743209ab3ae8d31e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:03:23+02:00
Commit Message:
TWINE: renamed variable
Changed paths:
engines/twine/renderer/renderer.cpp
engines/twine/renderer/renderer.h
diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index 14c224a811..b9e1f19664 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -48,13 +48,13 @@ Renderer::Renderer(TwinEEngine *engine) : _engine(engine) {
Renderer::~Renderer() {
free(_polyTab);
- free(_polyTab2);
+ free(_colorProgressionBuffer);
}
void Renderer::init(int32 w, int32 h) {
_polyTabSize = _engine->height() * 6;
_polyTab = (int16 *)malloc(_polyTabSize * sizeof(int16));
- _polyTab2 = (int16 *)malloc(_polyTabSize * sizeof(int16));
+ _colorProgressionBuffer = (int16 *)malloc(_polyTabSize * sizeof(int16));
_holomap_polytab_1_1 = &_polyTab[_engine->height() * 0];
_holomap_polytab_1_2 = &_polyTab[_engine->height() * 2];
_holomap_polytab_1_3 = &_polyTab[_engine->height() * 3];
@@ -391,8 +391,8 @@ void Renderer::computePolygons(int16 polyRenderType, const Vertex *vertices, int
int16 currentVertexY = vertices[numVertices - 1].y;
const int16 *polyTabBegin = _polyTab;
const int16 *polyTabEnd = &_polyTab[_polyTabSize - 1];
- const int16 *polyTab2Begin = _polyTab2;
- const int16 *polyTab2End = &_polyTab2[_polyTabSize - 1];
+ const int16 *polyTab2Begin = _colorProgressionBuffer;
+ const int16 *polyTab2End = &_colorProgressionBuffer[_polyTabSize - 1];
const int screenHeight = _engine->height();
for (int32 nVertex = 0; nVertex < numVertices; nVertex++) {
@@ -448,7 +448,7 @@ void Renderer::computePolygons(int16 polyRenderType, const Vertex *vertices, int
}
if (polyRenderType >= POLYGONTYPE_GOURAUD) { // we must compute the color progression
- int16 *outPtr2 = &_polyTab2[polyTabIndex];
+ int16 *outPtr2 = &_colorProgressionBuffer[polyTabIndex];
for (int16 i = 0; i < vsize + 2; i++) {
if (outPtr2 >= polyTab2Begin && outPtr2 <= polyTab2End) {
@@ -728,7 +728,7 @@ void Renderer::renderPolygonsTrame(int vtop, int32 vsize, uint8 color) const {
void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
uint8 *out = (uint8 *)_engine->_frontVideoBuffer.getBasePtr(0, vtop);
const int16 *ptr1 = &_polyTab[vtop];
- const int16 *ptr2 = &_polyTab2[vtop]; // color progression
+ const int16 *ptr2 = &_colorProgressionBuffer[vtop];
const int screenWidth = _engine->width();
const int screenHeight = _engine->height();
int32 renderLoop = vsize;
@@ -826,7 +826,7 @@ void Renderer::renderPolygonsGouraud(int vtop, int32 vsize) const {
void Renderer::renderPolygonsDither(int vtop, int32 vsize) const {
uint8 *out = (uint8 *)_engine->_frontVideoBuffer.getBasePtr(0, vtop);
const int16 *ptr1 = &_polyTab[vtop];
- const int16 *ptr2 = &_polyTab2[vtop]; // color progression
+ const int16 *ptr2 = &_colorProgressionBuffer[vtop];
const int screenWidth = _engine->width();
const int screenHeight = _engine->height();
diff --git a/engines/twine/renderer/renderer.h b/engines/twine/renderer/renderer.h
index ade786b16f..0f660bdb11 100644
--- a/engines/twine/renderer/renderer.h
+++ b/engines/twine/renderer/renderer.h
@@ -173,7 +173,7 @@ private:
int32 _polyTabSize = 0;
int16 *_polyTab = nullptr;
- int16 *_polyTab2 = nullptr;
+ int16 *_colorProgressionBuffer = nullptr;
int16* _holomap_polytab_1_1 = nullptr;
int16* _holomap_polytab_1_2 = nullptr;
int16* _holomap_polytab_1_3 = nullptr;
Commit: 79ac125ee2880c4fd2d8a40dd2b4047c75f0a416
https://github.com/scummvm/scummvm/commit/79ac125ee2880c4fd2d8a40dd2b4047c75f0a416
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:04:42+02:00
Commit Message:
TWINE: added godmode debug command
Changed paths:
engines/twine/debugger/console.cpp
engines/twine/debugger/console.h
engines/twine/debugger/debug_scene.h
engines/twine/scene/actor.cpp
engines/twine/scene/animations.cpp
engines/twine/scene/collision.cpp
engines/twine/script/script_life_v1.cpp
diff --git a/engines/twine/debugger/console.cpp b/engines/twine/debugger/console.cpp
index 0bf0245b24..dff8d60355 100644
--- a/engines/twine/debugger/console.cpp
+++ b/engines/twine/debugger/console.cpp
@@ -50,6 +50,7 @@ TwinEConsole::TwinEConsole(TwinEEngine *engine) : _engine(engine), GUI::Debugger
registerCmd("toggle_debug", WRAP_METHOD(TwinEConsole, doToggleDebug));
registerCmd("toggle_zones", WRAP_METHOD(TwinEConsole, doToggleZoneRendering));
registerCmd("toggle_tracks", WRAP_METHOD(TwinEConsole, doToggleTrackRendering));
+ registerCmd("toggle_godmode", WRAP_METHOD(TwinEConsole, doToggleGodMode));
registerCmd("toggle_autoagressive", WRAP_METHOD(TwinEConsole, doToggleAutoAggressive));
registerCmd("toggle_actors", WRAP_METHOD(TwinEConsole, doToggleActorRendering));
registerCmd("toggle_clips", WRAP_METHOD(TwinEConsole, doToggleClipRendering));
@@ -98,6 +99,11 @@ bool TwinEConsole::doToggleTrackRendering(int argc, const char **argv) {
return true;
}
+bool TwinEConsole::doToggleGodMode(int argc, const char **argv) {
+ TOGGLE_DEBUG(_engine->_debugScene->_godMode, "god mode\n")
+ return true;
+}
+
bool TwinEConsole::doToggleScenePatches(int argc, const char **argv) {
TOGGLE_DEBUG(_engine->_debugScene->_useScenePatches, "use scene patches\n")
return true;
diff --git a/engines/twine/debugger/console.h b/engines/twine/debugger/console.h
index 6da6016ff7..2ea8092961 100644
--- a/engines/twine/debugger/console.h
+++ b/engines/twine/debugger/console.h
@@ -54,6 +54,7 @@ private:
bool doToggleClipRendering(int argc, const char **argv);
bool doToggleActorRendering(int argc, const char **argv);
bool doToggleTrackRendering(int argc, const char **argv);
+ bool doToggleGodMode(int argc, const char **argv);
bool doToggleScenePatches(int argc, const char **argv);
bool doToggleFreeCamera(int argc, const char **argv);
bool doToggleSceneChanges(int argc, const char **argv);
diff --git a/engines/twine/debugger/debug_scene.h b/engines/twine/debugger/debug_scene.h
index 7f510c7d65..5111b59af8 100644
--- a/engines/twine/debugger/debug_scene.h
+++ b/engines/twine/debugger/debug_scene.h
@@ -76,6 +76,7 @@ public:
bool _showingTracks = false;
bool _showingClips = false;
bool _useScenePatches = false;
+ bool _godMode = false;
int32 _typeZones = 127; // all zones on as default
int16 _onlyLoadActor = -1;
diff --git a/engines/twine/scene/actor.cpp b/engines/twine/scene/actor.cpp
index 3c8afe1540..172fc4439a 100644
--- a/engines/twine/scene/actor.cpp
+++ b/engines/twine/scene/actor.cpp
@@ -25,6 +25,7 @@
#include "common/system.h"
#include "common/textconsole.h"
#include "twine/audio/sound.h"
+#include "twine/debugger/debug_scene.h"
#include "twine/parser/entity.h"
#include "twine/renderer/renderer.h"
#include "twine/renderer/screens.h"
@@ -36,6 +37,7 @@
#include "twine/scene/grid.h"
#include "twine/scene/movements.h"
#include "twine/scene/scene.h"
+#include "twine/shared.h"
#include "twine/twine.h"
namespace TwinE {
@@ -153,7 +155,7 @@ int32 Actor::initBody(BodyType bodyIdx, int32 actorIdx, ActorBoundingBox &actorB
return -1;
}
ActorStruct *actor = _engine->_scene->getActor(actorIdx);
- const EntityBody* body = actor->_entityDataPtr->getBody((int)bodyIdx);
+ const EntityBody *body = actor->_entityDataPtr->getBody((int)bodyIdx);
if (body == nullptr) {
return -1;
}
@@ -307,6 +309,10 @@ void Actor::hitActor(int32 actorIdx, int32 actorIdxAttacked, int32 strengthOfHit
return;
}
+ if (IS_HERO(actorIdxAttacked) && _engine->_debugScene->_godMode) {
+ return;
+ }
+
actor->_hitBy = actorIdx;
if (actor->_armor <= strengthOfHit) {
@@ -380,7 +386,7 @@ void ActorStruct::loadModel(int32 modelIndex, bool lba1) {
if (!_staticFlags.bIsSpriteActor) {
debug(1, "Init actor with model %i", modelIndex);
if (!_entityData.loadFromHQR(Resources::HQR_FILE3D_FILE, modelIndex, lba1)) {
- error("Failed to load entity data for index %i", modelIndex);
+ error("Failed to load entity data for index %i", modelIndex);
}
_entityDataPtr = &_entityData;
} else {
diff --git a/engines/twine/scene/animations.cpp b/engines/twine/scene/animations.cpp
index 52377a68df..1aed4f5c2c 100644
--- a/engines/twine/scene/animations.cpp
+++ b/engines/twine/scene/animations.cpp
@@ -26,6 +26,7 @@
#include "common/stream.h"
#include "common/util.h"
#include "twine/audio/sound.h"
+#include "twine/debugger/debug_scene.h"
#include "twine/parser/anim.h"
#include "twine/parser/entity.h"
#include "twine/renderer/renderer.h"
@@ -695,7 +696,9 @@ void Animations::processActorAnimations(int32 actorIdx) {
_engine->_movements->_heroMoved = true;
}
- actor->addLife(-1);
+ if (!_engine->_debugScene->_godMode) {
+ actor->addLife(-1);
+ }
}
}
}
@@ -713,7 +716,9 @@ void Animations::processActorAnimations(int32 actorIdx) {
_engine->_extra->addExtraSpecial(actor->_pos.x, actor->_pos.y + 1000, actor->_pos.z, ExtraSpecialType::kHitStars);
initAnim(AnimationTypes::kBigHit, AnimType::kAnimationType_2, AnimationTypes::kStanding, _currentlyProcessedActorIdx);
_engine->_movements->_heroMoved = true;
- actor->addLife(-1);
+ if (!_engine->_debugScene->_godMode) {
+ actor->addLife(-1);
+ }
}
// no Z coordinate issue
diff --git a/engines/twine/scene/collision.cpp b/engines/twine/scene/collision.cpp
index c7b42b6ca0..c166e9ac3a 100644
--- a/engines/twine/scene/collision.cpp
+++ b/engines/twine/scene/collision.cpp
@@ -24,6 +24,7 @@
#include "common/debug.h"
#include "common/memstream.h"
#include "common/util.h"
+#include "twine/debugger/debug_scene.h"
#include "twine/renderer/renderer.h"
#include "twine/resources/resources.h"
#include "twine/scene/actor.h"
@@ -380,7 +381,9 @@ void Collision::stopFalling() { // ReceptionObj()
if (fall >= BRICK_HEIGHT * 16) {
_engine->_actor->_processActorPtr->setLife(0);
} else {
- _engine->_actor->_processActorPtr->addLife(-1);
+ if (!_engine->_debugScene->_godMode) {
+ _engine->_actor->_processActorPtr->addLife(-1);
+ }
}
_engine->_animations->initAnim(AnimationTypes::kLandingHit, AnimType::kAnimationType_2, AnimationTypes::kStanding, _engine->_animations->_currentlyProcessedActorIdx);
} else if (fall > 10) {
diff --git a/engines/twine/script/script_life_v1.cpp b/engines/twine/script/script_life_v1.cpp
index f37bd94ee5..86bfc7f3ca 100644
--- a/engines/twine/script/script_life_v1.cpp
+++ b/engines/twine/script/script_life_v1.cpp
@@ -23,6 +23,7 @@
#include "twine/script/script_life_v1.h"
#include "common/memstream.h"
#include "common/stream.h"
+#include "twine/debugger/debug_scene.h"
#include "twine/scene/actor.h"
#include "twine/scene/animations.h"
#include "twine/audio/music.h"
@@ -1161,9 +1162,11 @@ static int32 lSUB_LIFE_POINT_OBJ(TwinEEngine *engine, LifeScriptContext &ctx) {
const int32 lifeValue = ctx.stream.readByte();
ActorStruct *otherActor = engine->_scene->getActor(otherActorIdx);
- otherActor->addLife(-lifeValue);
- if (otherActor->_life < 0) {
- otherActor->setLife(0);
+ if (!engine->_debugScene->_godMode) {
+ otherActor->addLife(-lifeValue);
+ if (otherActor->_life < 0) {
+ otherActor->setLife(0);
+ }
}
return 0;
Commit: 20c1923908204015a9986c4455fd072b85f1f52b
https://github.com/scummvm/scummvm/commit/20c1923908204015a9986c4455fd072b85f1f52b
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:06:13+02:00
Commit Message:
TWINE: fixed holomap arrow clipping
Changed paths:
engines/twine/holomap.cpp
engines/twine/renderer/renderer.cpp
engines/twine/renderer/renderer.h
diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index e6871ac940..c2a3ef8e03 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -451,9 +451,9 @@ void Holomap::renderLocations(int xRot, int yRot, int zRot, bool lower) {
const IVec3 &destPos4 = _engine->_renderer->getBaseRotationPosition(destPos2);
bool visible;
if (lower) {
- visible = destPos4.z <= destPos3.z;
- } else {
visible = destPos3.z <= destPos4.z;
+ } else {
+ visible = destPos4.z <= destPos3.z;
}
if (!visible) {
continue;
diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index b9e1f19664..6e4a0a556b 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -56,13 +56,11 @@ void Renderer::init(int32 w, int32 h) {
_polyTab = (int16 *)malloc(_polyTabSize * sizeof(int16));
_colorProgressionBuffer = (int16 *)malloc(_polyTabSize * sizeof(int16));
_holomap_polytab_1_1 = &_polyTab[_engine->height() * 0];
+ _holomap_polytab_2_1 = &_polyTab[_engine->height() * 1];
_holomap_polytab_1_2 = &_polyTab[_engine->height() * 2];
- _holomap_polytab_1_3 = &_polyTab[_engine->height() * 3];
+ _holomap_polytab_2_2 = &_polyTab[_engine->height() * 3];
+ _holomap_polytab_1_3 = &_polyTab[_engine->height() * 4];
_holomap_polytab_2_3 = &_polyTab[_engine->height() * 5];
- _holomap_polytab_2_2 = &_polyTab[_engine->height() * 4];
- _holomap_polytab_2_1 = &_polyTab[_engine->height() * 1];
- _holomap_polytab_1_2_ptr = _holomap_polytab_1_2;
- _holomap_polytab_1_3_ptr = _holomap_polytab_1_3;
}
IVec3 &Renderer::projectPositionOnScreen(int32 cX, int32 cY, int32 cZ) {
diff --git a/engines/twine/renderer/renderer.h b/engines/twine/renderer/renderer.h
index 0f660bdb11..1e3ff1c62d 100644
--- a/engines/twine/renderer/renderer.h
+++ b/engines/twine/renderer/renderer.h
@@ -180,8 +180,6 @@ private:
int16* _holomap_polytab_2_3 = nullptr;
int16* _holomap_polytab_2_2 = nullptr;
int16* _holomap_polytab_2_1 = nullptr;
- int16* _holomap_polytab_1_2_ptr = nullptr;
- int16* _holomap_polytab_1_3_ptr = nullptr;
bool _isUsingOrthoProjection = false;
Commit: f18e8c4df14cb9f932c80cca1eb584a8726d8ab9
https://github.com/scummvm/scummvm/commit/f18e8c4df14cb9f932c80cca1eb584a8726d8ab9
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-09-08T20:06:17+02:00
Commit Message:
TWINE: fixed typos
Changed paths:
engines/twine/scene/grid.cpp
engines/twine/script/script_life_v1.cpp
diff --git a/engines/twine/scene/grid.cpp b/engines/twine/scene/grid.cpp
index 23187efe6c..287dd9bc18 100644
--- a/engines/twine/scene/grid.cpp
+++ b/engines/twine/scene/grid.cpp
@@ -838,7 +838,7 @@ void Grid::centerScreenOnActor() {
_engine->_renderer->projectPositionOnScreen(actor->_pos.x - (_newCamera.x * BRICK_SIZE),
actor->_pos.y - (_newCamera.y * BRICK_HEIGHT),
actor->_pos.z - (_newCamera.z * BRICK_SIZE));
- // TODO: these border values should get scaled for hiher resolutions
+ // TODO: these border values should get scaled for higher resolutions
if (_engine->_renderer->_projPos.x < 80 || _engine->_renderer->_projPos.x >= _engine->width() - 60 || _engine->_renderer->_projPos.y < 80 || _engine->_renderer->_projPos.y >= _engine->height() - 50) {
_newCamera.x = ((actor->_pos.x + BRICK_HEIGHT) / BRICK_SIZE) + (((actor->_pos.x + BRICK_HEIGHT) / BRICK_SIZE) - _newCamera.x) / 2;
_newCamera.y = actor->_pos.y / BRICK_HEIGHT;
diff --git a/engines/twine/script/script_life_v1.cpp b/engines/twine/script/script_life_v1.cpp
index 86bfc7f3ca..c29db44ecd 100644
--- a/engines/twine/script/script_life_v1.cpp
+++ b/engines/twine/script/script_life_v1.cpp
@@ -132,7 +132,7 @@ enum LifeScriptConditions {
};
/**
- * Returns @c 1 Condition value size (1 byte), @c 2 Condition value size (2 byes)
+ * Returns @c 1 Condition value size (1 byte), @c 2 Condition value size (2 bytes)
*/
static int32 processLifeConditions(TwinEEngine *engine, LifeScriptContext &ctx) {
int32 conditionValueSize = 1;
More information about the Scummvm-git-logs
mailing list