[Scummvm-git-logs] scummvm master -> d47abaeb50bbfa1cd365f604f1c63d13ab2a0312
dreammaster
paulfgilbert at gmail.com
Tue Feb 18 05:00:40 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
de5c5f17bb ULTIMA8: Miscellaneous class fields renaming
d47abaeb50 ULTIMA8: Janitorial
Commit: de5c5f17bb6c6db5f52f6cff5d19082972cc6bc8
https://github.com/scummvm/scummvm/commit/de5c5f17bb6c6db5f52f6cff5d19082972cc6bc8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-17T20:39:27-08:00
Commit Message:
ULTIMA8: Miscellaneous class fields renaming
Changed paths:
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/audio/music_process.cpp
engines/ultima/ultima8/audio/music_process.h
engines/ultima/ultima8/graphics/skf_player.cpp
engines/ultima/ultima8/graphics/type_flags.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/weapon_info.h
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 514beae..0b690bd 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -42,15 +42,15 @@ namespace Ultima8 {
// p_dynamic_class stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(AudioProcess, Process)
-AudioProcess *AudioProcess::the_audio_process = 0;
+AudioProcess *AudioProcess::_theAudioProcess = 0;
AudioProcess::AudioProcess(void) : paused(0) {
- the_audio_process = this;
+ _theAudioProcess = this;
_type = 1; // persistent
}
AudioProcess::~AudioProcess(void) {
- the_audio_process = 0;
+ _theAudioProcess = 0;
}
bool AudioProcess::calculateSoundVolume(ObjId _objId, int16 &_lVol, int16 &_rVol) const {
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 6aa2c64..b4b05d4 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -71,7 +71,7 @@ public:
//! Get the current instance of the Audio Processes
static AudioProcess *get_instance() {
- return the_audio_process;
+ return _theAudioProcess;
}
INTRINSIC(I_playSFX);
@@ -138,7 +138,7 @@ private:
bool calculateSoundVolume(ObjId _objId, int16 &_lVol, int16 &_rVol) const;
- static AudioProcess *the_audio_process;
+ static AudioProcess *_theAudioProcess;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/audio/music_process.cpp b/engines/ultima/ultima8/audio/music_process.cpp
index 91ea7eb..f761726 100644
--- a/engines/ultima/ultima8/audio/music_process.cpp
+++ b/engines/ultima/ultima8/audio/music_process.cpp
@@ -38,7 +38,7 @@ namespace Ultima8 {
// p_dynamic_cast stuff
DEFINE_RUNTIME_CLASSTYPE_CODE(MusicProcess, Process)
-MusicProcess *MusicProcess::the_music_process = 0;
+MusicProcess *MusicProcess::_theMusicProcess = 0;
MusicProcess::MusicProcess() : _midiPlayer(0), _state(MUSIC_NORMAL),
_currentTrack(0), _wantedTrack(0), _lastRequest(0), _queuedTrack(0) {
@@ -50,13 +50,13 @@ MusicProcess::MusicProcess(MidiPlayer *player) : _midiPlayer(player),
_lastRequest(0), _queuedTrack(0) {
Std::memset(_songBranches, (byte)-1, 128 * sizeof(int));
- the_music_process = this;
+ _theMusicProcess = this;
_flags |= PROC_RUNPAUSED;
_type = 1; // persistent
}
MusicProcess::~MusicProcess() {
- the_music_process = 0;
+ _theMusicProcess = 0;
}
void MusicProcess::playMusic(int track) {
@@ -243,7 +243,7 @@ bool MusicProcess::loadData(IDataSource *ids, uint32 version) {
_state = MUSIC_PLAY_WANTED;
- the_music_process = this;
+ _theMusicProcess = this;
_midiPlayer = AudioMixer::get_instance()->getMidiPlayer();
@@ -252,25 +252,25 @@ bool MusicProcess::loadData(IDataSource *ids, uint32 version) {
uint32 MusicProcess::I_musicStop(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- if (the_music_process) the_music_process->playMusic_internal(0);
+ if (_theMusicProcess) _theMusicProcess->playMusic_internal(0);
return 0;
}
uint32 MusicProcess::I_playMusic(const uint8 *args,
unsigned int /*argsize*/) {
ARG_UINT8(song);
- if (the_music_process) the_music_process->playMusic(song & 0x7F);
+ if (_theMusicProcess) _theMusicProcess->playMusic(song & 0x7F);
return 0;
}
void MusicProcess::ConCmd_playMusic(const Console::ArgvType &argv) {
- if (the_music_process) {
+ if (_theMusicProcess) {
if (argv.size() != 2) {
pout << "MusicProcess::playMusic (tracknum)" << Std::endl;
} else {
pout << "Playing track " << argv[1] << Std::endl;
- the_music_process->playMusic_internal(atoi(argv[1].c_str()));
+ _theMusicProcess->playMusic_internal(atoi(argv[1].c_str()));
}
} else {
pout << "No Music Process" << Std::endl;
diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h
index b64552c..6ee2a03 100644
--- a/engines/ultima/ultima8/audio/music_process.h
+++ b/engines/ultima/ultima8/audio/music_process.h
@@ -46,7 +46,7 @@ private:
//! \param track The track number to play. Pass 0 to stop music
void playMusic_internal(int track);
- static MusicProcess *the_music_process;
+ static MusicProcess *_theMusicProcess;
MidiPlayer *_midiPlayer;
MusicStates _state;
@@ -66,7 +66,7 @@ public:
//! Get the current instance of the Music Processes
static MusicProcess *get_instance() {
- return the_music_process;
+ return _theMusicProcess;
}
void playMusic(int track);
diff --git a/engines/ultima/ultima8/graphics/skf_player.cpp b/engines/ultima/ultima8/graphics/skf_player.cpp
index 8ecbfa7..ab123c9 100644
--- a/engines/ultima/ultima8/graphics/skf_player.cpp
+++ b/engines/ultima/ultima8/graphics/skf_player.cpp
@@ -56,9 +56,9 @@ enum SKFAction {
};
struct SKFEvent {
- unsigned int frame;
- SKFAction action;
- unsigned int data;
+ unsigned int _frame;
+ SKFAction _action;
+ unsigned int _data;
};
// number of steps in a fade
@@ -95,9 +95,9 @@ void SKFPlayer::parseEventList(IDataSource *eventlist) {
uint16 frame = eventlist->read2();
while (frame != 0xFFFF) {
SKFEvent *ev = new SKFEvent;
- ev->frame = frame;
- ev->action = static_cast<SKFAction>(eventlist->read2());
- ev->data = eventlist->read2();
+ ev->_frame = frame;
+ ev->_action = static_cast<SKFAction>(eventlist->read2());
+ ev->_data = eventlist->read2();
_events.push_back(ev);
frame = eventlist->read2();
@@ -173,9 +173,9 @@ void SKFPlayer::run() {
AudioProcess *audioproc = AudioProcess::get_instance();
// handle _events for the current frame
- while (_curEvent < _events.size() && _events[_curEvent]->frame <= _curFrame) {
+ while (_curEvent < _events.size() && _events[_curEvent]->_frame <= _curFrame) {
// pout << "event " << _curEvent << Std::endl;
- switch (_events[_curEvent]->action) {
+ switch (_events[_curEvent]->_action) {
case SKF_FadeOut:
_curAction = SKF_FadeOut;
_fadeColour = 0;
@@ -194,36 +194,36 @@ void SKFPlayer::run() {
// pout << "FadeWhite" << Std::endl;
break;
case SKF_Wait:
-// pout << "Wait " << _events[_curEvent]->data << Std::endl;
- _timer = _events[_curEvent]->data;
+// pout << "Wait " << _events[_curEvent]->_data << Std::endl;
+ _timer = _events[_curEvent]->_data;
_curEvent++;
return;
case SKF_PlayMusic:
-// pout << "PlayMusic " << _events[_curEvent]->data << Std::endl;
- if (musicproc) musicproc->playMusic(_events[_curEvent]->data);
+// pout << "PlayMusic " << _events[_curEvent]->_data << Std::endl;
+ if (musicproc) musicproc->playMusic(_events[_curEvent]->_data);
break;
case SKF_SlowStopMusic:
POUT("SlowStopMusic");
if (musicproc && !_introMusicHack) musicproc->playMusic(0);
break;
case SKF_PlaySFX:
-// pout << "PlaySFX " << _events[_curEvent]->data << Std::endl;
- if (audioproc) audioproc->playSFX(_events[_curEvent]->data, 0x60, 0, 0);
+// pout << "PlaySFX " << _events[_curEvent]->_data << Std::endl;
+ if (audioproc) audioproc->playSFX(_events[_curEvent]->_data, 0x60, 0, 0);
break;
case SKF_StopSFX:
-// pout << "StopSFX" << _events[_curEvent]->data << Std::endl;
- if (audioproc) audioproc->stopSFX(_events[_curEvent]->data, 0);
+// pout << "StopSFX" << _events[_curEvent]->_data << Std::endl;
+ if (audioproc) audioproc->stopSFX(_events[_curEvent]->_data, 0);
break;
case SKF_SetSpeed:
- POUT("SetSpeed " << _events[_curEvent]->data);
-// _frameRate = _events[_curEvent]->data;
+ POUT("SetSpeed " << _events[_curEvent]->_data);
+// _frameRate = _events[_curEvent]->_data;
break;
case SKF_PlaySound: {
-// pout << "PlaySound " << _events[_curEvent]->data << Std::endl;
+// pout << "PlaySound " << _events[_curEvent]->_data << Std::endl;
if (audioproc) {
- uint8 *buf = _skf->get_object(_events[_curEvent]->data);
- uint32 bufsize = _skf->get_size(_events[_curEvent]->data);
+ uint8 *buf = _skf->get_object(_events[_curEvent]->_data);
+ uint32 bufsize = _skf->get_size(_events[_curEvent]->_data);
AudioSample *s;
uint32 rate = buf[6] + (buf[7] << 8);
bool stereo = (buf[8] == 2);
@@ -235,8 +235,8 @@ void SKFPlayer::run() {
// subtitles
char *textbuf = reinterpret_cast<char *>(
- _skf->get_object(_events[_curEvent]->data - 1));
- uint32 textsize = _skf->get_size(_events[_curEvent]->data - 1);
+ _skf->get_object(_events[_curEvent]->_data - 1));
+ uint32 textsize = _skf->get_size(_events[_curEvent]->_data - 1);
if (textsize > 7) {
Std::string subtitle = (textbuf + 6);
delete _subs;
diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/graphics/type_flags.cpp
index 8b4d8ab..b2ab460 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -186,39 +186,39 @@ void TypeFlags::loadWeaponInfo() {
int val;
config->get(k + "/shape", val);
- wi->shape = static_cast<uint32>(val);
+ wi->_shape = static_cast<uint32>(val);
config->get(k + "/overlay", val);
- wi->overlay_type = static_cast<uint8>(val);
+ wi->_overlayType = static_cast<uint8>(val);
config->get(k + "/overlay_shape", val);
- wi->overlay_shape = static_cast<uint32>(val);
+ wi->_overlayShape = static_cast<uint32>(val);
config->get(k + "/damage_mod", val);
- wi->damage_modifier = static_cast<uint8>(val);
+ wi->_damageModifier = static_cast<uint8>(val);
config->get(k + "/base_damage", val);
- wi->base_damage = static_cast<uint8>(val);
+ wi->_baseDamage = static_cast<uint8>(val);
config->get(k + "/attack_dex", val);
- wi->dex_attack_bonus = static_cast<uint8>(val);
+ wi->_dexAttackBonus = static_cast<uint8>(val);
config->get(k + "/defend_dex", val);
- wi->dex_defend_bonus = static_cast<uint8>(val);
+ wi->_dexDefendBonus = static_cast<uint8>(val);
config->get(k + "/armour", val);
- wi->armour_bonus = static_cast<uint8>(val);
+ wi->_armourBonus = static_cast<uint8>(val);
config->get(k + "/damage_type", val);
- wi->damage_type = static_cast<uint16>(val);
+ wi->_damageType = static_cast<uint16>(val);
if (config->get(k + "/treasure_chance", val))
- wi->treasure_chance = static_cast<uint16>(val);
+ wi->_treasureChance = static_cast<uint16>(val);
else
- wi->treasure_chance = 0;
+ wi->_treasureChance = 0;
- assert(wi->shape < shapeInfo.size());
- shapeInfo[wi->shape]._weaponInfo = wi;
+ assert(wi->_shape < shapeInfo.size());
+ shapeInfo[wi->_shape]._weaponInfo = wi;
}
}
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 23f58d7..5ecb760 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -162,7 +162,7 @@ bool Actor::giveTreasure() {
ShapeInfo *si = mainshapes->getShapeInfo(s);
if (!si->_weaponInfo) continue;
- int chance = si->_weaponInfo->treasure_chance;
+ int chance = si->_weaponInfo->_treasureChance;
if (!chance) continue;
int r = getRandom() % 100;
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index bbd5822..ff1b985 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -192,7 +192,7 @@ uint32 MainActor::getArmourClass() {
armour += si->_armourInfo[frameNum]._armourClass;
}
if (si->_weaponInfo) {
- armour += si->_weaponInfo->armour_bonus;
+ armour += si->_weaponInfo->_armourBonus;
}
}
@@ -206,7 +206,7 @@ int16 MainActor::getDefendingDex() {
if (weapon) {
ShapeInfo *si = weapon->getShapeInfo();
assert(si->_weaponInfo);
- dex += si->_weaponInfo->dex_defend_bonus;
+ dex += si->_weaponInfo->_dexDefendBonus;
}
if (dex <= 0) dex = 1;
@@ -221,7 +221,7 @@ int16 MainActor::getAttackingDex() {
if (weapon) {
ShapeInfo *si = weapon->getShapeInfo();
assert(si->_weaponInfo);
- dex += si->_weaponInfo->dex_attack_bonus;
+ dex += si->_weaponInfo->_dexAttackBonus;
}
return dex;
@@ -236,7 +236,7 @@ uint16 MainActor::getDamageType() {
ShapeInfo *si = weapon->getShapeInfo();
assert(si->_weaponInfo);
- return si->_weaponInfo->damage_type;
+ return si->_weaponInfo->_damageType;
}
return Actor::getDamageType();
@@ -271,8 +271,8 @@ int MainActor::getDamageAmount() {
ShapeInfo *si = weapon->getShapeInfo();
assert(si->_weaponInfo);
- int base = si->_weaponInfo->base_damage;
- int mod = si->_weaponInfo->damage_modifier;
+ int base = si->_weaponInfo->_baseDamage;
+ int mod = si->_weaponInfo->_damageModifier;
damage = (getRandom() % (mod + 1)) + base + getStr() / 5;
@@ -515,10 +515,10 @@ void MainActor::getWeaponOverlay(const WeaponOverlayFrame *&frame_, uint32 &shap
WeaponInfo *weaponinfo = shapeinfo->_weaponInfo;
if (!weaponinfo) return;
- shape_ = weaponinfo->overlay_shape;
+ shape_ = weaponinfo->_overlayShape;
WpnOvlayDat *wpnovlay = GameData::get_instance()->getWeaponOverlay();
- frame_ = wpnovlay->getOverlayFrame(_lastAnim, weaponinfo->overlay_type,
+ frame_ = wpnovlay->getOverlayFrame(_lastAnim, weaponinfo->_overlayType,
_direction, _animFrame);
if (frame_ == 0) shape_ = 0;
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 2612be7..308bb70 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1540,7 +1540,7 @@ void Item::explode() {
uint16 Item::getDamageType() {
ShapeInfo *si = getShapeInfo();
if (si->_weaponInfo) {
- return si->_weaponInfo->damage_type;
+ return si->_weaponInfo->_damageType;
}
return 0;
diff --git a/engines/ultima/ultima8/world/weapon_info.h b/engines/ultima/ultima8/world/weapon_info.h
index 87e2b1f..b74f1dc 100644
--- a/engines/ultima/ultima8/world/weapon_info.h
+++ b/engines/ultima/ultima8/world/weapon_info.h
@@ -25,16 +25,16 @@
struct WeaponInfo {
- uint32 shape;
- uint8 overlay_type;
- uint32 overlay_shape;
- uint8 damage_modifier;
- uint8 base_damage;
- uint8 dex_attack_bonus;
- uint8 dex_defend_bonus;
- uint8 armour_bonus;
- uint16 damage_type;
- int treasure_chance;
+ uint32 _shape;
+ uint8 _overlayType;
+ uint32 _overlayShape;
+ uint8 _damageModifier;
+ uint8 _baseDamage;
+ uint8 _dexAttackBonus;
+ uint8 _dexDefendBonus;
+ uint8 _armourBonus;
+ uint16 _damageType;
+ int _treasureChance;
enum DmgType {
DMG_NORMAL = 0x0001,
Commit: d47abaeb50bbfa1cd365f604f1c63d13ab2a0312
https://github.com/scummvm/scummvm/commit/d47abaeb50bbfa1cd365f604f1c63d13ab2a0312
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-17T20:49:49-08:00
Commit Message:
ULTIMA8: Janitorial
Changed paths:
engines/ultima/ultima8/audio/raw_audio_sample.cpp
engines/ultima/ultima8/conf/ini_file.cpp
engines/ultima/ultima8/filesys/dir_file.cpp
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/graphics/anim_dat.cpp
engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
engines/ultima/ultima8/graphics/type_flags.cpp
engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
engines/ultima/ultima8/gumps/ask_gump.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/mini_stats_gump.cpp
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/misc/id_man.cpp
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/pathfinder_process.cpp
engines/ultima/ultima8/world/camera_process.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/create_item_process.cpp
engines/ultima/ultima8/world/egg.cpp
engines/ultima/ultima8/world/egg_hatcher_process.cpp
engines/ultima/ultima8/world/glob_egg.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/map_glob.cpp
engines/ultima/ultima8/world/missile_tracker.cpp
engines/ultima/ultima8/world/monster_egg.cpp
engines/ultima/ultima8/world/teleport_egg.cpp
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.cpp b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
index c21f518..00d6856 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.cpp
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.cpp
@@ -39,7 +39,6 @@ RawAudioSample::RawAudioSample(uint8 *buffer_, uint32 size, uint32 rate,
}
RawAudioSample::~RawAudioSample() {
-
}
void RawAudioSample::initDecompressor(void *DecompData) const {
diff --git a/engines/ultima/ultima8/conf/ini_file.cpp b/engines/ultima/ultima8/conf/ini_file.cpp
index 9c8a9b5..7bb84e9 100644
--- a/engines/ultima/ultima8/conf/ini_file.cpp
+++ b/engines/ultima/ultima8/conf/ini_file.cpp
@@ -38,7 +38,6 @@ INIFile::INIFile(string fname, istring root)
}
INIFile::~INIFile() {
-
}
bool INIFile::Section::hasKey(istring key) {
diff --git a/engines/ultima/ultima8/filesys/dir_file.cpp b/engines/ultima/ultima8/filesys/dir_file.cpp
index 9b7d00c..7e5c4e6 100644
--- a/engines/ultima/ultima8/filesys/dir_file.cpp
+++ b/engines/ultima/ultima8/filesys/dir_file.cpp
@@ -45,7 +45,6 @@ DirFile::DirFile(const Std::string &path) {
DirFile::~DirFile() {
-
}
bool DirFile::readMetadata() {
diff --git a/engines/ultima/ultima8/games/treasure_loader.cpp b/engines/ultima/ultima8/games/treasure_loader.cpp
index c0d9d9b..31e7fce 100644
--- a/engines/ultima/ultima8/games/treasure_loader.cpp
+++ b/engines/ultima/ultima8/games/treasure_loader.cpp
@@ -26,11 +26,9 @@ namespace Ultima {
namespace Ultima8 {
TreasureLoader::TreasureLoader() {
-
}
TreasureLoader::~TreasureLoader() {
-
}
void TreasureLoader::loadDefaults() {
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp
index ee83870..8e8c63b 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/graphics/anim_dat.cpp
@@ -34,10 +34,8 @@ namespace Ultima {
namespace Ultima8 {
AnimDat::AnimDat() {
-
}
-
AnimDat::~AnimDat() {
for (unsigned int i = 0; i < _anims.size(); i++)
delete _anims[i];
diff --git a/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
index c899f82..5104f18 100644
--- a/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/rendered_text.cpp
@@ -30,12 +30,10 @@ DEFINE_RUNTIME_CLASSTYPE_CODE_BASE_CLASS(RenderedText)
RenderedText::RenderedText()
: _width(-1), _height(-1), _vLead(0) {
-
}
RenderedText::~RenderedText() {
-
}
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/graphics/type_flags.cpp
index b2ab460..43abd9b 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -36,12 +36,10 @@ namespace Ultima {
namespace Ultima8 {
TypeFlags::TypeFlags() {
-
}
TypeFlags::~TypeFlags() {
-
}
ShapeInfo *TypeFlags::getShapeInfo(uint32 shapenum) {
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
index f97130e..12f6aea 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
+++ b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
@@ -35,10 +35,8 @@ namespace Ultima {
namespace Ultima8 {
WpnOvlayDat::WpnOvlayDat() {
-
}
-
WpnOvlayDat::~WpnOvlayDat() {
for (unsigned int i = 0; i < _overlay.size(); i++)
delete _overlay[i];
diff --git a/engines/ultima/ultima8/gumps/ask_gump.cpp b/engines/ultima/ultima8/gumps/ask_gump.cpp
index 44f1029..57c94dc 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.cpp
+++ b/engines/ultima/ultima8/gumps/ask_gump.cpp
@@ -36,7 +36,6 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(AskGump, ItemRelativeGump)
AskGump::AskGump() : ItemRelativeGump(), _answers(0) {
-
}
AskGump::AskGump(uint16 owner, UCList *answers) :
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index c1defae..92cd64d 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -63,7 +63,6 @@ ContainerGump::ContainerGump(Shape *shape, uint32 frameNum, uint16 owner,
}
ContainerGump::~ContainerGump() {
-
}
void ContainerGump::InitGump(Gump *newparent, bool take_focus) {
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
index c26419d..67e1d5f 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.cpp
@@ -57,11 +57,9 @@ MiniStatsGump::MiniStatsGump() : Gump() {
MiniStatsGump::MiniStatsGump(int x, int y, uint32 flags, int32 layer)
: Gump(x, y, 5, 5, 0, flags, layer) {
-
}
MiniStatsGump::~MiniStatsGump() {
-
}
void MiniStatsGump::InitGump(Gump *newparent, bool take_focus) {
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 6530c52..b7af7a4 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -69,7 +69,6 @@ ShapeViewerGump::ShapeViewerGump(int width, int height,
}
ShapeViewerGump::~ShapeViewerGump() {
-
}
void ShapeViewerGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool /*scaled*/) {
diff --git a/engines/ultima/ultima8/gumps/slider_gump.cpp b/engines/ultima/ultima8/gumps/slider_gump.cpp
index 0c16088..65807e9 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.cpp
+++ b/engines/ultima/ultima8/gumps/slider_gump.cpp
@@ -55,7 +55,6 @@ SliderGump::SliderGump(int x, int y, int16 min, int16 max,
}
SliderGump::~SliderGump() {
-
}
/*
diff --git a/engines/ultima/ultima8/gumps/target_gump.cpp b/engines/ultima/ultima8/gumps/target_gump.cpp
index 285291e..2523a1c 100644
--- a/engines/ultima/ultima8/gumps/target_gump.cpp
+++ b/engines/ultima/ultima8/gumps/target_gump.cpp
@@ -47,7 +47,6 @@ TargetGump::TargetGump(int x_, int y_)
}
TargetGump::~TargetGump() {
-
}
void TargetGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) {
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 117053d..87a3310 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -49,11 +49,9 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(U8SaveGump, Gump)
U8SaveGump::U8SaveGump(bool save, int page)
: Gump(0, 0, 5, 5), _save(save), _page(page) {
-
}
U8SaveGump::~U8SaveGump() {
-
}
diff --git a/engines/ultima/ultima8/misc/id_man.cpp b/engines/ultima/ultima8/misc/id_man.cpp
index e328bdf..2ae2d25 100644
--- a/engines/ultima/ultima8/misc/id_man.cpp
+++ b/engines/ultima/ultima8/misc/id_man.cpp
@@ -44,7 +44,6 @@ idMan::idMan(uint16 begin, uint16 maxEnd, uint16 startCount)
}
idMan::~idMan() {
-
}
void idMan::clearAll(uint16 new_max) {
diff --git a/engines/ultima/ultima8/usecode/uc_process.cpp b/engines/ultima/ultima8/usecode/uc_process.cpp
index 381457c..f92e316 100644
--- a/engines/ultima/ultima8/usecode/uc_process.cpp
+++ b/engines/ultima/ultima8/usecode/uc_process.cpp
@@ -51,7 +51,6 @@ UCProcess::UCProcess(uint16 classid_, uint16 offset_, uint32 this_ptr,
}
UCProcess::~UCProcess() {
-
}
void UCProcess::load(uint16 classid_, uint16 offset_, uint32 this_ptr,
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 5ecb760..0c40ce7 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -68,7 +68,6 @@ Actor::Actor() : _strength(0), _dexterity(0), _intelligence(0),
}
Actor::~Actor() {
-
}
uint16 Actor::assignObjId() {
diff --git a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
index 7c4a7e5..50d36d4 100644
--- a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.cpp
@@ -38,16 +38,13 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(ActorBarkNotifyProcess, GumpNotifyProcess)
ActorBarkNotifyProcess::ActorBarkNotifyProcess()
: GumpNotifyProcess() {
-
}
ActorBarkNotifyProcess::ActorBarkNotifyProcess(uint16 it)
: GumpNotifyProcess(it) {
-
}
ActorBarkNotifyProcess::~ActorBarkNotifyProcess(void) {
-
}
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index f0f2c3d..3c0c74c 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -47,11 +47,9 @@ static const int watchactor = WATCHACTOR;
#endif
AnimationTracker::AnimationTracker() {
-
}
AnimationTracker::~AnimationTracker() {
-
}
bool AnimationTracker::init(Actor *actor_, Animation::Sequence action_,
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
index 5144764..b803298 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
@@ -60,7 +60,6 @@ AvatarMoverProcess::AvatarMoverProcess() : Process() {
AvatarMoverProcess::~AvatarMoverProcess() {
-
}
void AvatarMoverProcess::run() {
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
index 7091984..fbfe58c 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
@@ -116,7 +116,6 @@ PathfinderProcess::PathfinderProcess(Actor *actor_,
}
PathfinderProcess::~PathfinderProcess() {
-
}
void PathfinderProcess::terminate() {
diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index 6f9e501..339285f 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -49,7 +49,6 @@ int32 CameraProcess::_eqX = 0;
int32 CameraProcess::_eqY = 0;
CameraProcess::CameraProcess() : Process() {
-
}
CameraProcess::~CameraProcess() {
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index c9f9d6f..c72fa29 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -43,7 +43,6 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(Container, Item)
Container::Container() {
-
}
diff --git a/engines/ultima/ultima8/world/create_item_process.cpp b/engines/ultima/ultima8/world/create_item_process.cpp
index ffec9a2..9d872b3 100644
--- a/engines/ultima/ultima8/world/create_item_process.cpp
+++ b/engines/ultima/ultima8/world/create_item_process.cpp
@@ -51,7 +51,6 @@ CreateItemProcess::CreateItemProcess(uint32 shape_, uint32 frame_,
}
CreateItemProcess::~CreateItemProcess(void) {
-
}
void CreateItemProcess::run() {
diff --git a/engines/ultima/ultima8/world/egg.cpp b/engines/ultima/ultima8/world/egg.cpp
index 8a912f6..7c97ffe 100644
--- a/engines/ultima/ultima8/world/egg.cpp
+++ b/engines/ultima/ultima8/world/egg.cpp
@@ -40,7 +40,6 @@ Egg::Egg() : _hatched(false) {
Egg::~Egg() {
-
}
uint16 Egg::hatch() {
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.cpp b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
index d739137..6da2e96 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.cpp
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
@@ -37,12 +37,10 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(EggHatcherProcess, Process)
EggHatcherProcess::EggHatcherProcess() {
-
}
EggHatcherProcess::~EggHatcherProcess() {
-
}
void EggHatcherProcess::addEgg(uint16 egg) {
diff --git a/engines/ultima/ultima8/world/glob_egg.cpp b/engines/ultima/ultima8/world/glob_egg.cpp
index b284d4d..e632fdc 100644
--- a/engines/ultima/ultima8/world/glob_egg.cpp
+++ b/engines/ultima/ultima8/world/glob_egg.cpp
@@ -38,11 +38,9 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(GlobEgg, Item)
GlobEgg::GlobEgg() {
-
}
GlobEgg::~GlobEgg() {
-
}
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index c1e3500..87adfa6 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -39,9 +39,7 @@ namespace Ultima8 {
//#define DUMP_ITEMS
-Map::Map(uint32 mapNum)
- : _mapNum(mapNum) {
-
+Map::Map(uint32 mapNum) : _mapNum(mapNum) {
}
diff --git a/engines/ultima/ultima8/world/map_glob.cpp b/engines/ultima/ultima8/world/map_glob.cpp
index c5f768a..5d48cb0 100644
--- a/engines/ultima/ultima8/world/map_glob.cpp
+++ b/engines/ultima/ultima8/world/map_glob.cpp
@@ -29,7 +29,6 @@ namespace Ultima {
namespace Ultima8 {
MapGlob::MapGlob() {
-
}
diff --git a/engines/ultima/ultima8/world/missile_tracker.cpp b/engines/ultima/ultima8/world/missile_tracker.cpp
index d24c532..d173d2e 100644
--- a/engines/ultima/ultima8/world/missile_tracker.cpp
+++ b/engines/ultima/ultima8/world/missile_tracker.cpp
@@ -124,7 +124,6 @@ void MissileTracker::init(int32 x, int32 y, int32 z, int32 speed) {
}
MissileTracker::~MissileTracker() {
-
}
bool MissileTracker::isPathClear() {
diff --git a/engines/ultima/ultima8/world/monster_egg.cpp b/engines/ultima/ultima8/world/monster_egg.cpp
index bda0c24..d4dc83a 100644
--- a/engines/ultima/ultima8/world/monster_egg.cpp
+++ b/engines/ultima/ultima8/world/monster_egg.cpp
@@ -42,12 +42,10 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(MonsterEgg, Item)
MonsterEgg::MonsterEgg() {
-
}
MonsterEgg::~MonsterEgg() {
-
}
uint16 MonsterEgg::hatch() {
diff --git a/engines/ultima/ultima8/world/teleport_egg.cpp b/engines/ultima/ultima8/world/teleport_egg.cpp
index ee43033..f3ebbcf 100644
--- a/engines/ultima/ultima8/world/teleport_egg.cpp
+++ b/engines/ultima/ultima8/world/teleport_egg.cpp
@@ -35,12 +35,10 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(TeleportEgg, Egg)
TeleportEgg::TeleportEgg() {
-
}
TeleportEgg::~TeleportEgg() {
-
}
uint16 TeleportEgg::hatch() {
More information about the Scummvm-git-logs
mailing list