diff options
| author | Eugene Sandulenko | 2014-06-15 21:15:31 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-06-15 21:15:31 +0300 |
| commit | 1ebb8aa6debe7fab79bd058730ac07e360a7b486 (patch) | |
| tree | d7024aebdc6f35282c9378663a5512471dfcaa69 /engines/wintermute/base/base_object.cpp | |
| parent | c57991ddfa3532fe02d212f20aa583f9a6c60d62 (diff) | |
| parent | 5c706dde274753b62c9fc72d5d33b4f42100c11a (diff) | |
| download | scummvm-rg350-1ebb8aa6debe7fab79bd058730ac07e360a7b486.tar.gz scummvm-rg350-1ebb8aa6debe7fab79bd058730ac07e360a7b486.tar.bz2 scummvm-rg350-1ebb8aa6debe7fab79bd058730ac07e360a7b486.zip | |
Merge pull request #466 from sev-/transparent-surface
COMMON: Move TransparentSurface to common code
Diffstat (limited to 'engines/wintermute/base/base_object.cpp')
| -rw-r--r-- | engines/wintermute/base/base_object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index 708df8def1..cce3561f67 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -95,7 +95,7 @@ BaseObject::BaseObject(BaseGame *inGame) : BaseScriptHolder(inGame) { _sFXType = SFX_NONE; _sFXParam1 = _sFXParam2 = _sFXParam3 = _sFXParam4 = 0; - _blendMode = BLEND_NORMAL; + _blendMode = Graphics::BLEND_NORMAL; } @@ -807,10 +807,10 @@ bool BaseObject::scSetProperty(const char *name, ScValue *value) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "BlendMode") == 0) { int i = value->getInt(); - if (i < BLEND_NORMAL || i >= NUM_BLEND_MODES) { - i = BLEND_NORMAL; + if (i < Graphics::BLEND_NORMAL || i >= Graphics::NUM_BLEND_MODES) { + i = Graphics::BLEND_NORMAL; } - _blendMode = (TSpriteBlendMode)i; + _blendMode = (Graphics::TSpriteBlendMode)i; return STATUS_OK; } |