[Scummvm-git-logs] scummvm master -> ad6f9ce17ea788c43b65757f49d8e414659ec49c
mduggan
noreply at scummvm.org
Mon Dec 11 10:00:59 UTC 2023
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:
ab45be25fe ULTIMA: NUVIE: Initialize all members identified by coverity
cb1ce77b0b ULTIMA4: Fix extra copies identified by coverity
ad6f9ce17e ULTIMA: NUVIE: Fix extra copies identified by coverity
Commit: ab45be25fe1de3137865ece395f954bb4edd5829
https://github.com/scummvm/scummvm/commit/ab45be25fe1de3137865ece395f954bb4edd5829
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-12-11T20:37:36+11:00
Commit Message:
ULTIMA: NUVIE: Initialize all members identified by coverity
Changed paths:
engines/ultima/nuvie/actors/actor.cpp
engines/ultima/nuvie/gui/widgets/command_bar.cpp
diff --git a/engines/ultima/nuvie/actors/actor.cpp b/engines/ultima/nuvie/actors/actor.cpp
index 9397a5857ca..886dd979d0b 100644
--- a/engines/ultima/nuvie/actors/actor.cpp
+++ b/engines/ultima/nuvie/actors/actor.cpp
@@ -56,7 +56,8 @@ Actor::Actor(Map *m, ObjManager *om, GameClock *c)
talk_flags(0), obj_flags(0), body_armor_class(0), readied_armor_class(0),
custom_tile_tbl(nullptr), id_n(0), x(0), y(0), z(0), obj_n(0), frame_n(0),
base_obj_n(0), old_frame_n(0), movement_flags(0), strength(0), dex(0),
- intelligence(0), hp(0), level(0), magic(0), combat_mode(0), _clock(c) {
+ intelligence(0), hp(0), level(0), exp(0), magic(0), combat_mode(0),
+ _clock(c) {
memset(readied_objects, 0, sizeof(readied_objects));
clear_error();
}
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar.cpp b/engines/ultima/nuvie/gui/widgets/command_bar.cpp
index 32bc550020b..06de0dc88b0 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar.cpp
+++ b/engines/ultima/nuvie/gui/widgets/command_bar.cpp
@@ -88,6 +88,8 @@ CommandBar::CommandBar() : GUI_Widget(nullptr), game(nullptr), event(nullptr),
background(nullptr), font(nullptr), selected_action(-1), offset(0),
combat_mode(false), bg_color(0), font_color(0), active_action_num(-1),
lever_up(nullptr), lever_down(nullptr) {
+ for (int i = 0; i < ARRAYSIZE(icon); i++)
+ icon[i] = nullptr;
}
CommandBar::CommandBar(Game *g) : GUI_Widget(nullptr), game(g),
Commit: cb1ce77b0b31d5c0d8600e9d6d1a376fa6ffd424
https://github.com/scummvm/scummvm/commit/cb1ce77b0b31d5c0d8600e9d6d1a376fa6ffd424
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-12-11T20:59:52+11:00
Commit Message:
ULTIMA4: Fix extra copies identified by coverity
Changed paths:
engines/ultima/ultima4/map/shrine.cpp
engines/ultima/ultima4/map/shrine.h
engines/ultima/ultima4/views/menuitem.cpp
engines/ultima/ultima4/views/menuitem.h
diff --git a/engines/ultima/ultima4/map/shrine.cpp b/engines/ultima/ultima4/map/shrine.cpp
index 9ba4bfdf675..57b9a1f03c7 100644
--- a/engines/ultima/ultima4/map/shrine.cpp
+++ b/engines/ultima/ultima4/map/shrine.cpp
@@ -105,7 +105,7 @@ void Shrine::setVirtue(Virtue v) {
_virtue = v;
}
-void Shrine::setMantra(Common::String m) {
+void Shrine::setMantra(const Common::String &m) {
_mantra = m;
}
diff --git a/engines/ultima/ultima4/map/shrine.h b/engines/ultima/ultima4/map/shrine.h
index 0a86559a7cd..5e776ffc500 100644
--- a/engines/ultima/ultima4/map/shrine.h
+++ b/engines/ultima/ultima4/map/shrine.h
@@ -42,7 +42,7 @@ public:
Common::String getMantra() const;
void setVirtue(Virtue v);
- void setMantra(Common::String mantra);
+ void setMantra(const Common::String &mantra);
/**
* Enter the shrine
diff --git a/engines/ultima/ultima4/views/menuitem.cpp b/engines/ultima/ultima4/views/menuitem.cpp
index 7ebd2776183..1b0452b5760 100644
--- a/engines/ultima/ultima4/views/menuitem.cpp
+++ b/engines/ultima/ultima4/views/menuitem.cpp
@@ -27,7 +27,7 @@
namespace Ultima {
namespace Ultima4 {
-MenuItem::MenuItem(Common::String t, short x, short y, int sc) :
+MenuItem::MenuItem(const Common::String &t, short x, short y, int sc) :
_id(-1), _x(x), _y(y), _text(t), _highlighted(false),
_selected(false), _visible(true), _scOffset(sc), _closesMenu(false) {
// if the sc/scOffset is outside the range of the text string, assert
@@ -78,7 +78,7 @@ void MenuItem::setY(int y) {
_y = y;
}
-void MenuItem::setText(Common::String t) {
+void MenuItem::setText(const Common::String &t) {
_text = t;
}
@@ -102,7 +102,7 @@ void MenuItem::setClosesMenu(bool closesMenu) {
this->_closesMenu = closesMenu;
}
-BoolMenuItem::BoolMenuItem(Common::String text, short xp, short yp, int shortcutKey, bool *val) :
+BoolMenuItem::BoolMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, bool *val) :
MenuItem(text, xp, yp, shortcutKey),
_val(val),
_on("On"),
@@ -128,7 +128,7 @@ void BoolMenuItem::activate(MenuEvent &event) {
*_val = !(*_val);
}
-StringMenuItem::StringMenuItem(Common::String text, short xp, short yp, int shortcutKey,
+StringMenuItem::StringMenuItem(const Common::String &text, short xp, short yp, int shortcutKey,
Common::String *val, const Std::vector<Common::String> &validSettings) :
MenuItem(text, xp, yp, shortcutKey),
_val(val),
@@ -164,7 +164,7 @@ void StringMenuItem::activate(MenuEvent &event) {
}
}
-IntMenuItem::IntMenuItem(Common::String text, short xp, short yp, int shortcutKey, int *val,
+IntMenuItem::IntMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, int *val,
int min, int max, int increment, menuOutputType output) :
MenuItem(text, xp, yp, shortcutKey),
_val(val),
diff --git a/engines/ultima/ultima4/views/menuitem.h b/engines/ultima/ultima4/views/menuitem.h
index 1991e02f020..fd195ce255c 100644
--- a/engines/ultima/ultima4/views/menuitem.h
+++ b/engines/ultima/ultima4/views/menuitem.h
@@ -49,7 +49,7 @@ public:
/**
* MenuItem class
*/
- MenuItem(Common::String text, short x, short y, int shortcutKey = -1);
+ MenuItem(const Common::String &text, short x, short y, int shortcutKey = -1);
virtual ~MenuItem() {}
virtual void activate(MenuEvent &event) {}
@@ -70,7 +70,7 @@ public:
void setId(int id);
void setX(int x);
void setY(int y);
- void setText(Common::String text);
+ void setText(const Common::String &text);
void setHighlighted(bool h = true);
void setSelected(bool s = true);
void setVisible(bool v = true);
@@ -95,7 +95,7 @@ protected:
*/
class BoolMenuItem : public MenuItem {
public:
- BoolMenuItem(Common::String text, short xp, short yp, int shortcutKey, bool *val);
+ BoolMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, bool *val);
BoolMenuItem *setValueStrings(const Common::String &onString, const Common::String &offString);
@@ -113,7 +113,7 @@ protected:
*/
class StringMenuItem : public MenuItem {
public:
- StringMenuItem(Common::String text, short xp, short yp, int shortcutKey, Common::String *val, const Std::vector<Common::String> &validSettings);
+ StringMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, Common::String *val, const Std::vector<Common::String> &validSettings);
void activate(MenuEvent &event) override;
Common::String getText() const override;
@@ -129,7 +129,7 @@ protected:
*/
class IntMenuItem : public MenuItem {
public:
- IntMenuItem(Common::String text, short xp, short yp, int shortcutKey, int *val, int min, int max, int increment, menuOutputType output = MENU_OUTPUT_INT);
+ IntMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, int *val, int min, int max, int increment, menuOutputType output = MENU_OUTPUT_INT);
void activate(MenuEvent &event) override;
Common::String getText() const override;
Commit: ad6f9ce17ea788c43b65757f49d8e414659ec49c
https://github.com/scummvm/scummvm/commit/ad6f9ce17ea788c43b65757f49d8e414659ec49c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-12-11T21:00:20+11:00
Commit Message:
ULTIMA: NUVIE: Fix extra copies identified by coverity
Changed paths:
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/effect.h
engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index bfa3d4a4a57..284a2a89ff0 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -237,11 +237,11 @@ ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, MapCoord targ
init(tileNum, start, t, speed, trailFlag, initialTileRotation, rotationAmount, src_y_offset);
}
-ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, vector<MapCoord> t, uint8 speed, bool trailFlag, uint16 initialTileRotation) {
+ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation) {
init(tileNum, start, t, speed, trailFlag, initialTileRotation, 0, 0);
}
-void ProjectileEffect::init(uint16 tileNum, MapCoord start, vector<MapCoord> t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
+void ProjectileEffect::init(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
finished_tiles = 0;
tile_num = tileNum;
diff --git a/engines/ultima/nuvie/core/effect.h b/engines/ultima/nuvie/core/effect.h
index 0ac7aa8f281..0e6c6dd8e5c 100644
--- a/engines/ultima/nuvie/core/effect.h
+++ b/engines/ultima/nuvie/core/effect.h
@@ -141,9 +141,9 @@ public:
finished_tiles(0) {
}
ProjectileEffect(uint16 tileNum, MapCoord start, MapCoord target, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
- ProjectileEffect(uint16 tileNum, MapCoord start, vector<MapCoord> t, uint8 speed, bool trailFlag, uint16 initialTileRotation);
+ ProjectileEffect(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation);
- void init(uint16 tileNum, MapCoord start, vector<MapCoord> t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
+ void init(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
uint16 callback(uint16 msg, CallBack *caller, void *data) override;
diff --git a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
index 9c60568cf84..98a07279aca 100644
--- a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
+++ b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
@@ -59,7 +59,7 @@ private:
Audio::RewindableAudioStream *_currentStream;
public:
- RandomCollectionAudioStreamImpl(int rate, bool stereo, Std::vector<Audio::RewindableAudioStream *> streams, DisposeAfterUse::Flag disposeAfterUse)
+ RandomCollectionAudioStreamImpl(int rate, bool stereo, const Std::vector<Audio::RewindableAudioStream *> &streams, DisposeAfterUse::Flag disposeAfterUse)
: _rate(rate), _stereo(stereo), _finished(false), _streams(streams), _disposeAfterUse(disposeAfterUse) {
if (_streams.size() > 0)
_currentStream = _streams[NUVIE_RAND() % _streams.size()];
More information about the Scummvm-git-logs
mailing list