[Scummvm-git-logs] scummvm master -> ff9571208da2f931d6a4f89e51c974b647e6ab58
mduggan
mgithub at guarana.org
Thu Oct 29 01:23:10 UTC 2020
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:
9219ef6484 ULTIMA8: Reduce hard-coding of array sizes
7fc60f9c02 ULTIMA8: tiny cleanup of glob egg
ff9571208d ULTIMA8: Remove extra underscores on variable names
Commit: 9219ef6484e4ba6c2d354766e95269ce3d4ca1f2
https://github.com/scummvm/scummvm/commit/9219ef6484e4ba6c2d354766e95269ce3d4ca1f2
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-29T10:21:46+09:00
Commit Message:
ULTIMA8: Reduce hard-coding of array sizes
Changed paths:
engines/ultima/ultima8/world/actors/surrender_process.cpp
engines/ultima/ultima8/world/fire_type.cpp
diff --git a/engines/ultima/ultima8/world/actors/surrender_process.cpp b/engines/ultima/ultima8/world/actors/surrender_process.cpp
index c4a9d0c68e..d5a4291803 100644
--- a/engines/ultima/ultima8/world/actors/surrender_process.cpp
+++ b/engines/ultima/ultima8/world/actors/surrender_process.cpp
@@ -45,11 +45,7 @@ static const uint16 SCIENTIST_SUR_SNDS[] = {0xe3, 0xe4, 0xec, 0xf6};
static const uint16 HARDHAT_SUR_SNDS[] = {0xde, 0xdf, 0x8a, 0x8b};
static const uint16 FEMALE_SUR_SNDS[] = {0xd6, 0xff, 0xd7};
-static const uint16 NUM_SUIT_SUR_SNDS = 5;
-static const uint16 NUM_CHEMSUIT_SUR_SNDS = 4;
-static const uint16 NUM_SCIENTIST_SUR_SNDS = 4;
-static const uint16 NUM_HARDHAT_SUR_SNDS = 4;
-static const uint16 NUM_FEMALE_SUR_SNDS = 3;
+#define RANDOM_ELEM(array) (array[getRandom() % ARRAYSIZE(array)])
SurrenderProcess::SurrenderProcess() : Process(), _playedSound(false) {
}
@@ -99,19 +95,19 @@ void SurrenderProcess::run() {
switch (a->getShape()) {
case 0x2f7: // suit
- soundno = SUIT_SUR_SNDS[getRandom() % NUM_SUIT_SUR_SNDS];
+ soundno = RANDOM_ELEM(SUIT_SUR_SNDS);
break;
case 0x2f5: // hardhat
- soundno = HARDHAT_SUR_SNDS[getRandom() % NUM_HARDHAT_SUR_SNDS];
+ soundno = RANDOM_ELEM(HARDHAT_SUR_SNDS);
break;
case 0x2f6: // chemsuit
- soundno = CHEMSUIT_SUR_SNDS[getRandom() % NUM_CHEMSUIT_SUR_SNDS];
+ soundno = RANDOM_ELEM(CHEMSUIT_SUR_SNDS);
break;
case 0x344: // chemsuit
- soundno = SCIENTIST_SUR_SNDS[getRandom() % NUM_SCIENTIST_SUR_SNDS];
+ soundno = RANDOM_ELEM(SCIENTIST_SUR_SNDS);
break;
case 0x597: // female office worker
- soundno = FEMALE_SUR_SNDS[getRandom() % NUM_FEMALE_SUR_SNDS];
+ soundno = RANDOM_ELEM(FEMALE_SUR_SNDS);
break;
}
diff --git a/engines/ultima/ultima8/world/fire_type.cpp b/engines/ultima/ultima8/world/fire_type.cpp
index 6e181b852f..6c6ca3674c 100644
--- a/engines/ultima/ultima8/world/fire_type.cpp
+++ b/engines/ultima/ultima8/world/fire_type.cpp
@@ -62,6 +62,8 @@ static const int16 FIRESOUND_7[] = { 0x48, 0x5 };
static const int16 FIRESHAPE_3[] = { 0x326, 0x320, 0x321 };
static const int16 FIRESHAPE_10[] = { 0x31c, 0x31f, 0x322 };
+#define RANDOM_ELEM(array) (array[getRandom() % ARRAYSIZE(array)])
+
void FireType::makeBulletSplashShapeAndPlaySound(int32 x, int32 y, int32 z) const {
int16 sfxno = 0;
int16 shape = 0;
@@ -71,15 +73,15 @@ void FireType::makeBulletSplashShapeAndPlaySound(int32 x, int32 y, int32 z) cons
case 1:
case 0xb:
shape = 0x1d8;
- sfxno = FIRESOUND_1[getRandom() % 6];
+ sfxno = RANDOM_ELEM(FIRESOUND_1);
break;
case 2:
shape = 0x1d8;
break;
case 3:
case 4:
- shape = FIRESHAPE_3[getRandom() % 3];
- sfxno = FIRESOUND_3[getRandom() % 3];
+ shape = RANDOM_ELEM(FIRESHAPE_3);
+ sfxno = RANDOM_ELEM(FIRESOUND_3);
break;
case 5:
shape = 0x573;
@@ -89,22 +91,22 @@ void FireType::makeBulletSplashShapeAndPlaySound(int32 x, int32 y, int32 z) cons
break;
case 7:
shape = 0x537;
- sfxno = FIRESOUND_7[getRandom() % 2];
+ sfxno = RANDOM_ELEM(FIRESOUND_7);
break;
case 10:
- shape = FIRESHAPE_10[getRandom() % 3];
- sfxno = FIRESOUND_3[getRandom() % 3];
+ shape = RANDOM_ELEM(FIRESHAPE_10);
+ sfxno = RANDOM_ELEM(FIRESOUND_3);
break;
case 0xd:
shape = 0x1d8;
- sfxno = FIRESOUND_1[getRandom() % 6];
+ sfxno = RANDOM_ELEM(FIRESOUND_1);
break;
case 0xe:
shape = 0x56b;
break;
case 0xf:
shape = 0x59b;
- sfxno = FIRESOUND_7[getRandom() % 2];
+ sfxno = RANDOM_ELEM(FIRESOUND_7);
break;
case 9:
default:
Commit: 7fc60f9c02af598362331a8c2cd3b1e9c5be0978
https://github.com/scummvm/scummvm/commit/7fc60f9c02af598362331a8c2cd3b1e9c5be0978
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-29T10:21:46+09:00
Commit Message:
ULTIMA8: tiny cleanup of glob egg
Changed paths:
engines/ultima/ultima8/world/glob_egg.cpp
diff --git a/engines/ultima/ultima8/world/glob_egg.cpp b/engines/ultima/ultima8/world/glob_egg.cpp
index 326d91d83e..f2e026c729 100644
--- a/engines/ultima/ultima8/world/glob_egg.cpp
+++ b/engines/ultima/ultima8/world/glob_egg.cpp
@@ -52,7 +52,7 @@ void GlobEgg::enterFastArea() {
}
// Expand it
- if (!(_flags & FLG_FASTAREA)) {
+ if (!hasFlags(FLG_FASTAREA)) {
const MapGlob *glob = GameData::get_instance()->getGlob(_quality);
if (!glob) return;
@@ -82,9 +82,7 @@ void GlobEgg::saveData(Common::WriteStream *ws) {
}
bool GlobEgg::loadData(Common::ReadStream *rs, uint32 version) {
- if (!Item::loadData(rs, version)) return false;
-
- return true;
+ return Item::loadData(rs, version);
}
} // End of namespace Ultima8
Commit: ff9571208da2f931d6a4f89e51c974b647e6ab58
https://github.com/scummvm/scummvm/commit/ff9571208da2f931d6a4f89e51c974b647e6ab58
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-29T10:21:46+09:00
Commit Message:
ULTIMA8: Remove extra underscores on variable names
These are mostly left over from Pentagram where they were used to avoid clashes
with member variables, but in ScummVM the underscore prefix takes care of that
problem for us.
Changed paths:
engines/ultima/ultima8/audio/audio_mixer.cpp
engines/ultima/ultima8/audio/raw_audio_sample.cpp
engines/ultima/ultima8/audio/speech_flex.cpp
engines/ultima/ultima8/conf/ini_file.cpp
engines/ultima/ultima8/filesys/flex_file.cpp
engines/ultima/ultima8/filesys/u8_save_file.cpp
engines/ultima/ultima8/games/game_info.cpp
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
engines/ultima/ultima8/graphics/fonts/jp_font.cpp
engines/ultima/ultima8/graphics/fonts/shape_font.cpp
engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
engines/ultima/ultima8/graphics/gump_shape_archive.h
engines/ultima/ultima8/graphics/main_shape_archive.h
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/graphics/shape.cpp
engines/ultima/ultima8/gumps/book_gump.cpp
engines/ultima/ultima8/gumps/book_gump.h
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.h
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/modal_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/readable_gump.cpp
engines/ultima/ultima8/gumps/scroll_gump.cpp
engines/ultima/ultima8/gumps/scroll_gump.h
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/gumps/slider_gump.cpp
engines/ultima/ultima8/gumps/target_gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/kernel/core_app.cpp
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/usecode/uc_process.h
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/animation_tracker.h
engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
engines/ultima/ultima8/world/actors/combat_process.cpp
engines/ultima/ultima8/world/actors/combat_process.h
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/main_actor.h
engines/ultima/ultima8/world/actors/pathfinder.cpp
engines/ultima/ultima8/world/actors/pathfinder.h
engines/ultima/ultima8/world/actors/pathfinder_process.cpp
engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
engines/ultima/ultima8/world/camera_process.cpp
engines/ultima/ultima8/world/destroy_item_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/split_item_process.cpp
diff --git a/engines/ultima/ultima8/audio/audio_mixer.cpp b/engines/ultima/ultima8/audio/audio_mixer.cpp
index f660fb5874..309a1ad345 100644
--- a/engines/ultima/ultima8/audio/audio_mixer.cpp
+++ b/engines/ultima/ultima8/audio/audio_mixer.cpp
@@ -84,7 +84,7 @@ void AudioMixer::reset() {
Unlock();
}
-int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool paused, uint32 pitch_shift_, int lvol, int rvol) {
+int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool paused, uint32 pitch_shift, int lvol, int rvol) {
int lowest = -1;
int lowprior = 65536;
@@ -104,7 +104,7 @@ int AudioMixer::playSample(AudioSample *sample, int loop, int priority, bool pau
}
if (i != CHANNEL_COUNT || lowprior < priority)
- _channels[lowest]->playSample(sample, loop, priority, paused, pitch_shift_, lvol, rvol);
+ _channels[lowest]->playSample(sample, loop, priority, paused, pitch_shift, lvol, rvol);
else
lowest = -1;
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.cpp b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
index cf63dda6e9..65598bf6ad 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
@@ -27,9 +27,9 @@
namespace Ultima {
namespace Ultima8 {
-RawAudioSample::RawAudioSample(const uint8 *buffer_, uint32 size, uint32 rate,
+RawAudioSample::RawAudioSample(const uint8 *buffer, uint32 size, uint32 rate,
bool signedData, bool stereo)
- : AudioSample(buffer_, size, 8, stereo, false), _signedData(signedData) {
+ : AudioSample(buffer, size, 8, stereo, false), _signedData(signedData) {
_sampleRate = rate;
_frameSize = 512;
_decompressorSize = sizeof(RawDecompData);
diff --git a/engines/ultima/ultima8/audio/speech_flex.cpp b/engines/ultima/ultima8/audio/speech_flex.cpp
index 8e8767094d..3bfe1b453f 100644
--- a/engines/ultima/ultima8/audio/speech_flex.cpp
+++ b/engines/ultima/ultima8/audio/speech_flex.cpp
@@ -100,15 +100,15 @@ uint32 SpeechFlex::getSpeechLength(const Std::string &phrase) {
int index = getIndexForPhrase(phrase, start, end);
if (!index) break;
- AudioSample *sample = getSample(index);
+ const AudioSample *sample = getSample(index);
if (!sample) break;
- uint32 samples_ = sample->getLength();
+ uint32 samples = sample->getLength();
uint32 rate = sample->getRate();
bool stereo = sample->isStereo();
if (stereo) rate *= 2;
- length += (samples_ * 1000) / rate;
+ length += (samples * 1000) / rate;
length += 33; // one engine frame of overhead between speech samples_
}
diff --git a/engines/ultima/ultima8/conf/ini_file.cpp b/engines/ultima/ultima8/conf/ini_file.cpp
index 911a4aa947..d8cfad9726 100644
--- a/engines/ultima/ultima8/conf/ini_file.cpp
+++ b/engines/ultima/ultima8/conf/ini_file.cpp
@@ -265,9 +265,9 @@ bool INIFile::readConfigString(string config) {
return true;
}
-void INIFile::clear(istring root_) {
+void INIFile::clear(istring root) {
_sections.clear();
- _root = root_;
+ _root = root;
_isFile = false;
_readOnly = false;
_filename = "";
@@ -438,14 +438,14 @@ void INIFile::unset(istring key) {
}
}
-void INIFile::listKeys(Std::set<istring> &_keys, istring section_,
+void INIFile::listKeys(Std::set<istring> &_keys, istring sectionName,
bool longformat) {
- if (!stripRoot(section_)) return;
+ if (!stripRoot(sectionName)) return;
- Section *section = getSection(section_);
+ const Section *section = getSection(sectionName);
if (!section) return;
- Std::list<KeyValue>::iterator i;
+ Std::list<KeyValue>::const_iterator i;
for (i = section->_keys.begin(); i != section->_keys.end(); ++i) {
istring k;
if (longformat)
@@ -457,8 +457,8 @@ void INIFile::listKeys(Std::set<istring> &_keys, istring section_,
}
}
-void INIFile::listSections(Std::set<istring> §ions_, bool longformat) {
- Std::list<Section>::iterator i;
+void INIFile::listSections(Std::set<istring> §ions, bool longformat) {
+ Std::list<Section>::const_iterator i;
for (i = _sections.begin(); i != _sections.end(); ++i) {
istring s;
if (longformat)
@@ -466,17 +466,17 @@ void INIFile::listSections(Std::set<istring> §ions_, bool longformat) {
else
s = i->_name;
- sections_.insert(s);
+ sections.insert(s);
}
}
-void INIFile::listKeyValues(KeyMap &keyvalues, istring section_, bool longformat) {
- if (!stripRoot(section_)) return;
+void INIFile::listKeyValues(KeyMap &keyvalues, istring sectionName, bool longformat) {
+ if (!stripRoot(sectionName)) return;
- Section *section = getSection(section_);
+ Section *section = getSection(sectionName);
if (!section) return;
- Std::list<KeyValue>::iterator i;
+ Std::list<KeyValue>::const_iterator i;
for (i = section->_keys.begin(); i != section->_keys.end(); ++i) {
istring k;
if (longformat)
diff --git a/engines/ultima/ultima8/filesys/flex_file.cpp b/engines/ultima/ultima8/filesys/flex_file.cpp
index 28df1dd140..453dcb6f47 100644
--- a/engines/ultima/ultima8/filesys/flex_file.cpp
+++ b/engines/ultima/ultima8/filesys/flex_file.cpp
@@ -27,7 +27,7 @@
namespace Ultima {
namespace Ultima8 {
-FlexFile::FlexFile(Common::SeekableReadStream *rs_) : _rs(rs_), _count(0) {
+FlexFile::FlexFile(Common::SeekableReadStream *rs) : _rs(rs), _count(0) {
_valid = isFlexFile(_rs);
if (_valid) {
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.cpp b/engines/ultima/ultima8/filesys/u8_save_file.cpp
index ff58a6b6be..2c7353b5a8 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.cpp
+++ b/engines/ultima/ultima8/filesys/u8_save_file.cpp
@@ -28,7 +28,7 @@
namespace Ultima {
namespace Ultima8 {
-U8SaveFile::U8SaveFile(Common::SeekableReadStream *rs_) : _rs(rs_), _count(0) {
+U8SaveFile::U8SaveFile(Common::SeekableReadStream *rs) : _rs(rs), _count(0) {
_valid = isU8SaveFile(_rs);
if (_valid)
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index 6205df2340..4dece4a0b1 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -185,7 +185,7 @@ void GameInfo::save(Common::WriteStream *ws) {
ws->write(d.c_str(), d.size());
}
-bool GameInfo::load(IDataSource *ids, uint32 version_) {
+bool GameInfo::load(IDataSource *ids, uint32 version) {
Std::string s;
Std::vector<Std::string> parts;
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index 3ac8c7e198..fe724881b5 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -42,7 +42,7 @@ namespace Ultima8 {
FontManager *FontManager::_fontManager = nullptr;
-FontManager::FontManager(bool ttf_antialiasing_) : _ttfAntialiasing(ttf_antialiasing_) {
+FontManager::FontManager(bool ttf_antialiasing) : _ttfAntialiasing(ttf_antialiasing) {
debugN(MM_INFO, "Creating Font Manager...\n");
_fontManager = this;
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
index 7a0004343d..f54804a5ea 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
@@ -33,15 +33,15 @@ class ShapeFont;
class FontShapeArchive : public ShapeArchive {
public:
- FontShapeArchive(uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(id_, pal_, format_) { }
- FontShapeArchive(ArchiveFile *af, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(af, id_, pal_, format_) { }
- FontShapeArchive(Common::SeekableReadStream *rs, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(rs, id_, pal_, format_) { }
+ FontShapeArchive(uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(id, pal, format) { }
+ FontShapeArchive(ArchiveFile *af, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(af, id, pal, format) { }
+ FontShapeArchive(Common::SeekableReadStream *rs, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(rs, id, pal, format) { }
~FontShapeArchive() override { }
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp b/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
index 00fa866b67..d95bd1fe5f 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/jp_font.cpp
@@ -31,8 +31,8 @@
namespace Ultima {
namespace Ultima8 {
-JPFont::JPFont(ShapeFont *jpfont, unsigned int fontnum_)
- : _fontNum(fontnum_), _shapeFont(jpfont) {
+JPFont::JPFont(ShapeFont *jpfont, unsigned int fontnum)
+ : _fontNum(fontnum), _shapeFont(jpfont) {
assert(_shapeFont->frameCount() > 256);
}
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp b/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
index db4d292cc6..0662e76db0 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/shape_font.cpp
@@ -30,12 +30,12 @@
namespace Ultima {
namespace Ultima8 {
-ShapeFont::ShapeFont(const uint8 *data_, uint32 size_,
+ShapeFont::ShapeFont(const uint8 *data, uint32 size,
const ConvertShapeFormat *format,
- const uint16 flexId_, const uint32 shapeNum_)
- : Font(), Shape(data_, size_, format, flexId_, shapeNum_),
+ const uint16 flexId, const uint32 shapeNum)
+ : Font(), Shape(data, size, format, flexId, shapeNum),
_height(0), _baseLine(0), _vLead(-1), _hLead(0) {
- _crusaderCharMap = GAME_IS_CRUSADER && shapeNum_ == 1;
+ _crusaderCharMap = GAME_IS_CRUSADER && shapeNum == 1;
}
ShapeFont::~ShapeFont() {
@@ -81,9 +81,9 @@ int ShapeFont::getBaselineSkip() {
return getHeight() + getVlead();
}
-void ShapeFont::getStringSize(const Std::string &text, int32 &width, int32 &height_) {
+void ShapeFont::getStringSize(const Std::string &text, int32 &width, int32 &height) {
width = _hLead;
- height_ = getHeight();
+ height = getHeight();
for (unsigned int i = 0; i < text.size(); ++i) {
if (text[i] == '\n' || text[i] == '\r') {
@@ -122,13 +122,13 @@ int ShapeFont::charToFrameNum(char c) const {
RenderedText *ShapeFont::renderText(const Std::string &text,
unsigned int &remaining,
- int32 width, int32 height_, TextAlign align,
+ int32 width, int32 height, TextAlign align,
bool u8specials,
Std::string::size_type cursor) {
int32 resultwidth, resultheight;
Std::list<PositionedText> lines;
lines = typesetText<Traits>(this, text, remaining,
- width, height_, align, u8specials,
+ width, height, align, u8specials,
resultwidth, resultheight, cursor);
return new ShapeRenderedText(lines, resultwidth, resultheight,
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
index 7c406339ff..e4b5e304a6 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.cpp
@@ -29,8 +29,8 @@
namespace Ultima {
namespace Ultima8 {
-TTFRenderedText::TTFRenderedText(Texture *texture_, int width, int height,
- int vLead, TTFont *font) : _texture(texture_), _font(font) {
+TTFRenderedText::TTFRenderedText(Texture *texture, int width, int height,
+ int vLead, TTFont *font) : _texture(texture), _font(font) {
_width = width;
_height = height;
_vLead = vLead;
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.h b/engines/ultima/ultima8/graphics/gump_shape_archive.h
index afb7822b92..702bd430fd 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.h
@@ -33,15 +33,15 @@ struct Rect;
class GumpShapeArchive : public ShapeArchive {
public:
- GumpShapeArchive(uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(id_, pal_, format_) { }
- GumpShapeArchive(ArchiveFile *af, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(af, id_, pal_, format_) { }
- GumpShapeArchive(Common::SeekableReadStream *rs, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(rs, id_, pal_, format_) { }
+ GumpShapeArchive(uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(id, pal, format) { }
+ GumpShapeArchive(ArchiveFile *af, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(af, id, pal, format) { }
+ GumpShapeArchive(Common::SeekableReadStream *rs, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(rs, id, pal, format) { }
~GumpShapeArchive() override;
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/graphics/main_shape_archive.h
index 4e5dbbf712..3a8dda9f59 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.h
@@ -37,15 +37,15 @@ class AnimAction;
class MainShapeArchive : public ShapeArchive {
public:
- MainShapeArchive(uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(id_, pal_, format_), _typeFlags(0), _animDat(0) { }
- MainShapeArchive(ArchiveFile *af, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(af, id_, pal_, format_), _typeFlags(0), _animDat(0) { }
- MainShapeArchive(Common::SeekableReadStream *rs, uint16 id_, Palette *pal_ = 0,
- const ConvertShapeFormat *format_ = 0)
- : ShapeArchive(rs, id_, pal_, format_), _typeFlags(0), _animDat(0) { }
+ MainShapeArchive(uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(id, pal, format), _typeFlags(0), _animDat(0) { }
+ MainShapeArchive(ArchiveFile *af, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(af, id, pal, format), _typeFlags(0), _animDat(0) { }
+ MainShapeArchive(Common::SeekableReadStream *rs, uint16 id, Palette *pal = 0,
+ const ConvertShapeFormat *format = 0)
+ : ShapeArchive(rs, id, pal, format), _typeFlags(0), _animDat(0) { }
~MainShapeArchive() override;
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
index 2ef44d484f..2a04af64e2 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
@@ -39,7 +39,7 @@ PaletteFaderProcess::PaletteFaderProcess() : Process(), _priority(0),
}
PaletteFaderProcess::PaletteFaderProcess(PalTransforms trans,
- int priority_, int frames) : _priority(priority_),
+ int priority, int frames) : _priority(priority),
_counter(frames), _maxCounter(frames) {
PaletteManager *pm = PaletteManager::get_instance();
Palette *pal = pm->getPalette(PaletteManager::Pal_Game);
@@ -69,7 +69,7 @@ PaletteFaderProcess::PaletteFaderProcess(uint32 col32, bool from,
}
PaletteFaderProcess::PaletteFaderProcess(const int16 from[12], const int16 to[12],
- int priority_, int frames) : _priority(priority_),
+ int priority, int frames) : _priority(priority),
_counter(frames), _maxCounter(frames) {
int i;
for (i = 0; i < 12; i++) _oldMatrix[i] = from[i];
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index a322d7cb95..44be2d4be7 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -225,22 +225,22 @@ const ConvertShapeFormat *Shape::DetectShapeFormat(const uint8 *data, uint32 siz
return Shape::DetectShapeFormat(&ds, size);
}
-const ConvertShapeFormat *Shape::DetectShapeFormat(IDataSource *ds, uint32 size_) {
+const ConvertShapeFormat *Shape::DetectShapeFormat(IDataSource *ds, uint32 size) {
const ConvertShapeFormat *ret = nullptr;
- if (ConvertShape::CheckUnsafe(ds, &PentagramShapeFormat, size_))
+ if (ConvertShape::CheckUnsafe(ds, &PentagramShapeFormat, size))
ret = &PentagramShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &U8SKFShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &U8SKFShapeFormat, size))
ret = &U8SKFShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &U8ShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &U8ShapeFormat, size))
ret = &U8ShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &U82DShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &U82DShapeFormat, size))
ret = &U82DShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &CrusaderShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &CrusaderShapeFormat, size))
ret = &CrusaderShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &Crusader2DShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &Crusader2DShapeFormat, size))
ret = &Crusader2DShapeFormat;
- else if (ConvertShape::CheckUnsafe(ds, &U8CMPShapeFormat, size_))
+ else if (ConvertShape::CheckUnsafe(ds, &U8CMPShapeFormat, size))
ret = &U8CMPShapeFormat;
return ret;
diff --git a/engines/ultima/ultima8/gumps/book_gump.cpp b/engines/ultima/ultima8/gumps/book_gump.cpp
index e229d7d6df..2b24ca918e 100644
--- a/engines/ultima/ultima8/gumps/book_gump.cpp
+++ b/engines/ultima/ultima8/gumps/book_gump.cpp
@@ -44,8 +44,8 @@ BookGump::BookGump()
}
-BookGump::BookGump(ObjId owner_, const Std::string &msg) :
- ModalGump(0, 0, 100, 100, owner_), _text(msg),
+BookGump::BookGump(ObjId owner, const Std::string &msg) :
+ ModalGump(0, 0, 100, 100, owner), _text(msg),
_textWidgetL(0), _textWidgetR(0) {
}
diff --git a/engines/ultima/ultima8/gumps/book_gump.h b/engines/ultima/ultima8/gumps/book_gump.h
index 2acd1da5d8..68b59e5799 100644
--- a/engines/ultima/ultima8/gumps/book_gump.h
+++ b/engines/ultima/ultima8/gumps/book_gump.h
@@ -41,7 +41,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
BookGump();
- BookGump(ObjId owner_, const Std::string &msg);
+ BookGump(ObjId owner, const Std::string &msg);
~BookGump() override;
// Go to the next page on mouse click
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index cd9145371b..136a8fbf35 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -195,9 +195,9 @@ bool ContainerGump::GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
int32 lerp_factor) {
Item *item = getItem(itemid);
if (!item) return false;
- Item *parent_ = item->getParentAsContainer();
- if (!parent_) return false;
- if (parent_->getObjId() != _owner) return false;
+ Item *parent = item->getParentAsContainer();
+ if (!parent) return false;
+ if (parent->getObjId() != _owner) return false;
//!!! need to use lerp_factor
@@ -484,10 +484,10 @@ void ContainerGump::DropItem(Item *item, int mx, int my) {
item->getQuality());
slidergump->InitGump(0);
slidergump->CreateNotifier(); // manually create notifier
- Process *notifier_ = slidergump->GetNotifyProcess();
+ Process *notifier = slidergump->GetNotifyProcess();
SplitItemProcess *splitproc = new SplitItemProcess(item, splittarget);
Kernel::get_instance()->addProcess(splitproc);
- splitproc->waitFor(notifier_);
+ splitproc->waitFor(notifier);
return;
}
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index d70da83391..bd098daaf4 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -100,24 +100,24 @@ void CreditsGump::Close(bool no_del) {
if (musicproc) musicproc->playMusic(0);
}
-void CreditsGump::extractLine(Std::string &text_,
+void CreditsGump::extractLine(Std::string &text,
char &modifier, Std::string &line) {
- if (!text_.empty() && (text_[0] == '+' || text_[0] == '&' || text_[0] == '}' ||
- text_[0] == '~' || text_[0] == '@')) {
- modifier = text_[0];
- text_.erase(0, 1);
+ if (!text.empty() && (text[0] == '+' || text[0] == '&' || text[0] == '}' ||
+ text[0] == '~' || text[0] == '@')) {
+ modifier = text[0];
+ text.erase(0, 1);
} else {
modifier = 0;
}
- if (text_.empty()) {
+ if (text.empty()) {
line = "";
return;
}
- Std::string::size_type starpos = text_.find('*');
+ Std::string::size_type starpos = text.find('*');
- line = text_.substr(0, starpos);
+ line = text.substr(0, starpos);
// replace '%%' by '%'.
// (Original interpreted these strings as format strings??)
@@ -127,7 +127,7 @@ void CreditsGump::extractLine(Std::string &text_,
}
if (starpos != Std::string::npos) starpos++;
- text_.erase(0, starpos);
+ text.erase(0, starpos);
}
@@ -358,17 +358,17 @@ void CreditsGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
if (h > 0)
surf->Blit(tex, 0, _currentY, 256, h, 32, 44);
- int y_ = h;
+ int y = h;
for (int i = 1; i < 4; i++) {
if (h == 156) break;
int s = (_currentSurface + i) % 4;
tex = _scroll[s]->GetSurfaceAsTexture();
h = _scrollHeight[s];
- if (h > 156 - y_) h = 156 - y_;
+ if (h > 156 - y) h = 156 - y;
if (h > 0)
- surf->Blit(tex, 0, 0, 256, h, 32, 44 + y_);
- y_ += h;
+ surf->Blit(tex, 0, 0, 256, h, 32, 44 + y);
+ y += h;
}
}
diff --git a/engines/ultima/ultima8/gumps/credits_gump.h b/engines/ultima/ultima8/gumps/credits_gump.h
index 8089cceadd..0809d8c633 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.h
+++ b/engines/ultima/ultima8/gumps/credits_gump.h
@@ -62,7 +62,7 @@ public:
protected:
- void extractLine(Std::string &text_, char &modifier, Std::string &line);
+ void extractLine(Std::string &text, char &modifier, Std::string &line);
Std::string _text;
int _parSkip;
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index 657406822b..8845fafcfc 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -194,7 +194,7 @@ void Gump::CloseItemDependents() {
}
}
-bool Gump::GetMouseCursor(int32 mx, int32 my, Shape &shape_, int32 &frame) {
+bool Gump::GetMouseCursor(int32 mx, int32 my, Shape &shape, int32 &frame) {
ParentToGump(mx, my);
bool ret = false;
@@ -210,7 +210,7 @@ bool Gump::GetMouseCursor(int32 mx, int32 my, Shape &shape_, int32 &frame) {
// It's got the point
if (g->PointOnGump(mx, my))
- ret = g->GetMouseCursor(mx, my, shape_, frame);
+ ret = g->GetMouseCursor(mx, my, shape, frame);
if (ret) break;
}
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index f6df969002..cd4efb696b 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -132,7 +132,7 @@ public:
//! If this gump doesn't want to set the cursor, the gump list will
//! attempt to get the cursor shape from the next lower gump.
//! \return true if this gump wants to set the cursor, false otherwise
- virtual bool GetMouseCursor(int32 mx, int32 my, Shape &shape_, int32 &frame);
+ virtual bool GetMouseCursor(int32 mx, int32 my, Shape &shape, int32 &frame);
// Notify gumps the render surface changed.
virtual void RenderSurfaceChanged();
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index 29b190ecfb..bcbb9943e2 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -52,9 +52,9 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(MenuGump)
-MenuGump::MenuGump(bool nameEntryMode_)
+MenuGump::MenuGump(bool nameEntryMode)
: ModalGump(0, 0, 5, 5, 0, FLAG_DONT_SAVE) {
- _nameEntryMode = nameEntryMode_;
+ _nameEntryMode = nameEntryMode;
Mouse *mouse = Mouse::get_instance();
mouse->pushMouseCursor();
@@ -136,8 +136,8 @@ void MenuGump::InitGump(Gump *newparent, bool take_focus) {
settingman->get("endgame", endgame);
settingman->get("quotes", quotes);
- int x_ = _dims.width() / 2 + 14;
- int y_ = 18;
+ int x = _dims.width() / 2 + 14;
+ int y = 18;
for (int i = 0; i < 8; ++i) {
if ((quotes || i != 6) && (endgame || i != 7)) {
FrameID frame_up(GameData::GUMPS, menuEntryShape, i * 2);
@@ -146,16 +146,16 @@ void MenuGump::InitGump(Gump *newparent, bool take_focus) {
frame_down = _TL_SHP_(frame_down);
Gump *widget;
if (frame_up._shapeNum) {
- widget = new ButtonWidget(x_, y_, frame_up, frame_down, true);
+ widget = new ButtonWidget(x, y, frame_up, frame_down, true);
} else {
// JA U8 has text labels
- widget = new ButtonWidget(x_, y_, _TL_(MENU_TXT[i]), true, 0);
+ widget = new ButtonWidget(x, y, _TL_(MENU_TXT[i]), true, 0);
}
widget->InitGump(this, false);
widget->SetIndex(i + 1);
}
- y_ += 14;
+ y += 14;
}
const MainActor *av = getMainActor();
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index 1518d8fe7e..82df0d0817 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -50,9 +50,9 @@ MessageBoxGump::MessageBoxGump()
}
-MessageBoxGump::MessageBoxGump(const Std::string &title, const Std::string &message_, uint32 titleColour,
+MessageBoxGump::MessageBoxGump(const Std::string &title, const Std::string &message, uint32 titleColour,
Std::vector<Std::string> *buttons) :
- ModalGump(0, 0, 100, 100), _title(title), _message(message_), _titleColour(titleColour) {
+ ModalGump(0, 0, 100, 100), _title(title), _message(message), _titleColour(titleColour) {
if (buttons)
buttons->swap(_buttons);
diff --git a/engines/ultima/ultima8/gumps/modal_gump.cpp b/engines/ultima/ultima8/gumps/modal_gump.cpp
index ef496c6320..684aea67ce 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.cpp
+++ b/engines/ultima/ultima8/gumps/modal_gump.cpp
@@ -70,10 +70,10 @@ bool ModalGump::PointOnGump(int mx, int my) {
}
uint16 ModalGump::TraceObjId(int32 mx, int32 my) {
- uint16 objId_ = Gump::TraceObjId(mx, my);
- if (!objId_) objId_ = getObjId();
+ uint16 objId = Gump::TraceObjId(mx, my);
+ if (!objId) objId = getObjId();
- return objId_;
+ return objId;
}
void ModalGump::Close(bool no_del) {
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index 03083b861e..3bd3bb53a4 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -87,9 +87,9 @@ PaperdollGump::PaperdollGump() : ContainerGump(), _statButtonId(0),
Common::fill(_cachedVal, _cachedVal + 7, 0);
}
-PaperdollGump::PaperdollGump(Shape *shape_, uint32 frameNum, uint16 owner,
+PaperdollGump::PaperdollGump(Shape *shape, uint32 frameNum, uint16 owner,
uint32 Flags, int32 layer)
- : ContainerGump(shape_, frameNum, owner, Flags, layer),
+ : ContainerGump(shape, frameNum, owner, Flags, layer),
_statButtonId(0), _backpackRect(49, 25, 59, 50) {
_statButtonId = 0;
diff --git a/engines/ultima/ultima8/gumps/readable_gump.cpp b/engines/ultima/ultima8/gumps/readable_gump.cpp
index 47fbef6b08..351cae6e12 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/readable_gump.cpp
@@ -57,9 +57,9 @@ ReadableGump::~ReadableGump(void) {
void ReadableGump::InitGump(Gump *newparent, bool take_focus) {
ModalGump::InitGump(newparent, take_focus);
- Shape *shape_ = GameData::get_instance()->getGumps()->getShape(_shapeNum);
+ Shape *shape = GameData::get_instance()->getGumps()->getShape(_shapeNum);
- SetShape(shape_, 0);
+ SetShape(shape, 0);
UpdateDimsFromShape();
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.cpp b/engines/ultima/ultima8/gumps/scroll_gump.cpp
index 91710ccc15..f25f7d3b19 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/scroll_gump.cpp
@@ -44,8 +44,8 @@ ScrollGump::ScrollGump()
}
-ScrollGump::ScrollGump(ObjId owner_, Std::string msg) :
- ModalGump(0, 0, 100, 100, owner_), _text(msg), _textWidget(0) {
+ScrollGump::ScrollGump(ObjId owner, const Std::string &msg) :
+ ModalGump(0, 0, 100, 100, owner), _text(msg), _textWidget(0) {
}
ScrollGump::~ScrollGump(void) {
@@ -61,9 +61,9 @@ void ScrollGump::InitGump(Gump *newparent, bool take_focus) {
_text.clear(); // no longer need this
- Shape *shape_ = GameData::get_instance()->getGumps()->getShape(19);
+ Shape *shape = GameData::get_instance()->getGumps()->getShape(19);
- SetShape(shape_, 0);
+ SetShape(shape, 0);
UpdateDimsFromShape();
}
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.h b/engines/ultima/ultima8/gumps/scroll_gump.h
index 9817797cf2..40ddef86d0 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.h
+++ b/engines/ultima/ultima8/gumps/scroll_gump.h
@@ -40,7 +40,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
ScrollGump();
- ScrollGump(ObjId owner, Std::string msg);
+ ScrollGump(ObjId owner, const Std::string &msg);
~ScrollGump() override;
// Go to the next page on mouse click
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 9417549ba9..baf31177c7 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -95,9 +95,9 @@ void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*s
int32 posx = (_dims.width() - _shapeW) / 2 + _shapeX;
int32 posy = (_dims.height() - _shapeH) / 2 + _shapeY - 25;
- Shape *shape_ = _flex->getShape(_curShape);
- if (shape_ && _curFrame < shape_->frameCount())
- surf->Paint(shape_, _curFrame, posx, posy);
+ Shape *shape = _flex->getShape(_curShape);
+ if (shape && _curFrame < shape->frameCount())
+ surf->Paint(shape, _curFrame, posx, posy);
RenderedText *rendtext;
Font *font = FontManager::get_instance()->getGameFont(_fontNo, true);
@@ -110,10 +110,10 @@ void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*s
// Basic shape/frame information
char buf1[50];
char buf2[200];
- if (!shape_) {
+ if (!shape) {
sprintf(buf1, "NULL");
} else {
- sprintf(buf1, "Frame %d of %d", _curFrame+1, shape_->frameCount());
+ sprintf(buf1, "Frame %d of %d", _curFrame+1, shape->frameCount());
}
sprintf(buf2, "%s: Shape %d, %s", _flexes[_curFlex].first.c_str(),
_curShape, buf1);
@@ -133,16 +133,16 @@ void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*s
int32 relx = mx - (posx - _shapeX);
int32 rely = my - (posy - _shapeY);
- if (shape_ && relx >= 0 && rely >= 0 && relx < _shapeW && rely < _shapeH) {
+ if (shape && relx >= 0 && rely >= 0 && relx < _shapeW && rely < _shapeH) {
// get color
relx -= _shapeX;
rely -= _shapeY;
- const ShapeFrame *frame = shape_->getFrame(_curFrame);
+ const ShapeFrame *frame = shape->getFrame(_curFrame);
if (frame && frame->hasPoint(relx, rely)) {
uint8 rawpx = frame->getPixelAtPoint(relx, rely);
- uint8 px_r = shape_->getPalette()->_palette[rawpx * 3];
- uint8 px_g = shape_->getPalette()->_palette[rawpx * 3 + 1];
- uint8 px_b = shape_->getPalette()->_palette[rawpx * 3 + 2];
+ uint8 px_r = shape->getPalette()->_palette[rawpx * 3];
+ uint8 px_g = shape->getPalette()->_palette[rawpx * 3 + 1];
+ uint8 px_b = shape->getPalette()->_palette[rawpx * 3 + 2];
sprintf(buf2, "px: (%d/%d, %d/%d): %d (%d, %d, %d)", relx, frame->_xoff, rely, frame->_yoff, rawpx, px_r, px_g, px_b);
rendtext = font->renderText(buf2, remaining);
@@ -157,7 +157,7 @@ void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*s
{
// Additional shapeinfo (only in main shapes archive)
MainShapeArchive *mainshapes = dynamic_cast<MainShapeArchive *>(_flex);
- if (!mainshapes || !shape_) return;
+ if (!mainshapes || !shape) return;
char buf3[128];
char buf4[128];
@@ -205,22 +205,22 @@ bool ShapeViewerGump::OnKeyDown(int key, int mod) {
shapechanged = true;
break;
case Common::KEYCODE_LEFT: {
- Shape *shape_ = _flex->getShape(_curShape);
- if (shape_ && shape_->frameCount()) {
- if (delta >= shape_->frameCount()) delta = 1;
+ const Shape *shape = _flex->getShape(_curShape);
+ if (shape && shape->frameCount()) {
+ if (delta >= shape->frameCount()) delta = 1;
if (_curFrame < delta)
- _curFrame = shape_->frameCount() + _curFrame - delta;
+ _curFrame = shape->frameCount() + _curFrame - delta;
else
_curFrame -= delta;
}
}
break;
case Common::KEYCODE_RIGHT: {
- Shape *shape_ = _flex->getShape(_curShape);
- if (shape_ && shape_->frameCount()) {
- if (delta >= shape_->frameCount()) delta = 1;
- if (_curFrame + delta >= shape_->frameCount())
- _curFrame = _curFrame + delta - shape_->frameCount();
+ const Shape *shape = _flex->getShape(_curShape);
+ if (shape && shape->frameCount()) {
+ if (delta >= shape->frameCount()) delta = 1;
+ if (_curFrame + delta >= shape->frameCount())
+ _curFrame = _curFrame + delta - shape->frameCount();
else
_curFrame += delta;
}
@@ -269,9 +269,9 @@ bool ShapeViewerGump::OnKeyDown(int key, int mod) {
}
if (shapechanged) {
- Shape *shape_ = _flex->getShape(_curShape);
- if (shape_)
- shape_->getTotalDimensions(_shapeW, _shapeH, _shapeX, _shapeY);
+ const Shape *shape = _flex->getShape(_curShape);
+ if (shape)
+ shape->getTotalDimensions(_shapeW, _shapeH, _shapeX, _shapeY);
}
return true;
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index c6ecb71385..c249dc0da1 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -46,8 +46,8 @@ SliderGump::SliderGump() : ModalGump(), _renderedText(nullptr), _min(0), _max(0)
SliderGump::SliderGump(int x, int y, int16 min, int16 max,
- int16 value_, int16 delta)
- : ModalGump(x, y, 5, 5), _min(min), _max(max), _delta(delta), _value(value_),
+ int16 value, int16 delta)
+ : ModalGump(x, y, 5, 5), _min(min), _max(max), _delta(delta), _value(value),
_usecodeNotifyPID(0), _renderedText(nullptr), _renderedValue(-1) {
}
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index 76419d5382..df7ea35903 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -38,8 +38,8 @@ TargetGump::TargetGump() : ModalGump(), _targetTracing(false) {
}
-TargetGump::TargetGump(int x_, int y_)
- : ModalGump(x_, y_, 0, 0), _targetTracing(false) {
+TargetGump::TargetGump(int x, int y)
+ : ModalGump(x, y, 0, 0), _targetTracing(false) {
}
@@ -82,15 +82,15 @@ void TargetGump::onMouseUp(int button, int32 mx, int32 my) {
_parent->GumpToScreenSpace(mx, my);
Gump *desktopgump = _parent;
- ObjId objId_ = desktopgump->TraceObjId(mx, my);
- Item *item = getItem(objId_);
+ ObjId objId = desktopgump->TraceObjId(mx, my);
+ Item *item = getItem(objId);
if (item) {
// done
pout << "Target result: ";
item->dumpInfo();
- _processResult = objId_;
+ _processResult = objId;
Close();
}
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index a3af0d67a2..34385c0021 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -76,7 +76,7 @@ void U8SaveGump::InitGump(Gump *newparent, bool take_focus) {
loadDescriptions();
for (int i = 0; i < 6; ++i) {
- int index_ = _page * 6 + i;
+ int index = _page * 6 + i;
int xbase = 3;
@@ -90,27 +90,27 @@ void U8SaveGump::InitGump(Gump *newparent, bool take_focus) {
gump->SetShape(entry_id, true);
gump->InitGump(this, false);
- int x_ = xbase + 2 + entrywidth;
+ int x = xbase + 2 + entrywidth;
- if (index_ >= 9) { // index_ 9 is labelled "10"
- FrameID entrynum1_id(GameData::GUMPS, 36, (index_ + 1) / 10 - 1);
+ if (index >= 9) { // index 9 is labelled "10"
+ FrameID entrynum1_id(GameData::GUMPS, 36, (index + 1) / 10 - 1);
entrynum1_id = _TL_SHP_(entrynum1_id);
entryShape = GameData::get_instance()->getShape(entrynum1_id);
sf = entryShape->getFrame(entrynum1_id._frameNum);
- x_ += 1 + sf->_width;
+ x += 1 + sf->_width;
gump = new Gump(xbase + 2 + entrywidth, 3 + 40 * yi, 1, 1);
gump->SetShape(entrynum1_id, true);
gump->InitGump(this, false);
}
- FrameID entrynum_id(GameData::GUMPS, 36, index_ % 10);
+ FrameID entrynum_id(GameData::GUMPS, 36, index % 10);
entrynum_id = _TL_SHP_(entrynum_id);
- gump = new Gump(x_, 3 + 40 * yi, 1, 1);
+ gump = new Gump(x, 3 + 40 * yi, 1, 1);
gump->SetShape(entrynum_id, true);
- if (index_ % 10 == 9) {
+ if (index % 10 == 9) {
// HACK: There is no frame for '0', so we re-use part of the
// frame for '10', cutting off the first 6 pixels.
Rect rect;
@@ -120,7 +120,7 @@ void U8SaveGump::InitGump(Gump *newparent, bool take_focus) {
}
gump->InitGump(this, false);
- if (index_ == 0) {
+ if (index == 0) {
// special case for 'The Beginning...' _save
Gump *widget = new TextWidget(xbase, entryheight + 4 + 40 * yi,
_TL_("The Beginning..."),
@@ -177,26 +177,26 @@ void U8SaveGump::onMouseClick(int button, int32 mx, int32 my) {
ParentToGump(mx, my);
- int x_;
+ int x;
if (mx >= 3 && mx <= 100)
- x_ = 0;
+ x = 0;
else if (mx >= _dims.width() / 2 + 10)
- x_ = 1;
+ x = 1;
else
return;
- int y_;
+ int y;
if (my >= 3 && my <= 40)
- y_ = 0;
+ y = 0;
else if (my >= 43 && my <= 80)
- y_ = 1;
+ y = 1;
else if (my >= 83 && my <= 120)
- y_ = 2;
+ y = 2;
else
return;
- int i = 3 * x_ + y_;
- int index_ = 6 * _page + i + 1;
+ int i = 3 * x + y;
+ int index = 6 * _page + i + 1;
if (_save && !_focusChild && _editWidgets[i]) {
_editWidgets[i]->MakeFocus();
@@ -210,14 +210,14 @@ void U8SaveGump::onMouseClick(int button, int32 mx, int32 my) {
GumpNotifyProcess *p = _parent->GetNotifyProcess();
if (p) {
// Do nothing in this case
- if (index_ != 1 && _descriptions[i].empty()) return;
+ if (index != 1 && _descriptions[i].empty()) return;
- _parent->SetResult(index_);
+ _parent->SetResult(index);
_parent->Close(); // close PagedGump (and us)
return;
}
- loadgame(index_); // 'this' will be deleted here!
+ loadgame(index); // 'this' will be deleted here!
}
}
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index c8f175e2a2..d2e1af1058 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -36,10 +36,10 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(EditWidget)
-EditWidget::EditWidget(int x, int y, Std::string txt, bool gamefont_, int font,
- int w, int h, unsigned int maxlength_, bool multiline_)
- : Gump(x, y, w, h), _text(txt), _gameFont(gamefont_), _fontNum(font),
- _maxLength(maxlength_), _multiLine(multiline_),
+EditWidget::EditWidget(int x, int y, Std::string txt, bool gamefont, int font,
+ int w, int h, unsigned int maxlength, bool multiline)
+ : Gump(x, y, w, h), _text(txt), _gameFont(gamefont), _fontNum(font),
+ _maxLength(maxlength), _multiLine(multiline),
_cursorChanged(0), _cursorVisible(true), _cachedText(nullptr) {
_cursor = _text.size();
}
@@ -174,10 +174,10 @@ void EditWidget::PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 s
if (!_gameFont || !font->isHighRes()) return;
- int32 x_ = 0, y_ = 0;
- GumpToScreenSpace(x_, y_, ROUND_BOTTOMRIGHT);
+ int32 x = 0, y = 0;
+ GumpToScreenSpace(x, y, ROUND_BOTTOMRIGHT);
- _cachedText->draw(surf, x_, y_, true);
+ _cachedText->draw(surf, x, y, true);
Rect rect(_dims);
GumpRectToScreenSpace(rect, ROUND_OUTSIDE);
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index d71f0fb2dd..1422e973a6 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -41,9 +41,9 @@ TextWidget::TextWidget() : Gump(), _gameFont(false), _fontNum(0), _blendColour(0
_cachedText(nullptr), _textAlign(Font::TEXT_LEFT) {
}
-TextWidget::TextWidget(int x, int y, const Std::string &txt, bool gamefont_, int font,
+TextWidget::TextWidget(int x, int y, const Std::string &txt, bool gamefont, int font,
int w, int h, Font::TextAlign align) :
- Gump(x, y, w, h), _text(txt), _gameFont(gamefont_), _fontNum(font),
+ Gump(x, y, w, h), _text(txt), _gameFont(gamefont), _fontNum(font),
_blendColour(0), _currentStart(0), _currentEnd(0), _tx(0), _ty(0),
_targetWidth(w), _targetHeight(h), _cachedText(nullptr), _textAlign(align) {
}
@@ -251,15 +251,15 @@ bool TextWidget::loadData(Common::ReadStream *rs, uint32 version) {
// after loading.
Font *font = getFont();
- int32 tx_, ty_;
+ int32 tx, ty;
unsigned int remaining;
- font->getTextSize(_text.substr(_currentStart), tx_, ty_, remaining,
+ font->getTextSize(_text.substr(_currentStart), tx, ty, remaining,
_targetWidth, _targetHeight, _textAlign, true);
// Y offset is always baseline
_dims.top = -font->getBaseline();
- _dims.setWidth(tx_);
- _dims.setHeight(ty_);
+ _dims.setWidth(tx);
+ _dims.setHeight(ty);
_currentEnd = _currentStart + remaining;
return true;
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index a14e3be5db..7f25f655f3 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -274,11 +274,11 @@ void CoreApp::setupGamePaths(GameInfo *ginfo) {
debugN(MM_INFO, "Savegame directory: %s\n", save.c_str());
}
-void CoreApp::ParseArgs(const int argc_, const char *const *const argv_) {
- _parameters.process(argc_, argv_);
+void CoreApp::ParseArgs(const int argc, const char *const *const argv) {
+ _parameters.process(argc, argv);
}
-GameInfo *CoreApp::getGameInfo(istring game) const {
+GameInfo *CoreApp::getGameInfo(const istring &game) const {
GameMap::const_iterator i;
i = _games.find(game);
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index 7fc43f73ef..b0ec03c495 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -70,7 +70,7 @@ public:
}
//! Get GameInfo for other configured game, or 0 for an invalid name.
- GameInfo *getGameInfo(istring game) const;
+ GameInfo *getGameInfo(const istring &game) const;
protected:
bool _isRunning;
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index c66d56ba34..879e5bfc6c 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -59,8 +59,8 @@ void Process::terminate() {
_flags |= PROC_TERMINATED;
}
-void Process::wakeUp(uint32 result_) {
- _result = result_;
+void Process::wakeUp(uint32 result) {
+ _result = result;
_flags &= ~PROC_SUSPENDED;
@@ -69,13 +69,13 @@ void Process::wakeUp(uint32 result_) {
onWakeUp();
}
-void Process::waitFor(ProcId pid_) {
- assert(pid_ != _pid);
- if (pid_) {
+void Process::waitFor(ProcId pid) {
+ assert(pid != _pid);
+ if (pid) {
Kernel *kernel = Kernel::get_instance();
// add this process to waiting list of process pid_
- Process *p = kernel->getProcess(pid_);
+ Process *p = kernel->getProcess(pid);
assert(p);
p->_waiting.push_back(_pid);
}
@@ -85,10 +85,10 @@ void Process::waitFor(ProcId pid_) {
void Process::waitFor(Process *proc) {
assert(this != proc);
- ProcId pid_ = 0;
- if (proc) pid_ = proc->getPid();
+ ProcId pid = 0;
+ if (proc) pid = proc->getPid();
- waitFor(pid_);
+ waitFor(pid);
}
void Process::suspend() {
diff --git a/engines/ultima/ultima8/usecode/uc_process.cpp b/engines/ultima/ultima8/usecode/uc_process.cpp
index c83fb0c27a..31be459414 100644
--- a/engines/ultima/ultima8/usecode/uc_process.cpp
+++ b/engines/ultima/ultima8/usecode/uc_process.cpp
@@ -37,20 +37,20 @@ UCProcess::UCProcess() : Process(), _classId(0xFFFF), _ip(0xFFFF),
_usecode = GameData::get_instance()->getMainUsecode();
}
-UCProcess::UCProcess(uint16 classid_, uint16 offset_, uint32 this_ptr,
+UCProcess::UCProcess(uint16 classid, uint16 offset, uint32 this_ptr,
int thissize, const uint8 *args, int argsize)
: Process(), _classId(0xFFFF), _ip(0xFFFF), _bp(0x0000), _temp32(0) {
_usecode = GameData::get_instance()->getMainUsecode();
- load(classid_, offset_, this_ptr, thissize, args, argsize);
+ load(classid, offset, this_ptr, thissize, args, argsize);
}
UCProcess::~UCProcess() {
}
-void UCProcess::load(uint16 classid_, uint16 offset_, uint32 this_ptr,
+void UCProcess::load(uint16 classid, uint16 offset, uint32 this_ptr,
int thissize, const uint8 *args, int argsize) {
- if (_usecode->get_class_size(classid_) == 0)
+ if (_usecode->get_class_size(classid) == 0)
perr << "Class is empty..." << Std::endl;
_classId = 0xFFFF;
@@ -74,7 +74,7 @@ void UCProcess::load(uint16 classid_, uint16 offset_, uint32 this_ptr,
_stack.push4(UCMachine::stackToPtr(_pid, thissp));
// finally, call the specified function
- call(classid_, offset_);
+ call(classid, offset);
}
void UCProcess::run() {
@@ -85,13 +85,13 @@ void UCProcess::run() {
UCMachine::get_instance()->execProcess(this);
}
-void UCProcess::call(uint16 classid_, uint16 offset_) {
+void UCProcess::call(uint16 classid, uint16 offset) {
_stack.push2(_classId); // BP+04 prev class
_stack.push2(_ip); // BP+02 prev IP
_stack.push2(_bp); // BP+00 prev BP
- _classId = classid_;
- _ip = offset_;
+ _classId = classid;
+ _ip = offset;
_bp = static_cast<uint16>(_stack.getSP()); // TRUNCATES!
}
@@ -108,12 +108,12 @@ bool UCProcess::ret() {
return false;
}
-void UCProcess::freeOnTerminate(uint16 index, int type_) {
- assert(type_ >= 1 && type_ <= 3);
+void UCProcess::freeOnTerminate(uint16 index, int type) {
+ assert(type >= 1 && type <= 3);
Std::pair<uint16, int> p;
p.first = index;
- p.second = type_;
+ p.second = type;
_freeOnTerminate.push_back(p);
}
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index f95893f463..b00d5d428c 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -37,7 +37,7 @@ class UCProcess : public Process {
friend class Kernel;
public:
UCProcess();
- UCProcess(uint16 classid_, uint16 offset_, uint32 this_ptr = 0,
+ UCProcess(uint16 classid, uint16 offset, uint32 this_ptr = 0,
int thissize = 0, const uint8 *args = 0, int argsize = 0);
~UCProcess() override;
@@ -48,7 +48,7 @@ public:
void terminate() override;
- void freeOnTerminate(uint16 index, int type_);
+ void freeOnTerminate(uint16 index, int type);
void setReturnValue(uint32 retval) {
_temp32 = retval;
@@ -61,9 +61,9 @@ public:
void saveData(Common::WriteStream *ws) override;
protected:
- void load(uint16 classid_, uint16 offset_, uint32 this_ptr = 0,
+ void load(uint16 classid, uint16 offset, uint32 this_ptr = 0,
int thissize = 0, const uint8 *args = 0, int argsize = 0);
- void call(uint16 classid_, uint16 offset_);
+ void call(uint16 classid, uint16 offset);
bool ret();
// stack base pointer
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index 7aa9b37da9..7d2d8a93ec 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -130,10 +130,10 @@ unsigned int AnimationTracker::getNextFrame(unsigned int frame) const {
return frame;
}
-bool AnimationTracker::stepFrom(int32 x_, int32 y_, int32 z_) {
- _x = x_;
- _y = y_;
- _z = z_;
+bool AnimationTracker::stepFrom(int32 x, int32 y, int32 z) {
+ _x = x;
+ _y = y;
+ _z = z;
return step();
}
@@ -434,7 +434,7 @@ const AnimFrame *AnimationTracker::getAnimFrame() const {
return &_animAction->getFrame(_dir, _currentFrame);
}
-void AnimationTracker::setTargetedMode(int32 x_, int32 y_, int32 z_) {
+void AnimationTracker::setTargetedMode(int32 x, int32 y, int32 z) {
unsigned int i;
int totaldir = 0;
int totalz = 0;
@@ -456,9 +456,9 @@ void AnimationTracker::setTargetedMode(int32 x_, int32 y_, int32 z_) {
if (offGround) {
_mode = TargetMode;
_targetOffGroundLeft = offGround;
- _targetDx = x_ - _x - end_dx;
- _targetDy = y_ - _y - end_dy;
- _targetDz = z_ - _z - end_dz;
+ _targetDx = x - _x - end_dx;
+ _targetDy = y - _y - end_dy;
+ _targetDz = z - _z - end_dz;
// Don't allow large changes in Z
if (_targetDz > 16)
@@ -562,17 +562,17 @@ void AnimationTracker::updateActorFlags() {
a->_animFrame = _currentFrame;
}
-void AnimationTracker::getInterpolatedPosition(int32 &x_, int32 &y_,
- int32 &z_, int fc) const {
+void AnimationTracker::getInterpolatedPosition(int32 &x, int32 &y,
+ int32 &z, int fc) const {
int32 dx = _x - _prevX;
int32 dy = _y - _prevY;
int32 dz = _z - _prevZ;
int repeat = _animAction->getFrameRepeat();
- x_ = _prevX + (dx * fc) / (repeat + 1);
- y_ = _prevY + (dy * fc) / (repeat + 1);
- z_ = _prevZ + (dz * fc) / (repeat + 1);
+ x = _prevX + (dx * fc) / (repeat + 1);
+ y = _prevY + (dy * fc) / (repeat + 1);
+ z = _prevZ + (dz * fc) / (repeat + 1);
}
void AnimationTracker::getSpeed(int32 &dx, int32 &dy, int32 &dz) const {
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.h b/engines/ultima/ultima8/world/actors/animation_tracker.h
index 4d6b3e4db5..1a6acad0ab 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.h
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.h
@@ -46,7 +46,7 @@ public:
//! evaluate the maximum distance the actor will travel if the current
//! animation runs to completion by incremental calls to step
- void evaluateMaxAnimTravel(int32 &max_endx, int32 &max_endy, Direction dir_);
+ void evaluateMaxAnimTravel(int32 &max_endx, int32 &max_endy, Direction dir);
//! do a single step of the animation
//! returns true if everything ok, false if not
@@ -71,7 +71,7 @@ public:
z = _z;
}
- void getInterpolatedPosition(int32 &x_, int32 &y_, int32 &z_, int fc)
+ void getInterpolatedPosition(int32 &x, int32 &y, int32 &z, int fc)
const;
//! get the difference between current position and previous position
@@ -90,7 +90,7 @@ public:
//! get the current AnimFrame
const AnimFrame *getAnimFrame() const;
- void setTargetedMode(int32 x_, int32 y_, int32 z_);
+ void setTargetedMode(int32 x, int32 y, int32 z);
bool isDone() const {
return _done;
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
index 3188e0ef49..bbc4746e7a 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.cpp
@@ -40,8 +40,8 @@ AvatarGravityProcess::AvatarGravityProcess()
}
-AvatarGravityProcess::AvatarGravityProcess(MainActor *avatar, int gravity_)
- : GravityProcess(avatar, gravity_) {
+AvatarGravityProcess::AvatarGravityProcess(MainActor *avatar, int gravity)
+ : GravityProcess(avatar, gravity) {
}
diff --git a/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp b/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
index d344f96c6d..6dfd0916ff 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.cpp
@@ -37,9 +37,9 @@ ClearFeignDeathProcess::ClearFeignDeathProcess() : Process() {
}
-ClearFeignDeathProcess::ClearFeignDeathProcess(Actor *actor_) {
- assert(actor_);
- _itemNum = actor_->getObjId();
+ClearFeignDeathProcess::ClearFeignDeathProcess(Actor *actor) {
+ assert(actor);
+ _itemNum = actor->getObjId();
_type = 0x243; // constant !
}
diff --git a/engines/ultima/ultima8/world/actors/combat_process.cpp b/engines/ultima/ultima8/world/actors/combat_process.cpp
index ebdc499091..64287c5f52 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.cpp
+++ b/engines/ultima/ultima8/world/actors/combat_process.cpp
@@ -50,9 +50,9 @@ CombatProcess::CombatProcess() : Process(), _target(0), _fixedTarget(0), _combat
}
-CombatProcess::CombatProcess(Actor *actor_) : _target(0), _fixedTarget(0), _combatMode(CM_WAITING) {
- assert(actor_);
- _itemNum = actor_->getObjId();
+CombatProcess::CombatProcess(Actor *actor) : _target(0), _fixedTarget(0), _combatMode(CM_WAITING) {
+ assert(actor);
+ _itemNum = actor->getObjId();
_type = 0x00F2; // CONSTANT !
}
@@ -174,22 +174,22 @@ void CombatProcess::setTarget(ObjId newtarget) {
_target = newtarget;
}
-bool CombatProcess::isValidTarget(const Actor *target_) const {
- assert(target_);
+bool CombatProcess::isValidTarget(const Actor *target) const {
+ assert(target);
const Actor *a = getActor(_itemNum);
if (!a) return false; // uh oh
// don't target_ self
- if (target_ == a) return false;
+ if (target == a) return false;
// not in the fastarea
- if (!target_->hasFlags(Item::FLG_FASTAREA)) return false;
+ if (!target->hasFlags(Item::FLG_FASTAREA)) return false;
// dead actors don't make good targets
- if (target_->isDead()) return false;
+ if (target->isDead()) return false;
// feign death only works on undead and demons
- if (target_->hasActorFlags(Actor::ACT_FEIGNDEATH)) {
+ if (target->hasActorFlags(Actor::ACT_FEIGNDEATH)) {
if ((a->getDefenseType() & WeaponInfo::DMG_UNDEAD) ||
(a->getShape() == 96)) return false; // CONSTANT!
@@ -199,13 +199,13 @@ bool CombatProcess::isValidTarget(const Actor *target_) const {
return true;
}
-bool CombatProcess::isEnemy(const Actor *target_) const {
- assert(target_);
+bool CombatProcess::isEnemy(const Actor *target) const {
+ assert(target);
const Actor *a = getActor(_itemNum);
if (!a) return false; // uh oh
- return ((a->getEnemyAlignment() & target_->getAlignment()) != 0);
+ return ((a->getEnemyAlignment() & target->getAlignment()) != 0);
}
ObjId CombatProcess::seekTarget() {
@@ -224,7 +224,7 @@ ObjId CombatProcess::seekTarget() {
cm->areaSearch(&itemlist, script, sizeof(script), a, 768, false);
for (unsigned int i = 0; i < itemlist.getSize(); ++i) {
- Actor *t = getActor(itemlist.getuint16(i));
+ const Actor *t = getActor(itemlist.getuint16(i));
if (t && isValidTarget(t) && isEnemy(t)) {
// found _target
diff --git a/engines/ultima/ultima8/world/actors/combat_process.h b/engines/ultima/ultima8/world/actors/combat_process.h
index 24de0d41f3..02272b3fbd 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.h
+++ b/engines/ultima/ultima8/world/actors/combat_process.h
@@ -44,7 +44,7 @@ public:
void terminate() override;
ObjId getTarget();
- void setTarget(ObjId target_);
+ void setTarget(ObjId target);
ObjId seekTarget();
void dumpInfo() const override;
@@ -53,8 +53,8 @@ public:
void saveData(Common::WriteStream *ws) override;
protected:
- bool isValidTarget(const Actor *target_) const;
- bool isEnemy(const Actor *target_) const;
+ bool isValidTarget(const Actor *target) const;
+ bool isEnemy(const Actor *target) const;
bool inAttackRange() const;
Direction getTargetDirection() const;
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index 88d37091a4..af012edb2f 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -304,23 +304,23 @@ int16 MainActor::addItemCru(Item *item, bool showtoast) {
return 0;
}
-void MainActor::teleport(int mapNum_, int32 x_, int32 y_, int32 z_) {
+void MainActor::teleport(int mapNum, int32 x, int32 y, int32 z) {
World *world = World::get_instance();
// (attempt to) load the new map
- if (!world->switchMap(mapNum_)) {
+ if (!world->switchMap(mapNum)) {
perr << "MainActor::teleport(): switchMap() failed!" << Std::endl;
return;
}
- Actor::teleport(mapNum_, x_, y_, z_);
+ Actor::teleport(mapNum, x, y, z);
_justTeleported = true;
}
// teleport to TeleportEgg
// NB: be careful when calling this from a process, as it might kill
// all running processes
-void MainActor::teleport(int mapNum_, int teleport_id) {
+void MainActor::teleport(int mapNum, int teleport_id) {
int oldmap = getMapNum();
int32 oldx, oldy, oldz;
getLocation(oldx, oldy, oldz);
@@ -328,13 +328,13 @@ void MainActor::teleport(int mapNum_, int teleport_id) {
World *world = World::get_instance();
CurrentMap *currentmap = world->getCurrentMap();
- pout << "MainActor::teleport(): teleporting to map " << mapNum_
+ pout << "MainActor::teleport(): teleporting to map " << mapNum
<< ", egg " << teleport_id << Std::endl;
- setMapNum(mapNum_);
+ setMapNum(mapNum);
// (attempt to) load the new map
- if (!world->switchMap(mapNum_)) {
+ if (!world->switchMap(mapNum)) {
perr << "MainActor::teleport(): switchMap() failed!" << Std::endl;
setMapNum(oldmap);
return;
@@ -354,7 +354,7 @@ void MainActor::teleport(int mapNum_, int teleport_id) {
pout << "Found destination: " << xv << "," << yv << "," << zv << Std::endl;
egg->dumpInfo();
- Actor::teleport(mapNum_, xv, yv, zv);
+ Actor::teleport(mapNum, xv, yv, zv);
_justTeleported = true;
}
@@ -567,9 +567,9 @@ void MainActor::accumulateInt(int n) {
}
}
-void MainActor::getWeaponOverlay(const WeaponOverlayFrame *&frame_, uint32 &shape_) {
- shape_ = 0;
- frame_ = 0;
+void MainActor::getWeaponOverlay(const WeaponOverlayFrame *&frame, uint32 &shape) {
+ shape = 0;
+ frame = 0;
if (!isInCombat() && _lastAnim != Animation::unreadyWeapon) return;
@@ -590,13 +590,13 @@ void MainActor::getWeaponOverlay(const WeaponOverlayFrame *&frame_, uint32 &shap
WeaponInfo *weaponinfo = shapeinfo->_weaponInfo;
if (!weaponinfo) return;
- shape_ = weaponinfo->_overlayShape;
+ shape = weaponinfo->_overlayShape;
WpnOvlayDat *wpnovlay = GameData::get_instance()->getWeaponOverlay();
- frame_ = wpnovlay->getOverlayFrame(action, weaponinfo->_overlayType,
+ frame = wpnovlay->getOverlayFrame(action, weaponinfo->_overlayType,
_direction, _animFrame);
- if (frame_ == 0) shape_ = 0;
+ if (frame == 0) shape = 0;
}
int16 MainActor::getMaxEnergy() {
diff --git a/engines/ultima/ultima8/world/actors/main_actor.h b/engines/ultima/ultima8/world/actors/main_actor.h
index e152495199..85d63a95b3 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.h
+++ b/engines/ultima/ultima8/world/actors/main_actor.h
@@ -52,12 +52,12 @@ public:
int16 addItemCru(Item *item, bool showtoast);
//! teleport to the given location on the given map
- void teleport(int mapNum_, int32 x_, int32 y_, int32 z_) override;
+ void teleport(int mapNum, int32 x, int32 y, int32 z) override;
//! teleport to a teleport-destination egg
//! \param mapnum The map to teleport to
//! \param teleport_id The ID of the egg to teleport to
- void teleport(int mapNum_, int teleport_id); // to teleportegg
+ void teleport(int mapNum, int teleport_id); // to teleportegg
bool hasJustTeleported() const {
return _justTeleported;
@@ -149,7 +149,7 @@ public:
INTRINSIC(I_addItemCru);
INTRINSIC(I_getNumberOfCredits);
- void getWeaponOverlay(const WeaponOverlayFrame *&frame_, uint32 &shape_);
+ void getWeaponOverlay(const WeaponOverlayFrame *&frame, uint32 &shape);
protected:
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.cpp b/engines/ultima/ultima8/world/actors/pathfinder.cpp
index 6f8d502597..c3b59d5e03 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder.cpp
@@ -59,9 +59,9 @@ void PathfindingState::load(const Actor *_actor) {
_combat = _actor->isInCombat();
}
-bool PathfindingState::checkPoint(int32 x_, int32 y_, int32 z_,
+bool PathfindingState::checkPoint(int32 x, int32 y, int32 z,
int range) const {
- int distance = (_x - x_) * (_x - x_) + (_y - y_) * (_y - y_) + (_z - z_) * (_z - z_);
+ int distance = (_x - x) * (_x - x) + (_y - y) * (_y - y) + (_z - z) * (_z - z);
return distance < range * range;
}
@@ -135,8 +135,8 @@ Pathfinder::~Pathfinder() {
_cleanupNodes.clear();
}
-void Pathfinder::init(Actor *actor_, PathfindingState *state) {
- _actor = actor_;
+void Pathfinder::init(Actor *actor, PathfindingState *state) {
+ _actor = actor;
_actor->getFootpadWorld(_actorXd, _actorYd, _actorZd);
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.h b/engines/ultima/ultima8/world/actors/pathfinder.h
index d3d99ac1d0..e1e1f05b5c 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder.h
@@ -45,7 +45,7 @@ struct PathfindingState {
bool _combat;
void load(const Actor *actor);
- bool checkPoint(int32 x_, int32 y_, int32 z_, int range) const;
+ bool checkPoint(int32 x, int32 y, int32 z, int range) const;
bool checkItem(const Item *item, int xyRange, int zRange) const;
bool checkHit(const Actor *actor, const Actor *target) const;
};
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
index fb59e9d5c5..b86d89217e 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
@@ -44,14 +44,14 @@ PathfinderProcess::PathfinderProcess() : Process(),
_targetX(0), _targetY(0), _targetZ(0) {
}
-PathfinderProcess::PathfinderProcess(Actor *actor, ObjId item_, bool hit) :
- _currentStep(0), _targetItem(item_), _hitMode(hit),
+PathfinderProcess::PathfinderProcess(Actor *actor, ObjId itemid, bool hit) :
+ _currentStep(0), _targetItem(itemid), _hitMode(hit),
_targetX(0), _targetY(0), _targetZ(0) {
assert(actor);
_itemNum = actor->getObjId();
_type = PATHFINDER_PROC_TYPE; // CONSTANT !
- Item *item = getItem(item_);
+ Item *item = getItem(itemid);
if (!item) {
perr << "PathfinderProcess: non-existent target" << Std::endl;
// can't get there...
@@ -82,14 +82,14 @@ PathfinderProcess::PathfinderProcess(Actor *actor, ObjId item_, bool hit) :
actor->setActorFlag(Actor::ACT_PATHFINDING);
}
-PathfinderProcess::PathfinderProcess(Actor *actor_, int32 x, int32 y, int32 z) :
+PathfinderProcess::PathfinderProcess(Actor *actor, int32 x, int32 y, int32 z) :
_targetX(x), _targetY(y), _targetZ(z), _targetItem(0), _currentStep(0),
_hitMode(false) {
- assert(actor_);
- _itemNum = actor_->getObjId();
+ assert(actor);
+ _itemNum = actor->getObjId();
Pathfinder pf;
- pf.init(actor_);
+ pf.init(actor);
pf.setTarget(_targetX, _targetY, _targetZ);
bool ok = pf.pathfind(_path);
@@ -103,7 +103,7 @@ PathfinderProcess::PathfinderProcess(Actor *actor_, int32 x, int32 y, int32 z) :
}
// TODO: check if flag already set? kill other pathfinders?
- actor_->setActorFlag(Actor::ACT_PATHFINDING);
+ actor->setActorFlag(Actor::ACT_PATHFINDING);
}
PathfinderProcess::~PathfinderProcess() {
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
index e4d1bccba9..42a3867222 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.cpp
@@ -35,8 +35,9 @@ TargetedAnimProcess::TargetedAnimProcess() : ActorAnimProcess(),
_x(0), _y(0), _z(0) {
}
-TargetedAnimProcess::TargetedAnimProcess(Actor *actor_, Animation::Sequence action_, Direction dir_, int32 coords[3]) : ActorAnimProcess(actor_, action_, dir_),
- _x(coords[0]), _y(coords[1]), _z(coords[2]) {
+TargetedAnimProcess::TargetedAnimProcess(Actor *actor, Animation::Sequence action, Direction dir, int32 coords[3]) :
+ ActorAnimProcess(actor, action, dir),
+ _x(coords[0]), _y(coords[1]), _z(coords[2]) {
}
bool TargetedAnimProcess::init() {
diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index eabe2b55cd..3d971dd1f3 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -122,14 +122,14 @@ CameraProcess::CameraProcess(uint16 _itemnum) :
}
// Stay over point
-CameraProcess::CameraProcess(int32 x_, int32 y_, int32 z_) :
- _ex(x_), _ey(y_), _ez(z_), _time(0), _elapsed(0), _itemNum(0), _lastFrameNum(0) {
+CameraProcess::CameraProcess(int32 x, int32 y, int32 z) :
+ _ex(x), _ey(y), _ez(z), _time(0), _elapsed(0), _itemNum(0), _lastFrameNum(0) {
GetCameraLocation(_sx, _sy, _sz);
}
// Scroll
-CameraProcess::CameraProcess(int32 x_, int32 y_, int32 z_, int32 time_) :
- _ex(x_), _ey(y_), _ez(z_), _time(time_), _elapsed(0), _itemNum(0), _lastFrameNum(0) {
+CameraProcess::CameraProcess(int32 x, int32 y, int32 z, int32 time) :
+ _ex(x), _ey(y), _ez(z), _time(time), _elapsed(0), _itemNum(0), _lastFrameNum(0) {
GetCameraLocation(_sx, _sy, _sz);
//pout << "Scrolling from (" << sx << "," << sy << "," << sz << ") to (" <<
// ex << "," << ey << "," << ez << ") in " << _time << " frames" << Std::endl;
diff --git a/engines/ultima/ultima8/world/destroy_item_process.cpp b/engines/ultima/ultima8/world/destroy_item_process.cpp
index 2b4897e844..bf683da802 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.cpp
+++ b/engines/ultima/ultima8/world/destroy_item_process.cpp
@@ -36,9 +36,9 @@ DestroyItemProcess::DestroyItemProcess() : Process() {
}
-DestroyItemProcess::DestroyItemProcess(Item *item_) {
- if (item_)
- _itemNum = item_->getObjId();
+DestroyItemProcess::DestroyItemProcess(Item *item) {
+ if (item)
+ _itemNum = item->getObjId();
else
_itemNum = 0;
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 8bdd4ffdb4..ae1bc1b619 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -475,8 +475,8 @@ Box Item::getWorldBox() const {
return Box(_x, _y, _z, xd, yd, zd);
}
-void Item::setShape(uint32 shape_) {
- _shape = shape_;
+void Item::setShape(uint32 shape) {
+ _shape = shape;
_cachedShapeInfo = nullptr;
_cachedShape = nullptr;
// FIXME: In Crusader, here we should check if the shape
@@ -613,10 +613,10 @@ bool Item::isOnScreen() const {
return false;
}
-bool Item::canExistAt(int32 x_, int32 y_, int32 z_, bool needsupport) const {
+bool Item::canExistAt(int32 x, int32 y, int32 z, bool needsupport) const {
CurrentMap *cm = World::get_instance()->getCurrentMap();
const Item *support;
- bool valid = cm->isValidPosition(x_, y_, z_, getShape(), getObjId(),
+ bool valid = cm->isValidPosition(x, y, z, getShape(), getObjId(),
&support, 0);
return valid && (!needsupport || support);
}
@@ -1297,10 +1297,10 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
return 0;
}
-unsigned int Item::countNearby(uint32 shape_, uint16 range) {
+unsigned int Item::countNearby(uint32 shape, uint16 range) {
CurrentMap *currentmap = World::get_instance()->getCurrentMap();
UCList itemlist(2);
- LOOPSCRIPT(script, LS_SHAPE_EQUAL(shape_));
+ LOOPSCRIPT(script, LS_SHAPE_EQUAL(shape));
currentmap->areaSearch(&itemlist, script, sizeof(script),
this, range, false);
return itemlist.getSize();
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index 000dc1e65d..0bf7bdeaa9 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -194,7 +194,7 @@ public:
}
//! Set this Item's shape number
- void setShape(uint32 shape_);
+ void setShape(uint32 shape);
//! Get this Item's frame number
uint32 getFrame() const {
@@ -202,8 +202,8 @@ public:
}
//! Set this Item's frame number
- void setFrame(uint32 frame_) {
- _frame = frame_;
+ void setFrame(uint32 frame) {
+ _frame = frame;
}
//! Get this Item's quality (a.k.a. 'Q')
@@ -212,8 +212,8 @@ public:
}
//! Set this Item's quality (a.k.a 'Q');
- void setQuality(uint16 quality_) {
- _quality = quality_;
+ void setQuality(uint16 quality) {
+ _quality = quality;
}
//! Get the 'NpcNum' of this Item. Note that this can represent various
@@ -224,8 +224,8 @@ public:
//! Set the 'NpcNum' of this Item. Note that this can represent various
//! things depending on the family of this Item.
- void setNpcNum(uint16 npcnum_) {
- _npcNum = npcnum_;
+ void setNpcNum(uint16 npcnum) {
+ _npcNum = npcnum;
}
//! Get the 'MapNum' of this Item. Note that this can represent various
@@ -236,8 +236,8 @@ public:
//! Set the 'MapNum' of this Item. Note that this can represent various
//! things depending on the family of this Item.
- void setMapNum(uint16 mapnum_) {
- _mapNum = mapnum_;
+ void setMapNum(uint16 mapnum) {
+ _mapNum = mapnum;
}
//! Get the ShapeInfo object for this Item. (The pointer will be cached.)
@@ -289,7 +289,7 @@ public:
bool isOnScreen() const;
//! Check if this item can exist at the given coordinates
- bool canExistAt(int32 x_, int32 y_, int32 z_, bool needsupport = false) const;
+ bool canExistAt(int32 x, int32 y, int32 z, bool needsupport = false) const;
//! Get direction from centre to another item's centre.
//! Undefined if either item is contained or equipped.
@@ -401,7 +401,7 @@ public:
}
//! count nearby objects of a given shape
- unsigned int countNearby(uint32 shape_, uint16 range);
+ unsigned int countNearby(uint32 shape, uint16 range);
//! can this item be dragged?
bool canDrag();
diff --git a/engines/ultima/ultima8/world/split_item_process.cpp b/engines/ultima/ultima8/world/split_item_process.cpp
index e8e23a91b8..b39c5d960b 100644
--- a/engines/ultima/ultima8/world/split_item_process.cpp
+++ b/engines/ultima/ultima8/world/split_item_process.cpp
@@ -36,15 +36,15 @@ SplitItemProcess::SplitItemProcess() : Process(), _target(0) {
}
-SplitItemProcess::SplitItemProcess(Item *original, Item *target_) {
+SplitItemProcess::SplitItemProcess(Item *original, Item *target) {
assert(original);
- assert(target_);
+ assert(target);
assert(original->getShapeInfo()->hasQuantity());
- assert(target_->getShapeInfo()->hasQuantity());
+ assert(target->getShapeInfo()->hasQuantity());
_itemNum = original->getObjId();
- _target = target_->getObjId();
+ _target = target->getObjId();
// type = TODO
}
More information about the Scummvm-git-logs
mailing list