libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 23:49:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Rename FuncName->funcName in BFader.

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-06-26 02:09:41 +02:00
parent caa5ee1d89
commit 191ca9cdec
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/wintermute/Ad/AdScene.cpp
View File

@ -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;
}

8
engines/wintermute/Base/BFader.cpp
View File

@ -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);
}

8
engines/wintermute/Base/BFader.h
View File

@ -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)

6
engines/wintermute/Base/BGame.cpp
View File

@ -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;
}