mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-21 00:19:29 +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,54 +1,54 @@
|
||||
/*
|
||||
* CScriptingModule.h, 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
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#if SCRIPTING_ENABLED
|
||||
#include <vcmi/scripting/Service.h>
|
||||
|
||||
VCMI_LIB_NAMESPACE_BEGIN
|
||||
|
||||
namespace spells
|
||||
{
|
||||
namespace effects
|
||||
{
|
||||
class Registry;
|
||||
}
|
||||
}
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
|
||||
class DLL_LINKAGE ContextBase : public Context
|
||||
{
|
||||
public:
|
||||
ContextBase(vstd::CLoggerBase * logger_);
|
||||
virtual ~ContextBase() = default;
|
||||
|
||||
protected:
|
||||
vstd::CLoggerBase * logger;
|
||||
};
|
||||
|
||||
class DLL_LINKAGE Module
|
||||
{
|
||||
public:
|
||||
Module() = default;
|
||||
virtual ~Module() = default;
|
||||
|
||||
virtual std::string compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const = 0;
|
||||
|
||||
virtual std::shared_ptr<ContextBase> createContextFor(const Script * source, const Environment * env) const = 0;
|
||||
|
||||
virtual void registerSpellEffect(spells::effects::Registry * registry, const Script * source) const = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
VCMI_LIB_NAMESPACE_END
|
||||
#endif
|
||||
/*
|
||||
* CScriptingModule.h, 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
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#if SCRIPTING_ENABLED
|
||||
#include <vcmi/scripting/Service.h>
|
||||
|
||||
VCMI_LIB_NAMESPACE_BEGIN
|
||||
|
||||
namespace spells
|
||||
{
|
||||
namespace effects
|
||||
{
|
||||
class Registry;
|
||||
}
|
||||
}
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
|
||||
class DLL_LINKAGE ContextBase : public Context
|
||||
{
|
||||
public:
|
||||
ContextBase(vstd::CLoggerBase * logger_);
|
||||
virtual ~ContextBase() = default;
|
||||
|
||||
protected:
|
||||
vstd::CLoggerBase * logger;
|
||||
};
|
||||
|
||||
class DLL_LINKAGE Module
|
||||
{
|
||||
public:
|
||||
Module() = default;
|
||||
virtual ~Module() = default;
|
||||
|
||||
virtual std::string compile(const std::string & name, const std::string & source, vstd::CLoggerBase * logger) const = 0;
|
||||
|
||||
virtual std::shared_ptr<ContextBase> createContextFor(const Script * source, const Environment * env) const = 0;
|
||||
|
||||
virtual void registerSpellEffect(spells::effects::Registry * registry, const Script * source) const = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
VCMI_LIB_NAMESPACE_END
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user