Skip to content

Commit 170123f

Browse files
authored
Refactor data_manager.h includes (#3039)
1 parent d0cc919 commit 170123f

9 files changed

Lines changed: 18 additions & 4 deletions

File tree

gframe/deck.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
#include <vector>
55
#include <cstdint>
6-
#include "data_manager.h"
76

87
namespace ygo {
98

9+
struct CardDataC;
10+
1011
struct Deck {
1112
std::vector<const CardDataC*> main;
1213
std::vector<const CardDataC*> extra;

gframe/deck_con.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#include <array>
33
#include "config.h"
44
#include "deck_con.h"
5+
#include "data_manager.h"
6+
#include "deck_manager.h"
57
#include "myfilesystem.h"
68
#include "image_manager.h"
79
#include "sound_manager.h"

gframe/deck_con.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
#ifndef DECK_CON_H
22
#define DECK_CON_H
33

4+
#include <string>
45
#include <unordered_map>
56
#include <vector>
67
#include <random>
78
#include <irrlicht.h>
8-
#include "data_manager.h"
9-
#include "deck_manager.h"
109

1110
namespace ygo {
1211

12+
struct CardDataC;
13+
struct LFList;
14+
1315
class DeckBuilder: public irr::IEventReceiver {
1416
public:
1517
DeckBuilder();

gframe/deck_manager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <algorithm>
22
#include "deck_manager.h"
3+
#include "data_manager.h"
34
#include "game.h"
45
#include "myfilesystem.h"
56
#include "network.h"

gframe/deck_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
#include <sstream>
77
#include "deck.h"
88

9+
namespace irr {
10+
namespace io {
11+
class IReadFile;
12+
}
13+
}
14+
915
namespace ygo {
1016

1117
constexpr int DECK_MAX_SIZE = 60;

gframe/drawing.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "client_card.h"
88
#include "materials.h"
99
#include "image_manager.h"
10+
#include "data_manager.h"
1011
#include "deck_manager.h"
1112
#include "sound_manager.h"
1213
#include "duelclient.h"

gframe/duelclient.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <random>
55
#include "config.h"
66
#include "duelclient.h"
7+
#include "data_manager.h"
78
#include "client_card.h"
89
#include "materials.h"
910
#include "image_manager.h"

gframe/image_manager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define IMAGEMANAGER_H
33

44
#include "config.h"
5-
#include "data_manager.h"
65
#include <unordered_map>
76
#include <queue>
87
#include <mutex>

gframe/menu_handler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "config.h"
22
#include "menu_handler.h"
3+
#include "data_manager.h"
34
#include "myfilesystem.h"
45
#include "netserver.h"
56
#include "duelclient.h"

0 commit comments

Comments
 (0)