Browse Source

Change dlscript's godot_get_global_constants signature to return godot_dictionary

Emmanuel Leblond 8 years ago
parent
commit
b423529481
2 changed files with 7 additions and 4 deletions
  1. 6 3
      modules/dlscript/godot.cpp
  2. 1 1
      modules/dlscript/godot.h

+ 6 - 3
modules/dlscript/godot.cpp

@@ -181,14 +181,17 @@ void GDAPI *godot_dlinstance_get_userdata(godot_object *p_instance) {
 	return NULL;
 }
 
-void GDAPI godot_get_global_constants(godot_dictionary *p_constants) {
-	Dictionary *constants = (Dictionary *)p_constants;
+godot_dictionary GDAPI godot_get_global_constants() {
+	godot_dictionary constants;
+	godot_dictionary_new(&constants);
+	Dictionary *p_constants = (Dictionary*)&constants;
 	const int constants_count = GlobalConstants::get_global_constant_count();
 	for (int i = 0; i < constants_count; ++i) {
 		const char *name = GlobalConstants::get_global_constant_name(i);
 		int value = GlobalConstants::get_global_constant_value(i);
-		(*constants)[name] = value;
+		(*p_constants)[name] = value;
 	}
+	return constants;
 }
 
 // System functions

+ 1 - 1
modules/dlscript/godot.h

@@ -375,7 +375,7 @@ void GDAPI godot_script_register_signal(const char *p_name, const godot_signal *
 
 void GDAPI *godot_dlinstance_get_userdata(godot_object *p_instance);
 
-void GDAPI godot_get_global_constants(godot_dictionary *constants);
+godot_dictionary GDAPI godot_get_global_constants();
 
 ////// System Functions