Cleanup

src/device/device.cpp

@@ -656,13 +656,14 @@ void Device::destroy_resource_package(ResourcePackage& rp)
 
 void Device::reload(StringId64 type, StringId64 name)
 {
-	TempAllocator64 ta;
-	DynamicString type_str(ta);
-	DynamicString name_str(ta);
-	type.to_string(type_str);
-	name.to_string(name_str);
+	StringId64 mix;
+	mix._id = type._id ^ name._id;
 
-	logi(DEVICE, "Reloading #ID(%s-%s)", type_str.c_str(), name_str.c_str());
+	TempAllocator128 ta;
+	DynamicString path(ta);
+	mix.to_string(path);
+
+	logi(DEVICE, "Reloading #ID(%s)", path.c_str());
 
 	_resource_manager->reload(type, name);
 	const void* new_resource = _resource_manager->get(type, name);
@@ -672,7 +673,7 @@ void Device::reload(StringId64 type, StringId64 name)
 		_lua_environment->execute((const LuaResource*)new_resource);
 	}
 
-	logi(DEVICE, "Reloaded #ID(%s-%s)", type_str.c_str(), name_str.c_str());
+	logi(DEVICE, "Reloaded #ID(%s)", path.c_str());
 }
 
 void Device::log(const char* msg)

src/resource/resource_manager.cpp

@@ -43,19 +43,14 @@ void ResourceManager::load(StringId64 type, StringId64 name)
 
 	if (entry == ResourceEntry::NOT_FOUND)
 	{
+		StringId64 mix;
+		mix._id = type._id ^ name._id;
+
 		TempAllocator64 ta;
-		DynamicString type_str(ta);
-		DynamicString name_str(ta);
-		type.to_string(type_str);
-		name.to_string(name_str);
-
-		CE_ASSERT(_loader->can_load(type, name)
-			, "Can't load resource #ID(%s-%s)"
-			, type_str.c_str()
-			, name_str.c_str()
-			);
-		CE_UNUSED(type_str);
-		CE_UNUSED(name_str);
+		DynamicString path(ta);
+		mix.to_string(path);
+
+		CE_ASSERT(_loader->can_load(type, name), "Can't load resource #ID(%s)", path.c_str());
 
 		ResourceTypeData rtd;
 		rtd.version = UINT32_MAX;
@@ -120,19 +115,15 @@ bool ResourceManager::can_get(StringId64 type, StringId64 name)
 const void* ResourceManager::get(StringId64 type, StringId64 name)
 {
 	const ResourcePair id = { type, name };
-	TempAllocator128 ta;
-	DynamicString type_str(ta);
-	DynamicString name_str(ta);
-	type.to_string(type_str);
-	name.to_string(name_str);
-
-	CE_ASSERT(can_get(type, name)
-		, "Resource not loaded #ID(%s-%s)"
-		, type_str.c_str()
-		, name_str.c_str()
-		);
-	CE_UNUSED(type_str);
-	CE_UNUSED(name_str);
+
+	StringId64 mix;
+	mix._id = type._id ^ name._id;
+
+	TempAllocator64 ta;
+	DynamicString path(ta);
+	mix.to_string(path);
+
+	CE_ASSERT(can_get(type, name), "Resource not loaded #ID(%s)", path.c_str());
 
 	if (_autoload && !sort_map::has(_rm, id))
 	{

tools/widgets/console_view.vala

@@ -164,7 +164,7 @@ namespace Crown
 			int id_index = text.index_of("#ID(");
 			if (id_index != -1)
 			{
-				string id = text.substring(id_index + 4, 33);
+				string id = text.substring(id_index + 4, 16);
 				string name = _project.id_to_name(id);
 				msg = text.replace("#ID(%s)".printf(id), "'%s'".printf(name));
 			}