Skip to content

Commit

Permalink
fix tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
DragonSlayer62 committed Jan 25, 2025
1 parent 6416668 commit e11e2d6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
36 changes: 18 additions & 18 deletions source/cScript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/cScript.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
32 changes: 16 additions & 16 deletions source/combat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<UI16> defScriptTriggers = ourTarg->GetScriptTriggers();
for( auto scriptTrig : defScriptTriggers )
{
{
cScript *toExecute = JSMapping->GetScript( scriptTrig );
if( toExecute != nullptr )
{
toExecute->OnAttack( &mChar, ourTarg, skillPassed, -1, 0 );
}
}

std::vector<UI16> 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
{
Expand Down

0 comments on commit e11e2d6

Please sign in to comment.