diff options
author | Craig Robbins <kde.psych@gmail.com> | 2015-01-25 01:19:40 +1000 |
---|---|---|
committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-25 01:19:40 +1000 |
commit | 2c4a5e18619a69159bcace8c03b4ea5642f46836 (patch) | |
tree | f22463c9cb1ac5bb9589d5be94d94f89cea45e89 /src/settings.cpp | |
parent | 800d19270250bb13cc6b2d330199815bf8e96446 (diff) | |
download | minetest-2c4a5e18619a69159bcace8c03b4ea5642f46836.tar.gz minetest-2c4a5e18619a69159bcace8c03b4ea5642f46836.tar.bz2 minetest-2c4a5e18619a69159bcace8c03b4ea5642f46836.zip |
Revert "Make the GameGlobalShaderConstantSetter use the settings callback (8% perf improvement in game loop)"
This reverts commit a555e2d9b0ccee452996381a44677b8bec210036.
Diffstat (limited to 'src/settings.cpp')
-rw-r--r-- | src/settings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 3416066e2..2f515caba 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -965,15 +965,15 @@ void Settings::clearNoLock() void Settings::registerChangedCallback(std::string name, - setting_changed_callback cbf, void *userdata) + setting_changed_callback cbf) { - m_callbacks[name].push_back(std::make_pair(cbf,userdata)); + m_callbacks[name].push_back(cbf); } void Settings::doCallbacks(const std::string name) { - std::vector<std::pair<setting_changed_callback,void*> > tempvector; + std::vector<setting_changed_callback> tempvector; { JMutexAutoLock lock(m_mutex); if (m_callbacks.find(name) != m_callbacks.end()) @@ -982,9 +982,9 @@ void Settings::doCallbacks(const std::string name) } } - std::vector<std::pair<setting_changed_callback, void*> >::iterator iter; + std::vector<setting_changed_callback>::iterator iter; for (iter = tempvector.begin(); iter != tempvector.end(); iter++) { - (iter->first)(name,iter->second); + (*iter)(name); } } |