From 2c4a5e18619a69159bcace8c03b4ea5642f46836 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Sun, 25 Jan 2015 01:19:40 +1000
Subject: Revert "Make the GameGlobalShaderConstantSetter use the settings
 callback (8% perf improvement in game loop)"

This reverts commit a555e2d9b0ccee452996381a44677b8bec210036.
---
 src/settings.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/settings.h')

diff --git a/src/settings.h b/src/settings.h
index 47feb1755..89f7589df 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,7 +32,7 @@ class Settings;
 struct NoiseParams;
 
 /** function type to register a changed callback */
-typedef void (*setting_changed_callback)(const std::string, void *userdata);
+typedef void (*setting_changed_callback)(const std::string);
 
 enum ValueType {
 	VALUETYPE_STRING,
@@ -204,7 +204,7 @@ public:
 	void clear();
 	void updateValue(const Settings &other, const std::string &name);
 	void update(const Settings &other);
-	void registerChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL);
+	void registerChangedCallback(std::string name, setting_changed_callback cbf);
 
 private:
 
@@ -215,7 +215,7 @@ private:
 
 	std::map<std::string, SettingsEntry> m_settings;
 	std::map<std::string, SettingsEntry> m_defaults;
-	std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks;
+	std::map<std::string, std::vector<setting_changed_callback> > m_callbacks;
 	// All methods that access m_settings/m_defaults directly should lock this.
 	mutable JMutex m_mutex;
 };
-- 
cgit v1.2.3