summaryrefslogtreecommitdiffstats
path: root/src/game-server/character.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-08-22 12:44:56 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-08-22 13:11:38 +0200
commitbfca89de4edded82668376d2388784defbee071b (patch)
treee345a9ec1e5d3e6419191cb3233efdfb70ab0718 /src/game-server/character.cpp
parent59b889008760325845aeb04b7ac3fad5e1068c0f (diff)
Rename some stuff to conform to naming conventions
Diffstat (limited to 'src/game-server/character.cpp')
-rw-r--r--src/game-server/character.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index 9230458..1c96818 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -180,7 +180,7 @@ void Character::perform()
void Character::died()
{
Being::died();
- Script::execute_global_event_function("on_chr_death", this);
+ Script::executeGlobalEventFunction("on_chr_death", this);
}
void Character::respawn()
@@ -197,7 +197,7 @@ void Character::respawn()
mTarget = NULL;
// execute respawn script
- if (!Script::execute_global_event_function("on_chr_death_accept", this))
+ if (!Script::executeGlobalEventFunction("on_chr_death_accept", this))
{
// script-controlled respawning didn't work - fall back to
// hardcoded logic
@@ -232,7 +232,7 @@ void Character::useSpecial(int id)
//tell script engine to cast the spell
special->currentMana = 0;
- Script::perform_special_action(id, this);
+ Script::performSpecialAction(id, this);
mSpecialUpdateNeeded = true;
return;
}