Merge pull request #719 from DarkflameUniverse/unix-line-endings

Unix line endings
This commit is contained in:
Aaron Kimbrell 2022-08-08 09:33:43 -05:00 committed by GitHub
commit 2d0faae759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
133 changed files with 135 additions and 132 deletions

View File

@ -3,3 +3,6 @@
# add semi-colons to macros consistently # add semi-colons to macros consistently
9e4ce24fd2851e65df776dd9c57bcb0d45f4453a 9e4ce24fd2851e65df776dd9c57bcb0d45f4453a
# convert to unix line endings
72477e01e2711e0f61cdb192ee266e5e21b8846f

View File

@ -1,4 +1,4 @@
#include "ZCompression.h" #include "ZCompression.h"
#ifndef _WIN32 #ifndef _WIN32

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>

View File

@ -1,4 +1,4 @@
#include "Player.h" #include "Player.h"
#include <ctime> #include <ctime>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Entity.h" #include "Entity.h"

View File

@ -1,4 +1,4 @@
#include "AirMovementBehavior.h" #include "AirMovementBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "EntityManager.h" #include "EntityManager.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class AirMovementBehavior final : public Behavior class AirMovementBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "AndBehavior.h" #include "AndBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#include "AreaOfEffectBehavior.h" #include "AreaOfEffectBehavior.h"
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class AreaOfEffectBehavior final : public Behavior class AreaOfEffectBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "AttackDelayBehavior.h" #include "AttackDelayBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "Game.h" #include "Game.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class AttackDelayBehavior final : public Behavior class AttackDelayBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "BasicAttackBehavior.h" #include "BasicAttackBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class BasicAttackBehavior final : public Behavior class BasicAttackBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include "Behavior.h" #include "Behavior.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <map> #include <map>
#include <string> #include <string>

View File

