[Scummvm-git-logs] scummvm master -> e2001d107d39db9c5dcc5079c22bec617258a82e
mduggan
mgithub at guarana.org
Wed May 13 11:42:37 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e2001d107d ULTIMA8: Remove _ from non-member variable names
Commit: e2001d107d39db9c5dcc5079c22bec617258a82e
https://github.com/scummvm/scummvm/commit/e2001d107d39db9c5dcc5079c22bec617258a82e
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-13T20:41:11+09:00
Commit Message:
ULTIMA8: Remove _ from non-member variable names
Changed paths:
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/world/camera_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/sprite_process.cpp
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index bba6b36549..cae1e477af 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -533,28 +533,28 @@ uint32 AudioProcess::I_playAmbientSFXCru(const uint8 *args, unsigned int argsize
}
uint32 AudioProcess::I_isSFXPlaying(const uint8 *args, unsigned int argsize) {
- ARG_SINT16(_sfxNum);
+ ARG_SINT16(sfxNum);
AudioProcess *ap = AudioProcess::get_instance();
- if (ap) return ap->isSFXPlaying(_sfxNum);
+ if (ap) return ap->isSFXPlaying(sfxNum);
else perr << "Error: No AudioProcess" << Std::endl;
return 0;
}
uint32 AudioProcess::I_setVolumeSFX(const uint8 *args, unsigned int /*argsize*/) {
- // Sets _volume for last played instances of _sfxNum (???)
- ARG_SINT16(_sfxNum);
- ARG_UINT8(_volume);
+ // Sets volume for last played instances of sfxNum (???)
+ ARG_SINT16(sfxNum);
+ ARG_UINT8(volume);
AudioProcess *ap = AudioProcess::get_instance();
- if (ap) ap->setVolumeSFX(_sfxNum, _volume);
+ if (ap) ap->setVolumeSFX(sfxNum, volume);
else perr << "Error: No AudioProcess" << Std::endl;
return 0;
}
uint32 AudioProcess::I_stopSFX(const uint8 *args, unsigned int argsize) {
- ARG_SINT16(_sfxNum);
+ ARG_SINT16(sfxNum);
ObjId objId = 0;
if (argsize == 4) {
@@ -563,7 +563,7 @@ uint32 AudioProcess::I_stopSFX(const uint8 *args, unsigned int argsize) {
}
AudioProcess *ap = AudioProcess::get_instance();
- if (ap) ap->stopSFX(_sfxNum, objId);
+ if (ap) ap->stopSFX(sfxNum, objId);
else perr << "Error: No AudioProcess" << Std::endl;
return 0;
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.cpp b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
index bcaa497a7a..6a8cdb1fb6 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.cpp
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.cpp
@@ -129,14 +129,14 @@ bool PaletteFaderProcess::loadData(Common::ReadStream *rs, uint32 version) {
uint32 PaletteFaderProcess::I_fadeToPaletteTransform(const uint8 *args,
unsigned int /*argsize*/) {
ARG_UINT16(transform);
- ARG_UINT16(_priority);
+ ARG_UINT16(priority);
// If current _fader has higher _priority, we do nothing
- if (_fader && _fader->_priority > _priority) return 0;
+ if (_fader && _fader->_priority > priority) return 0;
else if (_fader) _fader->terminate();
_fader = new PaletteFaderProcess(static_cast<PalTransforms>(transform),
- _priority, 45);
+ priority, 45);
return Kernel::get_instance()->addProcess(_fader);
}
diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index 84f570255f..6b81924990 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -324,8 +324,8 @@ uint32 CameraProcess::I_move_to(const uint8 *args, unsigned int /*argsize*/) {
// "Camera::setCenterOn(uword)",
uint32 CameraProcess::I_setCenterOn(const uint8 *args, unsigned int /*argsize*/) {
- ARG_OBJID(_itemNum);
- CameraProcess::SetCameraProcess(new CameraProcess(_itemNum));
+ ARG_OBJID(itemNum);
+ CameraProcess::SetCameraProcess(new CameraProcess(itemNum));
return 0;
}
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 0cb15593b2..68bca459f0 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1915,10 +1915,10 @@ uint32 Item::I_getShape(const uint8 *args, unsigned int /*argsize*/) {
uint32 Item::I_setShape(const uint8 *args, unsigned int /*argsize*/) {
ARG_ITEM_FROM_PTR(item);
- ARG_UINT16(_shape);
+ ARG_UINT16(shape);
if (!item) return 0;
- item->setShape(_shape);
+ item->setShape(shape);
return 0;
}
@@ -1931,10 +1931,10 @@ uint32 Item::I_getFrame(const uint8 *args, unsigned int /*argsize*/) {
uint32 Item::I_setFrame(const uint8 *args, unsigned int /*argsize*/) {
ARG_ITEM_FROM_PTR(item);
- ARG_UINT16(_frame);
+ ARG_UINT16(frame);
if (!item) return 0;
- item->setFrame(_frame);
+ item->setFrame(frame);
return 0;
}
@@ -2468,30 +2468,30 @@ uint32 Item::I_pop(const uint8 *args, unsigned int /*argsize*/) {
uint32 Item::I_popToCoords(const uint8 *args, unsigned int /*argsize*/) {
ARG_NULL32(); // ARG_ITEM_FROM_PTR(item); // unused
- ARG_UINT16(_x);
- ARG_UINT16(_y);
- ARG_UINT16(_z);
+ ARG_UINT16(x);
+ ARG_UINT16(y);
+ ARG_UINT16(z);
World *w = World::get_instance();
if (w->etherealEmpty()) return 0; // no items left on stack
- uint16 _objId = w->etherealPeek();
- Item *item = getItem(_objId);
+ uint16 objId = w->etherealPeek();
+ Item *item = getItem(objId);
if (!item) {
- w->etherealRemove(_objId);
+ w->etherealRemove(objId);
return 0; // top item was invalid
}
- item->move(_x, _y, _z);
+ item->move(x, y, z);
#if 0
- perr << "Popping item into map: " << item->getShape() << "," << item->getFrame() << " at (" << _x << "," << _y << "," << _z << ")" << Std::endl;
+ perr << "Popping item into map: " << item->getShape() << "," << item->getFrame() << " at (" << x << "," << y << "," << z << ")" << Std::endl;
#endif
//! Anything else?
- return _objId;
+ return objId;
}
uint32 Item::I_popToContainer(const uint8 *args, unsigned int /*argsize*/) {
@@ -2609,10 +2609,10 @@ uint32 Item::I_getMapArray(const uint8 *args, unsigned int /*argsize*/) {
//!!! is this correct?
uint32 Item::I_setMapArray(const uint8 *args, unsigned int /*argsize*/) {
ARG_ITEM_FROM_PTR(item);
- ARG_UINT16(_mapNum);
+ ARG_UINT16(mapNum);
if (!item) return 0;
- item->setMapNum(_mapNum);
+ item->setMapNum(mapNum);
return 0;
}
@@ -2625,26 +2625,26 @@ uint32 Item::I_getNpcNum(const uint8 *args, unsigned int /*argsize*/) {
uint32 Item::I_getDirToCoords(const uint8 *args, unsigned int /*argsize*/) {
ARG_ITEM_FROM_PTR(item);
- ARG_UINT16(_x);
- ARG_UINT16(_y);
+ ARG_UINT16(x);
+ ARG_UINT16(y);
if (!item) return 0;
int32 ix, iy, iz;
item->getLocationAbsolute(ix, iy, iz);
- return Get_WorldDirection(_y - iy, _x - ix);
+ return Get_WorldDirection(y - iy, x - ix);
}
uint32 Item::I_getDirFromCoords(const uint8 *args, unsigned int /*argsize*/) {
ARG_ITEM_FROM_PTR(item);
- ARG_UINT16(_x);
- ARG_UINT16(_y);
+ ARG_UINT16(x);
+ ARG_UINT16(y);
if (!item) return 0;
int32 ix, iy, iz;
item->getLocationAbsolute(ix, iy, iz);
- return Get_WorldDirection(iy - _y, ix - _x);
+ return Get_WorldDirection(iy - y, ix - x);
}
uint32 Item::I_getDirToItem(const uint8 *args, unsigned int /*argsize*/) {
@@ -2815,15 +2815,15 @@ uint32 Item::I_explode(const uint8 *args, unsigned int /*argsize*/) {
}
uint32 Item::I_igniteChaos(const uint8 *args, unsigned int /*argsize*/) {
- ARG_UINT16(_x);
- ARG_UINT16(_y);
+ ARG_UINT16(x);
+ ARG_UINT16(y);
ARG_NULL8();
UCList itemlist(2);
LOOPSCRIPT(script, LS_SHAPE_EQUAL(592)); // all oilflasks (CONSTANT!)
CurrentMap *currentmap = World::get_instance()->getCurrentMap();
currentmap->areaSearch(&itemlist, script, sizeof(script), 0,
- 160, false, _x, _y); //! CHECKME: 160?
+ 160, false, x, y); //! CHECKME: 160?
for (unsigned int i = 0; i < itemlist.getSize(); ++i) {
Item *item = getItem(itemlist.getuint16(i));
diff --git a/engines/ultima/ultima8/world/sprite_process.cpp b/engines/ultima/ultima8/world/sprite_process.cpp
index 108bacff95..d4f1a3781a 100644
--- a/engines/ultima/ultima8/world/sprite_process.cpp
+++ b/engines/ultima/ultima8/world/sprite_process.cpp
@@ -88,13 +88,13 @@ void SpriteProcess::run() {
_delayCounter = (_delayCounter + 1) % _delay;
}
-// createSprite(_shape, _frame, end, _delay, _x, _y, _z);
-// createSprite(_shape, _frame, end, unk, _repeats, _delay, _x, _y, _z);
+// createSprite(shape, frame, end, delay, x, y, z);
+// createSprite(shape, frame, end, unk, repeats, delay, x, y, z);
uint32 SpriteProcess::I_createSprite(const uint8 *args, unsigned int argsize) {
int repeats = 1;
- ARG_SINT16(_shape);
- ARG_SINT16(_frame);
- ARG_SINT16(_lastFrame);
+ ARG_SINT16(shape);
+ ARG_SINT16(frame);
+ ARG_SINT16(lastFrame);
if (argsize == 18) {
ARG_SINT16(unknown);
@@ -102,11 +102,11 @@ uint32 SpriteProcess::I_createSprite(const uint8 *args, unsigned int argsize) {
repeats = repeats_count;
}
- ARG_SINT16(_delay);
- ARG_UINT16(_x);
- ARG_UINT16(_y);
- ARG_UINT8(_z);
- Process *p = new SpriteProcess(_shape, _frame, _lastFrame, repeats, _delay, _x, _y, _z);
+ ARG_SINT16(delay);
+ ARG_UINT16(x);
+ ARG_UINT16(y);
+ ARG_UINT8(z);
+ Process *p = new SpriteProcess(shape, frame, lastFrame, repeats, delay, x, y, z);
return Kernel::get_instance()->addProcess(p);
}
More information about the Scummvm-git-logs
mailing list