[Scummvm-git-logs] scummvm master -> a65053eae0d3ed41fb1e075a6ce4ffe4d9d50e4e
sev-
noreply at scummvm.org
Fri Aug 11 09:17:30 UTC 2023
This automated email contains information about 17 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2aa5de81b4 CRAB: Chain MovementSet constructors
00b3d76f43 CRAB: Fix unitialized member in InputManager warning
46730836c2 CRAB: Initialize delay to 0 in Movement constructor
063484c9a3 CRAB: Initialize all values correctly by calling reset() in Cursor constructor
90a98c8a93 CRAB: Fix unitialized member in AlphaImage
01495f32fe CRAB: Initialize state to GAME in Game constructor
4a31e62d94 CRAB: Chain trait constructors
c8f72d6fa4 CRAB: Fix unitialized members warning generated by Coverity in crab.cpp
2886d6be68 CRAB: Chain AnimationEffect constructors
56376e6d63 CRAB: Fix alpha value of invalid color not being initialized
5e7a3aeefe CRAB: Explicitly mark where return values are ignored
1bea775e95 CRAB: Use & with auto where possible
2dc04959f9 CRAB: Mark some functions in TMXMap as const member functions
aa073516e9 CRAB: Pass arguments by ref in PathfindingGrid::setupNodes()
da1571afa4 CRAB: Fix potential out-of-bounds access
beeda4fa7f CRAB: Chain AnimationFrame constructors
a65053eae0 CRAB: Properly initialize all class members in RapidXML code
Commit: 2aa5de81b47b4c6ebef2ae5b0b61df3d5eacc6ac
https://github.com/scummvm/scummvm/commit/2aa5de81b47b4c6ebef2ae5b0b61df3d5eacc6ac
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Chain MovementSet constructors
Changed paths:
engines/crab/ai/movement.h
diff --git a/engines/crab/ai/movement.h b/engines/crab/ai/movement.h
index 0ae977f5882..7f08f71227c 100644
--- a/engines/crab/ai/movement.h
+++ b/engines/crab/ai/movement.h
@@ -74,8 +74,7 @@ struct MovementSet {
_enabled = false;
}
- MovementSet(rapidxml::xml_node<char> *node) {
- _cur = 0;
+ MovementSet(rapidxml::xml_node<char> *node) : MovementSet() {
load(node);
}
Commit: 00b3d76f433bb4adf0ea509c0941b5c35e8ef46d
https://github.com/scummvm/scummvm/commit/00b3d76f433bb4adf0ea509c0941b5c35e8ef46d
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Fix unitialized member in InputManager warning
Changed paths:
engines/crab/input/input.h
diff --git a/engines/crab/input/input.h b/engines/crab/input/input.h
index 2a097ebdc5e..cf03d73455c 100644
--- a/engines/crab/input/input.h
+++ b/engines/crab/input/input.h
@@ -104,6 +104,7 @@ class InputManager {
public:
InputManager() {
_version = 0;
+ _keyMode = KBM_GAME;
clearInputs();
}
Commit: 46730836c2604f24195356776a446ab5736e3a20
https://github.com/scummvm/scummvm/commit/46730836c2604f24195356776a446ab5736e3a20
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Initialize delay to 0 in Movement constructor
Changed paths:
engines/crab/ai/movement.h
diff --git a/engines/crab/ai/movement.h b/engines/crab/ai/movement.h
index 7f08f71227c..41a3b34b50c 100644
--- a/engines/crab/ai/movement.h
+++ b/engines/crab/ai/movement.h
@@ -49,6 +49,7 @@ struct MovementSet {
Movement(rapidxml::xml_node<char> *node) {
_target.load(node);
+ _delay = 0;
loadNum(_delay, "delay", node);
}
};
Commit: 063484c9a36586165411ade5fc2d66850a5295e8
https://github.com/scummvm/scummvm/commit/063484c9a36586165411ade5fc2d66850a5295e8
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Initialize all values correctly by calling reset() in Cursor constructor
Changed paths:
engines/crab/input/cursor.h
diff --git a/engines/crab/input/cursor.h b/engines/crab/input/cursor.h
index 6980061144e..fe746ec2843 100644
--- a/engines/crab/input/cursor.h
+++ b/engines/crab/input/cursor.h
@@ -69,6 +69,7 @@ public:
_pressed = false;
_insideHud = false;
_hover = false;
+ reset();
}
~Cursor() {}
Commit: 90a98c8a93d9fea2f7fccf520f5afdd3e02b7e6b
https://github.com/scummvm/scummvm/commit/90a98c8a93d9fea2f7fccf520f5afdd3e02b7e6b
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Fix unitialized member in AlphaImage
Changed paths:
engines/crab/ui/AlphaImage.h
diff --git a/engines/crab/ui/AlphaImage.h b/engines/crab/ui/AlphaImage.h
index 663163d203c..fb7600f802f 100644
--- a/engines/crab/ui/AlphaImage.h
+++ b/engines/crab/ui/AlphaImage.h
@@ -68,6 +68,7 @@ class AlphaImage {
public:
AlphaImage() {}
AlphaImage(rapidxml::xml_node<char> *node) {
+ _img = 0;
load(node);
}
Commit: 01495f32fee341a576ee4b66f5e14fba065b73d3
https://github.com/scummvm/scummvm/commit/01495f32fee341a576ee4b66f5e14fba065b73d3
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Initialize state to GAME in Game constructor
Changed paths:
engines/crab/game.h
diff --git a/engines/crab/game.h b/engines/crab/game.h
index b1f3fd36848..895f2dbc9fa 100644
--- a/engines/crab/game.h
+++ b/engines/crab/game.h
@@ -119,7 +119,7 @@ private:
}
public:
- Game() : _isInited(false) {}
+ Game() : _isInited(false), _state(STATE_GAME) {}
void init(const Common::String &filename);
Commit: 4a31e62d94507bb08254d2115fdcd540c88b8a7c
https://github.com/scummvm/scummvm/commit/4a31e62d94507bb08254d2115fdcd540c88b8a7c
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Chain trait constructors
Changed paths:
engines/crab/people/trait.h
diff --git a/engines/crab/people/trait.h b/engines/crab/people/trait.h
index fc347a163d8..e0f9f50ea25 100644
--- a/engines/crab/people/trait.h
+++ b/engines/crab/people/trait.h
@@ -61,7 +61,7 @@ struct Trait {
_img = 0;
_unread = true;
}
- Trait(rapidxml::xml_node<char> *node) {
+ Trait(rapidxml::xml_node<char> *node) : Trait() {
load(node);
}
Commit: c8f72d6fa4e6ee040c54c5bc4f831ef7b19d98be
https://github.com/scummvm/scummvm/commit/c8f72d6fa4e6ee040c54c5bc4f831ef7b19d98be
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Fix unitialized members warning generated by Coverity in crab.cpp
Changed paths:
engines/crab/crab.cpp
diff --git a/engines/crab/crab.cpp b/engines/crab/crab.cpp
index b8816b8d223..0bd7deb65ec 100644
--- a/engines/crab/crab.cpp
+++ b/engines/crab/crab.cpp
@@ -40,6 +40,10 @@ CrabEngine *g_engine;
CrabEngine::CrabEngine(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst),
_gameDescription(gameDesc), _randomSource("Crab") {
+ _app = nullptr;
+ _thumbnail = nullptr;
+ _debugDraw = 0;
+
g_engine = this;
}
Commit: 2886d6be68f7e1fe1a26e081aafb787d3b885c3c
https://github.com/scummvm/scummvm/commit/2886d6be68f7e1fe1a26e081aafb787d3b885c3c
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Chain AnimationEffect constructors
Changed paths:
engines/crab/animation/AnimationEffect.h
engines/crab/ui/FileData.cpp
diff --git a/engines/crab/animation/AnimationEffect.h b/engines/crab/animation/AnimationEffect.h
index d88918173c9..8b5c3abdc64 100644
--- a/engines/crab/animation/AnimationEffect.h
+++ b/engines/crab/animation/AnimationEffect.h
@@ -69,7 +69,7 @@ struct AnimationEffect {
_finish = 0;
}
- AnimationEffect(rapidxml::xml_node<char> *node) {
+ AnimationEffect(rapidxml::xml_node<char> *node) : AnimationEffect() {
if (nodeValid("effect", node)) {
rapidxml::xml_node<char> *effnode = node->first_node("effect");
loadNum(_start, "start", effnode);
diff --git a/engines/crab/ui/FileData.cpp b/engines/crab/ui/FileData.cpp
index 8c39ec255aa..39f4f860b55 100644
--- a/engines/crab/ui/FileData.cpp
+++ b/engines/crab/ui/FileData.cpp
@@ -40,6 +40,7 @@ using namespace pyrodactyl::ui;
SaveFileData::SaveFileData(const Common::String &file) {
_path = file;
+ _blank = true;
// Extract String between _ and . For eg., CRAB_Autosave 1.unr -> Autosave 1
// 4 => .unr
Commit: 56376e6d632480fcdef4a891d166fcc0c3530212
https://github.com/scummvm/scummvm/commit/56376e6d632480fcdef4a891d166fcc0c3530212
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Fix alpha value of invalid color not being initialized
Changed paths:
engines/crab/text/color.h
diff --git a/engines/crab/text/color.h b/engines/crab/text/color.h
index d8fdaab7a1d..e78cff048b8 100644
--- a/engines/crab/text/color.h
+++ b/engines/crab/text/color.h
@@ -53,6 +53,7 @@ public:
_invalid.r = 255;
_invalid.g = 0;
_invalid.b = 220;
+ _invalid.a = 255;
}
Color &get(const int &num);
Commit: 5e7a3aeefe5b30a7c3d83f841f5d8f822a33f46b
https://github.com/scummvm/scummvm/commit/5e7a3aeefe5b30a7c3d83f841f5d8f822a33f46b
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Explicitly mark where return values are ignored
Changed paths:
engines/crab/ui/Inventory.cpp
engines/crab/ui/MapMarkerMenu.cpp
engines/crab/ui/PersonHandler.cpp
diff --git a/engines/crab/ui/Inventory.cpp b/engines/crab/ui/Inventory.cpp
index 2bbefa31538..3566e5888e5 100644
--- a/engines/crab/ui/Inventory.cpp
+++ b/engines/crab/ui/Inventory.cpp
@@ -105,7 +105,7 @@ void Inventory::draw(Person &obj, const int &moneyVal) {
//------------------------------------------------------------------------
void Inventory::handleEvents(const Common::String &string, const Common::Event &event) {
_collection.handleEvents(string, event);
- _money.handleEvents(event);
+ (void)_money.handleEvents(event);
}
//------------------------------------------------------------------------
diff --git a/engines/crab/ui/MapMarkerMenu.cpp b/engines/crab/ui/MapMarkerMenu.cpp
index f77980e8c48..9f7f9fa495f 100644
--- a/engines/crab/ui/MapMarkerMenu.cpp
+++ b/engines/crab/ui/MapMarkerMenu.cpp
@@ -83,7 +83,8 @@ void MapMarkerMenu::draw(const Element &pos, const Vector2i &player_pos, const R
//------------------------------------------------------------------------
void MapMarkerMenu::handleEvents(const Element &pos, const Vector2i &playerPos, const Rect &camera, const Common::Event &event) {
if (playerPos.x >= camera.x && playerPos.y >= camera.y)
- _player.handleEvents(event, pos.x + playerPos.x - camera.x + _offset._player.x, pos.y + playerPos.y - camera.y + _offset._player.y);
+ (void)_player.handleEvents(event, pos.x + playerPos.x - camera.x + _offset._player.x,
+ pos.y + playerPos.y - camera.y + _offset._player.y);
int choice = _menu.handleEvents(event, pos.x - camera.x + _offset._marker.x, pos.y - camera.y + _offset._marker.y);
if (choice != -1) {
diff --git a/engines/crab/ui/PersonHandler.cpp b/engines/crab/ui/PersonHandler.cpp
index ed44c733f9d..68d44984492 100644
--- a/engines/crab/ui/PersonHandler.cpp
+++ b/engines/crab/ui/PersonHandler.cpp
@@ -110,9 +110,9 @@ void PersonHandler::draw(pyrodactyl::event::Info &info, pyrodactyl::event::GameE
}
bool PersonHandler::handleCommonEvents(const Common::Event &event) {
- _opinion[OPI_LIKE].handleEvents(event);
- _opinion[OPI_RESPECT].handleEvents(event);
- _opinion[OPI_FEAR].handleEvents(event);
+ (void)_opinion[OPI_LIKE].handleEvents(event);
+ (void)_opinion[OPI_RESPECT].handleEvents(event);
+ (void)_opinion[OPI_FEAR].handleEvents(event);
if (_jb.handleEvents(event) == BUAC_LCLICK) {
// User wants to open their journal
Commit: 1bea775e95b3d364150dc6e9b8002c95d98689bb
https://github.com/scummvm/scummvm/commit/1bea775e95b3d364150dc6e9b8002c95d98689bb
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Use & with auto where possible
Changed paths:
engines/crab/TMX/TMXMap.cpp
engines/crab/ui/HealthIndicator.cpp
diff --git a/engines/crab/TMX/TMXMap.cpp b/engines/crab/TMX/TMXMap.cpp
index 6084aec0e1f..06f6837840a 100644
--- a/engines/crab/TMX/TMXMap.cpp
+++ b/engines/crab/TMX/TMXMap.cpp
@@ -276,7 +276,7 @@ void TMXMap::drawDebug(const Rect &camera) {
}
}
- for (auto i : _layer)
+ for (auto &i : _layer)
i._pos.draw(-camera.x, -camera.y, 254, 216, 0);
_areaWalk.draw(-camera.x, -camera.y, 254, 254, 254, 254);
diff --git a/engines/crab/ui/HealthIndicator.cpp b/engines/crab/ui/HealthIndicator.cpp
index 2cc83accfc2..2dd6278251f 100644
--- a/engines/crab/ui/HealthIndicator.cpp
+++ b/engines/crab/ui/HealthIndicator.cpp
@@ -51,7 +51,7 @@ void HealthIndicator::load(rapidxml::xml_node<char> *node) {
}
void HealthIndicator::draw(int num) {
- for (auto i : _img)
+ for (const auto &i : _img)
if (num == i._val) {
using namespace pyrodactyl::image;
g_engine->_imageManager->draw(_x, _y, i._normal);
Commit: 2dc04959f9c4b5c3256426b5158084882eb0b69d
https://github.com/scummvm/scummvm/commit/2dc04959f9c4b5c3256426b5158084882eb0b69d
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Mark some functions in TMXMap as const member functions
Changed paths:
engines/crab/TMX/TMXMap.h
diff --git a/engines/crab/TMX/TMXMap.h b/engines/crab/TMX/TMXMap.h
index 60a03829696..4643944d295 100644
--- a/engines/crab/TMX/TMXMap.h
+++ b/engines/crab/TMX/TMXMap.h
@@ -129,15 +129,15 @@ public:
return _h;
}
- const Rect &areaWalk() {
+ const Rect &areaWalk() const {
return _areaWalk;
}
- const Common::Array<Shape> &areaNoWalk() {
+ const Common::Array<Shape> &areaNoWalk() const {
return _areaNowalk;
}
- const Common::Array<pyrodactyl::level::Stairs> &areaStairs() {
+ const Common::Array<pyrodactyl::level::Stairs> &areaStairs() const {
return _areaStairs;
}
};
Commit: aa073516e98eb3a24e963954a1ad1e18c30e5793
https://github.com/scummvm/scummvm/commit/aa073516e98eb3a24e963954a1ad1e18c30e5793
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Pass arguments by ref in PathfindingGrid::setupNodes()
Changed paths:
engines/crab/PathfindingGrid.cpp
engines/crab/PathfindingGrid.h
diff --git a/engines/crab/PathfindingGrid.cpp b/engines/crab/PathfindingGrid.cpp
index cc56f8d63df..05a92ba826b 100644
--- a/engines/crab/PathfindingGrid.cpp
+++ b/engines/crab/PathfindingGrid.cpp
@@ -67,7 +67,7 @@ void PathfindingGrid::reset() {
_cellSize.y = 0.0;
}
-void PathfindingGrid::setupNodes(TMX::TMXMap map) {
+void PathfindingGrid::setupNodes(const TMX::TMXMap &map) {
// delete nodes if they exist
reset();
diff --git a/engines/crab/PathfindingGrid.h b/engines/crab/PathfindingGrid.h
index e0e6369bc35..49d0533b4ad 100644
--- a/engines/crab/PathfindingGrid.h
+++ b/engines/crab/PathfindingGrid.h
@@ -68,7 +68,7 @@ public:
void reset();
- void setupNodes(TMX::TMXMap map);
+ void setupNodes(const TMX::TMXMap &map);
// Return the node at the given point (SZ)
PathfindingGraphNode *getNodeAtPoint(Vector2f point);
Commit: da1571afa499e61432f90df59b9d81fea438f799
https://github.com/scummvm/scummvm/commit/da1571afa499e61432f90df59b9d81fea438f799
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Fix potential out-of-bounds access
Changed paths:
engines/crab/game.cpp
diff --git a/engines/crab/game.cpp b/engines/crab/game.cpp
index 15d98cbfe92..8e976d32454 100644
--- a/engines/crab/game.cpp
+++ b/engines/crab/game.cpp
@@ -673,8 +673,12 @@ void Game::loadState(Common::SeekableReadStream *stream) {
loadGame();
Common::String data = stream->readString();
+ uint64 end = data.findLastOf(">");
+ if (end == Common::String::npos)
+ error("Invalid save file");
+
// +1 to include > as well
- size_t end = data.findLastOf(">") + 1;
+ end++;
uint8 *dataC = new uint8[end + 1];
dataC[end] = '\0';
Commit: beeda4fa7f07e181c15714c949c8a1dc37ec2a1b
https://github.com/scummvm/scummvm/commit/beeda4fa7f07e181c15714c949c8a1dc37ec2a1b
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Chain AnimationFrame constructors
Changed paths:
engines/crab/animation/AnimationFrame.cpp
diff --git a/engines/crab/animation/AnimationFrame.cpp b/engines/crab/animation/AnimationFrame.cpp
index dd56112d164..8aec5cc5ac6 100644
--- a/engines/crab/animation/AnimationFrame.cpp
+++ b/engines/crab/animation/AnimationFrame.cpp
@@ -36,12 +36,13 @@ namespace Crab {
using namespace pyrodactyl::image;
using namespace pyrodactyl::anim;
-AnimationFrame::AnimationFrame(rapidxml::xml_node<char> *node) : _eff(node) {
+AnimationFrame::AnimationFrame(rapidxml::xml_node<char> *node) : AnimationFrame() {
+ _eff = AnimationEffect(node);
Vector2i::load(node);
loadImgKey(_img, "img", node);
loadNum(_start, "start", node);
loadNum(_finish, "finish", node);
- //loadColor(col, node);
+ loadColor(_col, node);
if (nodeValid("text", node, false))
_text.load(node->first_node("text"));
Commit: a65053eae0d3ed41fb1e075a6ce4ffe4d9d50e4e
https://github.com/scummvm/scummvm/commit/a65053eae0d3ed41fb1e075a6ce4ffe4d9d50e4e
Author: hax0kartik (agarwala.kartik at gmail.com)
Date: 2023-08-11T11:17:18+02:00
Commit Message:
CRAB: Properly initialize all class members in RapidXML code
Changed paths:
engines/crab/rapidxml/rapidxml.hpp
diff --git a/engines/crab/rapidxml/rapidxml.hpp b/engines/crab/rapidxml/rapidxml.hpp
index 781402d4540..9892113b75d 100644
--- a/engines/crab/rapidxml/rapidxml.hpp
+++ b/engines/crab/rapidxml/rapidxml.hpp
@@ -1,8 +1,9 @@
#ifndef RAPIDXML_HPP_INCLUDED
#define RAPIDXML_HPP_INCLUDED
-// The file below has been edited to clean-up the includes as necessiated by ScummVM.
+// The file below has been edited to clean up the includes as necessitated by ScummVM.
// Notably, code which was dependent on exception header has been removed.
+// Modifications to constructors have been made to properly initialize all class/struct members
// Copyright (C) 2006, 2009 Marcin Kalicinski
// Version 1.13
@@ -592,6 +593,8 @@ namespace rapidxml
xml_base()
: m_name(0)
, m_value(0)
+ , m_name_size(0)
+ , m_value_size(0)
, m_parent(0)
{
}
@@ -741,6 +744,8 @@ namespace rapidxml
//! Constructs an empty attribute with the specified type.
//! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
xml_attribute()
+ : m_prev_attribute(0)
+ , m_next_attribute(0)
{
}
@@ -832,7 +837,11 @@ namespace rapidxml
xml_node(node_type type)
: m_type(type)
, m_first_node(0)
+ , m_last_node(0)
, m_first_attribute(0)
+ , m_last_attribute(0)
+ , m_prev_sibling(0)
+ , m_next_sibling(0)
{
}
More information about the Scummvm-git-logs
mailing list