@ -1,4 +1,4 @@
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
BehaviorBranchContext::BehaviorBranchContext() { BehaviorBranchContext::BehaviorBranchContext() {

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "dCommonVars.h" #include "dCommonVars.h"
#include "NiPoint3.h" #include "NiPoint3.h"

View File

@ -1,4 +1,4 @@
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "Behavior.h" #include "Behavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "EntityManager.h" #include "EntityManager.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "RakPeerInterface.h" #include "RakPeerInterface.h"
#include "dCommonVars.h" #include "dCommonVars.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#ifndef BEHAVIORSLOT_H #ifndef BEHAVIORSLOT_H
#define BEHAVIORSLOT_H #define BEHAVIORSLOT_H

View File

@ -1 +1 @@
#include "BehaviorTemplates.h" #include "BehaviorTemplates.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
enum class BehaviorTemplates : unsigned int { enum class BehaviorTemplates : unsigned int {
BEHAVIOR_EMPTY, // Not a real behavior, indicates invalid behaviors BEHAVIOR_EMPTY, // Not a real behavior, indicates invalid behaviors

View File

@ -1,4 +1,4 @@
#include "BlockBehavior.h" #include "BlockBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class BlockBehavior final : public Behavior class BlockBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "BuffBehavior.h" #include "BuffBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class BuffBehavior final : public Behavior class BuffBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ChainBehavior.h" #include "ChainBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"

View File

@ -1,4 +1,4 @@
#include "ChargeUpBehavior.h" #include "ChargeUpBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class ChargeUpBehavior final : public Behavior class ChargeUpBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ClearTargetBehavior.h" #include "ClearTargetBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class ClearTargetBehavior final : public Behavior class ClearTargetBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "DamageAbsorptionBehavior.h" #include "DamageAbsorptionBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class DamageAbsorptionBehavior final : public Behavior class DamageAbsorptionBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "DurationBehavior.h" #include "DurationBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class DurationBehavior final : public Behavior class DurationBehavior final : public Behavior

View File

@ -1,2 +1,2 @@
#include "EmptyBehavior.h" #include "EmptyBehavior.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"

View File

@ -1,4 +1,4 @@
#include "EndBehavior.h" #include "EndBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class EndBehavior final : public Behavior class EndBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ForceMovementBehavior.h" #include "ForceMovementBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "ControllablePhysicsComponent.h" #include "ControllablePhysicsComponent.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class ForceMovementBehavior final : public Behavior class ForceMovementBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "HealBehavior.h" #include "HealBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class HealBehavior final : public Behavior class HealBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ImaginationBehavior.h" #include "ImaginationBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "DestroyableComponent.h" #include "DestroyableComponent.h"
#include "dpWorld.h" #include "dpWorld.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class ImaginationBehavior final : public Behavior class ImaginationBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ImmunityBehavior.h" #include "ImmunityBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class ImmunityBehavior final : public Behavior class ImmunityBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "InterruptBehavior.h" #include "InterruptBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "Game.h" #include "Game.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class InterruptBehavior final : public Behavior class InterruptBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <cmath> #include <cmath>
#include "KnockbackBehavior.h" #include "KnockbackBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class KnockbackBehavior final : public Behavior class KnockbackBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "MovementSwitchBehavior.h" #include "MovementSwitchBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class MovementSwitchBehavior final : public Behavior class MovementSwitchBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "NpcCombatSkillBehavior.h" #include "NpcCombatSkillBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class NpcCombatSkillBehavior final : public Behavior class NpcCombatSkillBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "PlayEffectBehavior.h" #include "PlayEffectBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class PlayEffectBehavior final : public Behavior class PlayEffectBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "ProjectileAttackBehavior.h" #include "ProjectileAttackBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "EntityManager.h" #include "EntityManager.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
#include "NiPoint3.h" #include "NiPoint3.h"

View File

@ -1,4 +1,4 @@
#include "PullToPointBehavior.h" #include "PullToPointBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class PullToPointBehavior final : public Behavior class PullToPointBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "RepairBehavior.h" #include "RepairBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "DestroyableComponent.h" #include "DestroyableComponent.h"
#include "dpWorld.h" #include "dpWorld.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class RepairBehavior final : public Behavior class RepairBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "SkillCastFailedBehavior.h" #include "SkillCastFailedBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class SkillCastFailedBehavior final : public Behavior class SkillCastFailedBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "SpawnBehavior.h" #include "SpawnBehavior.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class SpawnBehavior final : public Behavior class SpawnBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "SpawnQuickbuildBehavior.h" #include "SpawnQuickbuildBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class SpawnQuickbuildBehavior final : public Behavior class SpawnQuickbuildBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "StartBehavior.h" #include "StartBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
void StartBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) { void StartBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bit_stream, BehaviorBranchContext branch) {

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class StartBehavior final : public Behavior class StartBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "StunBehavior.h" #include "StunBehavior.h"
#include "BaseCombatAIComponent.h" #include "BaseCombatAIComponent.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class StunBehavior final : public Behavior class StunBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "SwitchBehavior.h" #include "SwitchBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "EntityManager.h" #include "EntityManager.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class SwitchBehavior final : public Behavior class SwitchBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "SwitchMultipleBehavior.h" #include "SwitchMultipleBehavior.h"
#include <sstream> #include <sstream>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#include "TacArcBehavior.h" #include "TacArcBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "Game.h" #include "Game.h"
#include "dLogger.h" #include "dLogger.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
#include "dCommonVars.h" #include "dCommonVars.h"
#include "NiPoint3.h" #include "NiPoint3.h"

View File

@ -1,4 +1,4 @@
#include "TargetCasterBehavior.h" #include "TargetCasterBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "BehaviorContext.h" #include "BehaviorContext.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class TargetCasterBehavior final : public Behavior class TargetCasterBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "VerifyBehavior.h" #include "VerifyBehavior.h"
#include "BehaviorBranchContext.h" #include "BehaviorBranchContext.h"
#include "EntityManager.h" #include "EntityManager.h"
#include "NiPoint3.h" #include "NiPoint3.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Behavior.h" #include "Behavior.h"
class VerifyBehavior final : public Behavior class VerifyBehavior final : public Behavior

View File

@ -1,4 +1,4 @@
#include "MovementAIComponent.h" #include "MovementAIComponent.h"
#include <utility> #include <utility>
#include <cmath> #include <cmath>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <map> #include <map>

View File

@ -1,4 +1,4 @@
#include "PropertyManagementComponent.h" #include "PropertyManagementComponent.h"
#include <sstream> #include <sstream>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <chrono> #include <chrono>
#include "Entity.h" #include "Entity.h"

View File

@ -1,4 +1,4 @@
#include "PropertyVendorComponent.h" #include "PropertyVendorComponent.h"
#include "PropertyDataMessage.h" #include "PropertyDataMessage.h"
#include "GameMessages.h" #include "GameMessages.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Entity.h" #include "Entity.h"
#include "Component.h" #include "Component.h"

View File

@ -1,4 +1,4 @@
#include "PropertyDataMessage.h" #include "PropertyDataMessage.h"
#include "GeneralUtils.h" #include "GeneralUtils.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#include "PropertySelectQueryProperty.h" #include "PropertySelectQueryProperty.h"
void PropertySelectQueryProperty::Serialize(RakNet::BitStream& stream) const { void PropertySelectQueryProperty::Serialize(RakNet::BitStream& stream) const {
stream.Write(CloneId); stream.Write(CloneId);

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#ifndef PROPERTYSELECTQUERY_H #ifndef PROPERTYSELECTQUERY_H
#define PROPERTYSELECTQUERY_H #define PROPERTYSELECTQUERY_H

View File

@ -1 +1 @@
#include "EquippedItem.h" #include "EquippedItem.h"

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#ifndef INVENTORY_H #ifndef INVENTORY_H
#define INVENTORY_H #define INVENTORY_H

View File

@ -1,4 +1,4 @@
#include "Item.h" #include "Item.h"
#include <sstream> #include <sstream>

View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "dCommonVars.h" #include "dCommonVars.h"
#include "Inventory.h" #include "Inventory.h"

Some files were not shown because too many files have changed in this diff Show More