From e11e2d62c4dab4f0194d417e7785b9007ab61e7b Mon Sep 17 00:00:00 2001 From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:14:57 -0600 Subject: [PATCH] fix tabs --- source/cScript.cpp | 36 ++++++++++++++++++------------------ source/cScript.h | 4 ++-- source/combat.cpp | 32 ++++++++++++++++---------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/source/cScript.cpp b/source/cScript.cpp index 456dce5d3..b046d90fa 100644 --- a/source/cScript.cpp +++ b/source/cScript.cpp @@ -1010,28 +1010,28 @@ bool cScript::OnAttack( CChar *attacker, CChar *defender, bool hitStatus, SI08 h //o------------------------------------------------------------------------------------------------o bool cScript::OnDefense( CChar *attacker, CChar *defender, bool hitStatus, SI08 hitLoc, UI16 damageReceived ) { - if( !ValidateObject( attacker ) || !ValidateObject( defender )) - return false; + if( !ValidateObject( attacker ) || !ValidateObject( defender )) + return false; - if( !ExistAndVerify( seOnDefense, "onDefense" )) - return false; + if( !ExistAndVerify( seOnDefense, "onDefense" )) + return false; - jsval rval, params[5]; - JSObject *attObj = JSEngine->AcquireObject( IUE_CHAR, attacker, runTime ); - JSObject *defObj = JSEngine->AcquireObject( IUE_CHAR, defender, runTime ); + jsval rval, params[5]; + JSObject *attObj = JSEngine->AcquireObject( IUE_CHAR, attacker, runTime ); + JSObject *defObj = JSEngine->AcquireObject( IUE_CHAR, defender, runTime ); - params[0] = OBJECT_TO_JSVAL( attObj ); - params[1] = OBJECT_TO_JSVAL( defObj ); - params[2] = BOOLEAN_TO_JSVAL( hitStatus ); - params[3] = INT_TO_JSVAL( hitLoc ); - params[4] = INT_TO_JSVAL( damageReceived ); - JSBool retVal = JS_CallFunctionName( targContext, targObject, "onDefense", 5, params, &rval ); - if( retVal == JS_FALSE ) - { - SetEventExists( seOnDefense, false ); - } + params[0] = OBJECT_TO_JSVAL( attObj ); + params[1] = OBJECT_TO_JSVAL( defObj ); + params[2] = BOOLEAN_TO_JSVAL( hitStatus ); + params[3] = INT_TO_JSVAL( hitLoc ); + params[4] = INT_TO_JSVAL( damageReceived ); + JSBool retVal = JS_CallFunctionName( targContext, targObject, "onDefense", 5, params, &rval ); + if( retVal == JS_FALSE ) + { + SetEventExists( seOnDefense, false ); + } - return ( retVal == JS_TRUE ); + return ( retVal == JS_TRUE ); } //o------------------------------------------------------------------------------------------------o diff --git a/source/cScript.h b/source/cScript.h index b36053234..c83df63e7 100644 --- a/source/cScript.h +++ b/source/cScript.h @@ -199,8 +199,8 @@ class cScript bool OnStat( void ); std::string OnTooltip( CBaseObject *myObj, CSocket *pSocket ); std::string OnNameRequest( CBaseObject *myObj, CChar *nameRequester, UI08 requestSource ); - bool OnAttack( CChar *attacker, CChar *defender, bool hitStatus, SI08 hitLoc, UI16 damageDealt ); - bool OnDefense( CChar *attacker, CChar *defender, bool hitStatus, SI08 hitLoc, UI16 damageReceived ); + bool OnAttack( CChar *attacker, CChar *defender, bool hitStatus, SI08 hitLoc, UI16 damageDealt ); + bool OnDefense( CChar *attacker, CChar *defender, bool hitStatus, SI08 hitLoc, UI16 damageReceived ); SI08 OnSkillGain( CChar *player, SI08 skill, UI32 skillAmtGained ); SI08 OnSkillLoss( CChar *player, SI08 skill, UI32 skillAmtLost ); bool OnSkillChange( CChar *player, SI08 skill, SI32 skillAmtChanged ); diff --git a/source/combat.cpp b/source/combat.cpp index fba9afa93..46c3308e4 100644 --- a/source/combat.cpp +++ b/source/combat.cpp @@ -2918,23 +2918,23 @@ bool CHandleCombat::HandleCombat( CSocket *mSock, CChar& mChar, CChar *ourTarg ) PlayMissedSoundEffect( &mChar ); for( auto scriptTrig : scriptTriggers ) - { - cScript *toExecute = JSMapping->GetScript( scriptTrig ); - if( toExecute != nullptr ) - { - toExecute->OnAttack( &mChar, ourTarg, skillPassed, -1, 0 ); - } - } - - std::vector defScriptTriggers = ourTarg->GetScriptTriggers(); - for( auto scriptTrig : defScriptTriggers ) - { + { + cScript *toExecute = JSMapping->GetScript( scriptTrig ); + if( toExecute != nullptr ) + { + toExecute->OnAttack( &mChar, ourTarg, skillPassed, -1, 0 ); + } + } + + std::vector defScriptTriggers = ourTarg->GetScriptTriggers(); + for( auto scriptTrig : defScriptTriggers ) + { cScript *toExecute = JSMapping->GetScript( scriptTrig ); - if( toExecute != nullptr ) - { - toExecute->OnDefense( &mChar, ourTarg, skillPassed, -1, 0 ); - } - } + if( toExecute != nullptr ) + { + toExecute->OnDefense( &mChar, ourTarg, skillPassed, -1, 0 ); + } + } } else {