diff options
| author | Einar Johan Trøan Sømåen | 2012-06-26 02:09:41 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-26 02:09:41 +0200 |
| commit | 191ca9cdeca2fe677299d89c9208e394d3f180f9 (patch) | |
| tree | 8376dbca880290621ea5559cfea90baf1376f124 | |
| parent | caa5ee1d89de77f535f285904eb7c576d0397572 (diff) | |
| download | scummvm-rg350-191ca9cdeca2fe677299d89c9208e394d3f180f9.tar.gz scummvm-rg350-191ca9cdeca2fe677299d89c9208e394d3f180f9.tar.bz2 scummvm-rg350-191ca9cdeca2fe677299d89c9208e394d3f180f9.zip | |
WINTERMUTE: Rename FuncName->funcName in BFader.
| -rw-r--r-- | engines/wintermute/Ad/AdScene.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Base/BFader.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/Base/BFader.h | 8 | ||||
| -rw-r--r-- | engines/wintermute/Base/BGame.cpp | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index 098ea3829d..0acc081c27 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -1520,7 +1520,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi byte Blue = Stack->Pop()->GetInt(0);
byte Alpha = Stack->Pop()->GetInt(0xFF);
- _fader->FadeOut(DRGBA(Red, Green, Blue, Alpha), Duration);
+ _fader->fadeOut(DRGBA(Red, Green, Blue, Alpha), Duration);
if (strcmp(Name, "FadeOutAsync") != 0) Script->WaitFor(_fader);
Stack->PushNULL();
@@ -1538,7 +1538,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi byte Blue = Stack->Pop()->GetInt(0);
byte Alpha = Stack->Pop()->GetInt(0xFF);
- _fader->FadeIn(DRGBA(Red, Green, Blue, Alpha), Duration);
+ _fader->fadeIn(DRGBA(Red, Green, Blue, Alpha), Duration);
if (strcmp(Name, "FadeInAsync") != 0) Script->WaitFor(_fader);
Stack->PushNULL();
@@ -1550,7 +1550,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "GetFadeColor") == 0) {
Stack->CorrectParams(0);
- Stack->PushInt(_fader->GetCurrentColor());
+ Stack->PushInt(_fader->getCurrentColor());
return S_OK;
}
diff --git a/engines/wintermute/Base/BFader.cpp b/engines/wintermute/Base/BFader.cpp index 741b586d56..a1e551df3f 100644 --- a/engines/wintermute/Base/BFader.cpp +++ b/engines/wintermute/Base/BFader.cpp @@ -93,7 +93,7 @@ HRESULT CBFader::display() { //////////////////////////////////////////////////////////////////////////
-HRESULT CBFader::Deactivate() {
+HRESULT CBFader::deactivate() {
_active = false;
_ready = true;
return S_OK;
@@ -101,7 +101,7 @@ HRESULT CBFader::Deactivate() { //////////////////////////////////////////////////////////////////////////
-HRESULT CBFader::FadeIn(uint32 SourceColor, uint32 Duration, bool System) {
+HRESULT CBFader::fadeIn(uint32 SourceColor, uint32 Duration, bool System) {
_ready = false;
_active = true;
@@ -123,7 +123,7 @@ HRESULT CBFader::FadeIn(uint32 SourceColor, uint32 Duration, bool System) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBFader::FadeOut(uint32 TargetColor, uint32 Duration, bool System) {
+HRESULT CBFader::fadeOut(uint32 TargetColor, uint32 Duration, bool System) {
_ready = false;
_active = true;
@@ -147,7 +147,7 @@ HRESULT CBFader::FadeOut(uint32 TargetColor, uint32 Duration, bool System) { //////////////////////////////////////////////////////////////////////////
-uint32 CBFader::GetCurrentColor() {
+uint32 CBFader::getCurrentColor() {
return DRGBA(_red, _green, _blue, _currentAlpha);
}
diff --git a/engines/wintermute/Base/BFader.h b/engines/wintermute/Base/BFader.h index 663766127b..8a98bea8fe 100644 --- a/engines/wintermute/Base/BFader.h +++ b/engines/wintermute/Base/BFader.h @@ -37,10 +37,10 @@ namespace WinterMute { class CBFader : public CBObject {
public:
bool _system;
- uint32 GetCurrentColor();
- HRESULT FadeOut(uint32 TargetColor, uint32 Duration, bool System = false);
- HRESULT FadeIn(uint32 SourceColor, uint32 Duration, bool System = false);
- HRESULT Deactivate();
+ uint32 getCurrentColor();
+ HRESULT fadeOut(uint32 TargetColor, uint32 Duration, bool System = false);
+ HRESULT fadeIn(uint32 SourceColor, uint32 Duration, bool System = false);
+ HRESULT deactivate();
HRESULT display();
HRESULT update();
DECLARE_PERSISTENT(CBFader, CBObject)
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 12398c109c..05dfcf6abb 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -1750,7 +1750,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS bool System = (strcmp(Name, "SystemFadeOut") == 0 || strcmp(Name, "SystemFadeOutAsync") == 0);
- _fader->FadeOut(DRGBA(Red, Green, Blue, Alpha), Duration, System);
+ _fader->fadeOut(DRGBA(Red, Green, Blue, Alpha), Duration, System);
if (strcmp(Name, "FadeOutAsync") != 0 && strcmp(Name, "SystemFadeOutAsync") != 0) Script->WaitFor(_fader);
Stack->PushNULL();
@@ -1770,7 +1770,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS bool System = (strcmp(Name, "SystemFadeIn") == 0 || strcmp(Name, "SystemFadeInAsync") == 0);
- _fader->FadeIn(DRGBA(Red, Green, Blue, Alpha), Duration, System);
+ _fader->fadeIn(DRGBA(Red, Green, Blue, Alpha), Duration, System);
if (strcmp(Name, "FadeInAsync") != 0 && strcmp(Name, "SystemFadeInAsync") != 0) Script->WaitFor(_fader);
Stack->PushNULL();
@@ -1782,7 +1782,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "GetFadeColor") == 0) {
Stack->CorrectParams(0);
- Stack->PushInt(_fader->GetCurrentColor());
+ Stack->PushInt(_fader->getCurrentColor());
return S_OK;
}
|