From e6f3dab2e104d41a5b2d9cfda91dd3c02d8fbc14 Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 4 Jul 2020 16:01:35 -0700 Subject: [PATCH] Make std::string-using script funcs pass around const references This makes it so that whenever a string is passed into these functions, it's no longer needlessly copied. --- desktop_version/src/Script.cpp | 4 ++-- desktop_version/src/Script.h | 8 ++++---- desktop_version/src/Scripts.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 1e237ded..bc392a61 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -32,7 +32,7 @@ void scriptclass::clearcustom(){ customscripts.clear(); } -void scriptclass::tokenize( std::string t ) +void scriptclass::tokenize( const std::string& t ) { j = 0; std::string tempword; @@ -3725,7 +3725,7 @@ void scriptclass::hardreset() running = false; } -void scriptclass::loadcustom(std::string t) +void scriptclass::loadcustom(const std::string& t) { //this magic function breaks down the custom script and turns into real scripting! std::string cscriptname=""; diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h index 351bfec8..ea32c74b 100644 --- a/desktop_version/src/Script.h +++ b/desktop_version/src/Script.h @@ -22,18 +22,18 @@ public: scriptclass(); - void load(std::string name); + void load(const std::string& name); void loadother(const char* t); - void loadcustom(std::string t); + void loadcustom(const std::string& t); - void inline add(std::string t) + void inline add(const std::string& t) { commands.push_back(t); } void clearcustom(); - void tokenize(std::string t); + void tokenize(const std::string& t); void run(); diff --git a/desktop_version/src/Scripts.cpp b/desktop_version/src/Scripts.cpp index 60aee83b..bb2bf9b2 100644 --- a/desktop_version/src/Scripts.cpp +++ b/desktop_version/src/Scripts.cpp @@ -1,7 +1,7 @@ #include "Script.h" #include -void scriptclass::load(std::string name) +void scriptclass::load(const std::string& name) { //loads script name t into the array position = 0;