File diff r25654:e264fd698eb2 → r25655:1030dcb7eb52
src/script/script_scanner.cpp
Show inline comments
 
@@ -38,7 +38,7 @@ bool ScriptScanner::AddFile(const std::s
 
	try {
 
		this->engine->LoadScript(filename.c_str());
 
	} catch (Script_FatalError &e) {
 
		DEBUG(script, 0, "Fatal error '%s' when trying to load the script '%s'.", e.GetErrorMessage().c_str(), filename.c_str());
 
		Debug(script, 0, "Fatal error '{}' when trying to load the script '{}'.", e.GetErrorMessage(), filename);
 
		return false;
 
	}
 
	return true;
 
@@ -106,7 +106,7 @@ void ScriptScanner::RegisterScript(Scrip
 

	
 
	/* Check if GetShortName follows the rules */
 
	if (strlen(info->GetShortName()) != 4) {
 
		DEBUG(script, 0, "The script '%s' returned a string from GetShortName() which is not four characaters. Unable to load the script.", info->GetName());
 
		Debug(script, 0, "The script '{}' returned a string from GetShortName() which is not four characaters. Unable to load the script.", info->GetName());
 
		delete info;
 
		return;
 
	}
 
@@ -123,10 +123,10 @@ void ScriptScanner::RegisterScript(Scrip
 
			return;
 
		}
 

	
 
		DEBUG(script, 1, "Registering two scripts with the same name and version");
 
		DEBUG(script, 1, "  1: %s", this->info_list[script_name]->GetMainScript());
 
		DEBUG(script, 1, "  2: %s", info->GetMainScript());
 
		DEBUG(script, 1, "The first is taking precedence.");
 
		Debug(script, 1, "Registering two scripts with the same name and version");
 
		Debug(script, 1, "  1: {}", this->info_list[script_name]->GetMainScript());
 
		Debug(script, 1, "  2: {}", info->GetMainScript());
 
		Debug(script, 1, "The first is taking precedence.");
 

	
 
		delete info;
 
		return;