aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIndah Sylvia2017-08-08 18:07:29 +0700
committerIndah Sylvia2017-08-08 18:07:29 +0700
commit5014b9dc409f530134b299d197e585ac74c268ff (patch)
tree87933c2e6a46743084fbd383cc28ba929e220af1
parent69f650f98fd389ecb7d8ea689c4274912b3e63cd (diff)
downloadgodot-5014b9dc409f530134b299d197e585ac74c268ff.tar.gz
godot-5014b9dc409f530134b299d197e585ac74c268ff.tar.zst
godot-5014b9dc409f530134b299d197e585ac74c268ff.zip
core/[io;object]: fix typo 'resoucre' to 'resource'
-rw-r--r--core/io/resource_format_binary.cpp6
-rw-r--r--core/io/resource_format_binary.h8
-rw-r--r--core/object.cpp2
-rw-r--r--editor/editor_plugin.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 61b67bc0c..c7c269b87 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -777,7 +777,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
if (!r) {
error = ERR_FILE_CORRUPT;
memdelete(obj); //bye
- ERR_EXPLAIN(local_path + ":Resoucre type in resource field not a resource, type is: " + obj->get_type());
+ ERR_EXPLAIN(local_path + ":Resource type in resource field not a resource, type is: " + obj->get_type());
ERR_FAIL_COND_V(!r, ERR_FILE_CORRUPT);
}
@@ -1047,7 +1047,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
uint32_t ext_resources_size = f->get_32();
for (uint32_t i = 0; i < ext_resources_size; i++) {
- ExtResoucre er;
+ ExtResource er;
er.type = get_unicode_string();
er.path = get_unicode_string();
external_resources.push_back(er);
@@ -1072,7 +1072,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
for (uint32_t i = 0; i < int_resources_size; i++) {
- IntResoucre ir;
+ IntResource ir;
ir.path = get_unicode_string();
ir.offset = f->get_64();
internal_resources.push_back(ir);
diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h
index fdc50f5b8..fcc7bd0bc 100644
--- a/core/io/resource_format_binary.h
+++ b/core/io/resource_format_binary.h
@@ -53,19 +53,19 @@ class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader {
//Map<int,StringName> string_map;
Vector<StringName> string_map;
- struct ExtResoucre {
+ struct ExtResource {
String path;
String type;
};
- Vector<ExtResoucre> external_resources;
+ Vector<ExtResource> external_resources;
- struct IntResoucre {
+ struct IntResource {
String path;
uint64_t offset;
};
- Vector<IntResoucre> internal_resources;
+ Vector<IntResource> internal_resources;
String get_unicode_string();
void _advance_padding(uint32_t p_len);
diff --git a/core/object.cpp b/core/object.cpp
index 3342046d2..03e0ffc89 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1850,7 +1850,7 @@ void ObjectDB::cleanup() {
String node_name;
if (instances[*K]->is_type("Node"))
node_name = " - Node Name: " + String(instances[*K]->call("get_name"));
- if (instances[*K]->is_type("Resoucre"))
+ if (instances[*K]->is_type("Resource"))
node_name = " - Resource Name: " + String(instances[*K]->call("get_name")) + " Path: " + String(instances[*K]->call("get_path"));
print_line("Leaked Instance: " + String(instances[*K]->get_type()) + ":" + itos(*K) + node_name);
}
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index af039faa6..6dbaafd33 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -88,7 +88,7 @@ public:
DOCK_SLOT_MAX
};
- //TODO: send a resoucre for editing to the editor node?
+ //TODO: send a resource for editing to the editor node?
void add_control_to_container(CustomControlContainer p_location, Control *p_control);
ToolButton *add_control_to_bottom_panel(Control *p_control, const String &p_title);