From d8a3bf135ed9a2df87f6eddcd0311ead0589b723 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 20 Jan 2019 01:02:28 +0100 Subject: [PATCH] Small optimization --- src/module/notification.cpp | 2 +- src/module/scripting.cpp | 8 ++++---- src/module/scripting.hpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/module/notification.cpp b/src/module/notification.cpp index fbc7c52..1223737 100644 --- a/src/module/notification.cpp +++ b/src/module/notification.cpp @@ -64,7 +64,7 @@ void notification::vm_notify_stub(const unsigned int notify_id, const unsigned s if (e.name == "touch") return; // Skip that for now - //printf("%X %X: %s\n", e.entity_id, *game::native::levelEntityId, e.name.data()); + //printf("%X: %s\n", e.entity_id, e.name.data()); for (auto value = stack; value->type != game::native::SCRIPT_END; --value) { diff --git a/src/module/scripting.cpp b/src/module/scripting.cpp index d0a9b18..38a48f1 100644 --- a/src/module/scripting.cpp +++ b/src/module/scripting.cpp @@ -75,12 +75,12 @@ void scripting::entity::notify(const std::string& event, const std::vectorenvironment_->notify(event, this->get_entity_id(), arguments); } -void scripting::entity::set(const std::string& field, const chaiscript::Boxed_Value& value) +void scripting::entity::set(const std::string& field, const chaiscript::Boxed_Value& value) const { this->environment_->set_entity_field(field, this->get_entity_id(), value); } -chaiscript::Boxed_Value scripting::entity::get(const std::string& field) +chaiscript::Boxed_Value scripting::entity::get(const std::string& field) const { return this->environment_->get_entity_field(field, this->get_entity_id()); } @@ -543,7 +543,7 @@ void scripting::stop_execution() } } -int scripting::get_field_id(const int classnum, const std::string& field) +int scripting::get_field_id(const int classnum, const std::string& field) const { const auto field_name = utils::string::to_lower(field); const auto class_id = game::native::g_classMap[classnum].id; @@ -626,7 +626,7 @@ chaiscript::Boxed_Value scripting::get_entity_field(const std::string& field, co } void scripting::notify(const std::string& event, const unsigned int entity_id, - std::vector arguments) + std::vector arguments) const { stack_context _; diff --git a/src/module/scripting.hpp b/src/module/scripting.hpp index c65e3e7..c643e66 100644 --- a/src/module/scripting.hpp +++ b/src/module/scripting.hpp @@ -25,8 +25,8 @@ public: chaiscript::Boxed_Value call(const std::string& function, const std::vector& arguments) const; void notify(const std::string& event, const std::vector& arguments) const; - void set(const std::string& field, const chaiscript::Boxed_Value& value); - chaiscript::Boxed_Value get(const std::string& field); + void set(const std::string& field, const chaiscript::Boxed_Value& value) const; + chaiscript::Boxed_Value get(const std::string& field) const; private: scripting* environment_; @@ -111,14 +111,14 @@ private: static void start_execution(); static void stop_execution(); - int get_field_id(int classnum, const std::string& field); + int get_field_id(int classnum, const std::string& field) const; void set_entity_field(const std::string& field, unsigned int entity_id, const chaiscript::Boxed_Value& value); chaiscript::Boxed_Value get_entity_field(const std::string& field, unsigned int entity_id); static bool set_entity_field_safe(game::native::scr_entref_t entref, int offset); static bool get_entity_field_safe(game::native::scr_entref_t entref, int offset, game::native::VariableValue* value); - void notify(const std::string& event, unsigned int entity_id, std::vector arguments); + void notify(const std::string& event, unsigned int entity_id, std::vector arguments) const; void push_param(const chaiscript::Boxed_Value& value) const; chaiscript::Boxed_Value get_return_value();