mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-15 00:05:02 +02:00
convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073
This commit is contained in:
@ -1,68 +1,68 @@
|
||||
/*
|
||||
* ERMScriptModule.cpp, part of VCMI engine
|
||||
*
|
||||
* Authors: listed in file AUTHORS in main folder
|
||||
*
|
||||
* License: GNU General Public License v2.0 or later
|
||||
* Full text of license available in license.txt file, in main folder
|
||||
*
|
||||
*/
|
||||
#include "StdInc.h"
|
||||
#include "ERMScriptModule.h"
|
||||
|
||||
#include "ERMInterpreter.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define strcpy_s(a, b, c) strncpy(a, c, b)
|
||||
#endif
|
||||
|
||||
const char *g_cszAiName = "(V)ERM interpreter";
|
||||
|
||||
extern "C" DLL_EXPORT void GetAiName(char* name)
|
||||
{
|
||||
strcpy_s(name, strlen(g_cszAiName) + 1, g_cszAiName);
|
||||
}
|
||||
|
||||
extern "C" DLL_EXPORT void GetNewModule(std::shared_ptr<scripting::Module> &out)
|
||||
{
|
||||
out = std::make_shared<ERMScriptModule>();
|
||||
}
|
||||
|
||||
ERMScriptModule::ERMScriptModule()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
std::string ERMScriptModule::compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const
|
||||
{
|
||||
std::shared_ptr<ERMInterpreter> interp = std::make_shared<ERMInterpreter>(logger);
|
||||
|
||||
try
|
||||
{
|
||||
return interp->loadScript(name, source);
|
||||
}
|
||||
catch(const std::exception & ex)
|
||||
{
|
||||
logger->error(ex.what());
|
||||
}
|
||||
catch(const std::string & ex)
|
||||
{
|
||||
logger->error(ex);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
logger->error("Sorry, caught unknown exception type. No more info available.");
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
std::shared_ptr<scripting::ContextBase> ERMScriptModule::createContextFor(const scripting::Script * source, const Environment * env) const
|
||||
{
|
||||
throw std::runtime_error("ERM context creation is not possible");
|
||||
}
|
||||
|
||||
void ERMScriptModule::registerSpellEffect(spells::effects::Registry * registry, const scripting::Script * source) const
|
||||
{
|
||||
throw std::runtime_error("ERM spell effect registration is not possible");
|
||||
}
|
||||
/*
|
||||
* ERMScriptModule.cpp, part of VCMI engine
|
||||
*
|
||||
* Authors: listed in file AUTHORS in main folder
|
||||
*
|
||||
* License: GNU General Public License v2.0 or later
|
||||
* Full text of license available in license.txt file, in main folder
|
||||
*
|
||||
*/
|
||||
#include "StdInc.h"
|
||||
#include "ERMScriptModule.h"
|
||||
|
||||
#include "ERMInterpreter.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define strcpy_s(a, b, c) strncpy(a, c, b)
|
||||
#endif
|
||||
|
||||
const char *g_cszAiName = "(V)ERM interpreter";
|
||||
|
||||
extern "C" DLL_EXPORT void GetAiName(char* name)
|
||||
{
|
||||
strcpy_s(name, strlen(g_cszAiName) + 1, g_cszAiName);
|
||||
}
|
||||
|
||||
extern "C" DLL_EXPORT void GetNewModule(std::shared_ptr<scripting::Module> &out)
|
||||
{
|
||||
out = std::make_shared<ERMScriptModule>();
|
||||
}
|
||||
|
||||
ERMScriptModule::ERMScriptModule()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
std::string ERMScriptModule::compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const
|
||||
{
|
||||
std::shared_ptr<ERMInterpreter> interp = std::make_shared<ERMInterpreter>(logger);
|
||||
|
||||
try
|
||||
{
|
||||
return interp->loadScript(name, source);
|
||||
}
|
||||
catch(const std::exception & ex)
|
||||
{
|
||||
logger->error(ex.what());
|
||||
}
|
||||
catch(const std::string & ex)
|
||||
{
|
||||
logger->error(ex);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
logger->error("Sorry, caught unknown exception type. No more info available.");
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
std::shared_ptr<scripting::ContextBase> ERMScriptModule::createContextFor(const scripting::Script * source, const Environment * env) const
|
||||
{
|
||||
throw std::runtime_error("ERM context creation is not possible");
|
||||
}
|
||||
|
||||
void ERMScriptModule::registerSpellEffect(spells::effects::Registry * registry, const scripting::Script * source) const
|
||||
{
|
||||
throw std::runtime_error("ERM spell effect registration is not possible");
|
||||
}
|
||||
|
Reference in New Issue
Block a user