diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
| commit | 3a49f2bad407787ef65d04c5f9ae423485629b41 (patch) | |
| tree | f7ceed0ac885724b5569302bc23ba3f027705fb1 /engines/wintermute/base/base_sprite.cpp | |
| parent | 496a3938c451683845e73fa9b2cba20dadddfe21 (diff) | |
| download | scummvm-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/base_sprite.cpp')
| -rw-r--r-- | engines/wintermute/base/base_sprite.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 274c792263..fb1b5a82cf 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -103,7 +103,7 @@ void BaseSprite::cleanup() { //////////////////////////////////////////////////////////////////////////
bool BaseSprite::draw(int x, int y, BaseObject *registerOwner, float zoomX, float zoomY, uint32 alpha) {
- GetCurrentFrame(zoomX, zoomY);
+ getCurrentFrame(zoomX, zoomY);
if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) {
return STATUS_OK;
}
@@ -291,14 +291,14 @@ bool BaseSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteCa break;
case TOKEN_FRAME: {
- int FrameLifeTime = lifeTime;
+ int frameLifeTime = lifeTime;
if (cacheType == CACHE_HALF && frameCount % 2 != 1) {
- FrameLifeTime = -1;
+ frameLifeTime = -1;
}
frame = new BaseFrame(_gameRef);
- if (DID_FAIL(frame->loadBuffer(params, FrameLifeTime, _streamedKeepLoaded))) {
+ if (DID_FAIL(frame->loadBuffer(params, frameLifeTime, _streamedKeepLoaded))) {
delete frame;
_gameRef->LOG(0, "Error parsing frame %d", frameCount);
return STATUS_FAILED;
@@ -345,7 +345,7 @@ void BaseSprite::reset() { //////////////////////////////////////////////////////////////////////
-bool BaseSprite::GetCurrentFrame(float zoomX, float zoomY) {
+bool BaseSprite::getCurrentFrame(float zoomX, float zoomY) {
//if (_owner && _owner->_freezable && _gameRef->_state == GAME_FROZEN) return true;
if (_currentFrame == -1) {
@@ -406,7 +406,7 @@ bool BaseSprite::GetCurrentFrame(float zoomX, float zoomY) { //////////////////////////////////////////////////////////////////////
-bool BaseSprite::display(int X, int Y, BaseObject *Register, float ZoomX, float ZoomY, uint32 Alpha, float Rotate, TSpriteBlendMode BlendMode) {
+bool BaseSprite::display(int x, int y, BaseObject *registerVal, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode) {
if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) {
return STATUS_OK;
}
@@ -421,7 +421,7 @@ bool BaseSprite::display(int X, int Y, BaseObject *Register, float ZoomX, float }
// draw frame
- return _frames[_currentFrame]->draw(X - _gameRef->_offsetX, Y - _gameRef->_offsetY, Register, ZoomX, ZoomY, _precise, Alpha, _editorAllFrames, Rotate, BlendMode);
+ return _frames[_currentFrame]->draw(x - _gameRef->_offsetX, y - _gameRef->_offsetY, registerVal, zoomX, zoomY, _precise, alpha, _editorAllFrames, rotate, blendMode);
}
@@ -549,12 +549,12 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta //////////////////////////////////////////////////////////////////////////
if (strcmp(name, "GetFrame") == 0) {
stack->correctParams(1);
- int Index = stack->pop()->getInt(-1);
- if (Index < 0 || Index >= _frames.getSize()) {
- script->runtimeError("Sprite.GetFrame: Frame index %d is out of range.", Index);
+ int index = stack->pop()->getInt(-1);
+ if (index < 0 || index >= _frames.getSize()) {
+ script->runtimeError("Sprite.GetFrame: Frame index %d is out of range.", index);
stack->pushNULL();
} else {
- stack->pushNative(_frames[Index], true);
+ stack->pushNative(_frames[index], true);
}
return STATUS_OK;
}
|