Skip to content

Commit 0773382

Browse files
committed
Tidy up codestyle
1 parent bde1040 commit 0773382

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

src/ECS/ECS.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
11
#include <entt/entt.hpp>
22
#include <SDL.h>
33

4-
#include "GameManager.h"
5-
6-
#include "Rendering/Renderer.h"
7-
#include "Rendering/Texture.h"
8-
#include "Rendering/Camera.h"
9-
10-
#include "Parsers/Gm1File.h"
11-
124
#include "System/Logger.h"
135

146
#include "ECS.h"
157
#include "ECS/Component/Component.h"
168

17-
using namespace Sourcehold::Rendering;
18-
using namespace Sourcehold::System;
19-
using namespace Sourcehold::Parsers;
20-
using namespace Sourcehold::Game;
21-
229
namespace Sourcehold {
2310
namespace ECS {
2411
entt::registry initializeECS () {
2512
entt::registry registry;
26-
Logger::message(System::ECS) << "Initialized ECS" << std::endl;
13+
System::Logger::message(System::ECS) << "Initialized ECS" << std::endl;
2714
return registry;
2815
}
2916

src/ECS/System/AnimationFrameSystem.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ namespace Sourcehold {
3838
FrameData frameData;
3939
try {
4040
FrameDataGroup frameDataGroup = EntityTypeToFrameDataGroupMapping.at(typeComponent.type);
41-
if (frameDataGroup == FrameDataGroup::TREE_BIRCH_XL_FALLING) {
42-
std::cout << "asd" << std::endl;
43-
}
4441
frameData = FrameDataGroupToFrameDataMapping.at(frameDataGroup);
4542
} catch (std::exception& e) {
4643
// no config - don't use this frame system

src/ECS/System/AnimationFrameSystem.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ namespace Sourcehold {
4242
const int CHESTNUT_S_FALLING_FRAMES = 5; // special case!
4343
const int CHESTNUT_S_RESOURCE_FRAMES = 2;
4444

45-
4645
const FrameMeta NONE = FrameMeta { false, false };
4746
const FrameMeta WITH_MIRROR = FrameMeta { true, false };
4847
const FrameMeta DONT_ANIMATE = FrameMeta { false, true };
@@ -147,8 +146,7 @@ namespace Sourcehold {
147146
{ FrameDataGroup::TREE_CHESTNUT_STUMP, { SINGLE_FRAME, treeFrameOffset(4, 3, _RESOURCE_OFFSET), DONT_ANIMATE }},
148147

149148
{ FrameDataGroup::SHRUB1_GREEN, { TREE_WIND_FRAMES, NO_OFFSET, WITH_MIRROR, FrameFilter::EVEN } },
150-
{ FrameDataGroup::SHRUB1_RED, { TREE_WIND_FRAMES, NO_OFFSET, WITH_MIRROR, FrameFilter::ODD } },
151-
149+
{ FrameDataGroup::SHRUB1_RED, { TREE_WIND_FRAMES, NO_OFFSET, WITH_MIRROR, FrameFilter::ODD } }
152150
};
153151

154152
const std::unordered_map<EntityType, FrameDataGroup> EntityTypeToFrameDataGroupMapping = Utils::createMultiIndexMap<EntityType, FrameDataGroup>({

0 commit comments

Comments
 (0)