Rename some stuff to conform to naming conventions

1 files changed, 6 insertions, 6 deletions

diff --git a/src/scripting/script.hpp b/src/scripting/script.hpp
index 0e874151..dfba06f0 100644
--- a/src/scripting/script.hpp
+++ b/src/scripting/script.hpp
@@ -128,21 +128,21 @@ class Script
         EventListener *getScriptListener()
         { return &mEventListener; }
 
-        virtual void processDeathEvent(Being* thing) = 0;
+        virtual void processDeathEvent(Being *thing) = 0;
 
-        virtual void processRemoveEvent(Thing* thing) = 0;
+        virtual void processRemoveEvent(Thing *thing) = 0;
 
         /**
          * Runs a function from the global event script file
          */
-        static bool execute_global_event_function(const std::string &function, Being *obj);
+        static bool executeGlobalEventFunction(const std::string &function, Being *obj);
         static void addDataToSpecial(int specialId, Special *special);
-        static bool perform_special_action(int specialId, Being *caster);
+        static bool performSpecialAction(int specialId, Being *caster);
 
 
     protected:
-        static Script* global_event_script; // the global event script
-        static Script* special_actions_script; // the special actions script
+        static Script *globalEventScript;
+        static Script *specialActionsScript;
         std::string mScriptFile;
 
     private: