aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/particles
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-26 22:20:55 +0200
committerEinar Johan Trøan Sømåen2012-07-26 22:20:55 +0200
commit3a49f2bad407787ef65d04c5f9ae423485629b41 (patch)
treef7ceed0ac885724b5569302bc23ba3f027705fb1 /engines/wintermute/base/particles
parent496a3938c451683845e73fa9b2cba20dadddfe21 (diff)
downloadscummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.gz
scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.bz2
scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.zip
WINTERMUTE: More variable/function renaming VarName->varName
Diffstat (limited to 'engines/wintermute/base/particles')
-rw-r--r--engines/wintermute/base/particles/part_emitter.cpp10
-rw-r--r--engines/wintermute/base/particles/part_particle.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 8b86365196..f8c0c1a5cf 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -45,7 +45,7 @@ namespace WinterMute {
IMPLEMENT_PERSISTENT(PartEmitter, false)
//////////////////////////////////////////////////////////////////////////
-PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner) : BaseObject(inGame) {
+PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *owner) : BaseObject(inGame) {
_width = _height = 0;
BasePlatform::setRectEmpty(&_border);
@@ -88,7 +88,7 @@ PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner) : BaseObject
_useRegion = false;
_emitEvent = NULL;
- _owner = Owner;
+ _owner = owner;
}
@@ -136,9 +136,9 @@ bool PartEmitter::addSprite(const char *filename) {
_gameRef->_fileManager->closeFile(File);
}
- char *Str = new char[strlen(filename) + 1];
- strcpy(Str, filename);
- _sprites.add(Str);
+ char *str = new char[strlen(filename) + 1];
+ strcpy(str, filename);
+ _sprites.add(str);
return STATUS_OK;
}
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 4a5239edfe..27dbe9999c 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -198,7 +198,7 @@ bool PartParticle::display(PartEmitter *emitter) {
return STATUS_OK;
}
- _sprite->GetCurrentFrame();
+ _sprite->getCurrentFrame();
return _sprite->display(_pos.x, _pos.y,
NULL,
_scale, _scale,