X Tutup
Skip to content

Commit 7ddf8e2

Browse files
ivan-mogilkoivan-mogilko
committed
Common: moved few more files into "data" dir
This makes a more consistent organization, where "data" dir contains code related to reading and writing data packages.
1 parent 94ae279 commit 7ddf8e2

33 files changed

+477
-448
lines changed

‎Common/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ target_sources(common
5454
data/asset.h
5555
data/assetmanager.cpp
5656
data/assetmanager.h
57+
data/data_ext.cpp
58+
data/data_ext.h
59+
data/data_helpers.cpp
60+
data/data_helpers.h
61+
data/multifilelib.h
62+
data/multifilelib.cpp
63+
data/tra_file.cpp
64+
data/tra_file.h
5765
debug/assert.h
5866
debug/debugmanager.cpp
5967
debug/debugmanager.h
@@ -71,8 +79,6 @@ target_sources(common
7179
font/wfnfontrenderer.h
7280
game/customproperties.cpp
7381
game/customproperties.h
74-
game/data_helpers.cpp
75-
game/data_helpers.h
7682
game/interactions.cpp
7783
game/interactions.h
7884
game/main_game_file.cpp
@@ -85,8 +91,6 @@ target_sources(common
8591
game/room_version.h
8692
game/roomstruct.cpp
8793
game/roomstruct.h
88-
game/tra_file.cpp
89-
game/tra_file.h
9094
gfx/allegrobitmap.cpp
9195
gfx/allegrobitmap.h
9296
gfx/bitmap.cpp
@@ -129,8 +133,6 @@ target_sources(common
129133
util/cmdlineopts.h
130134
util/compress.cpp
131135
util/compress.h
132-
util/data_ext.cpp
133-
util/data_ext.h
134136
util/deflatestream.cpp
135137
util/deflatestream.h
136138
util/directory.cpp
@@ -154,8 +156,6 @@ target_sources(common
154156
util/memory_compat.h
155157
util/memorystream.cpp
156158
util/memorystream.h
157-
util/multifilelib.h
158-
util/multifilelib.cpp
159159
util/path.cpp
160160
util/path_ex.cpp
161161
util/path.h

‎Common/data/assetmanager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "data/assetmanager.h"
1515
#include <algorithm>
1616
#include <regex>
17+
#include "data/multifilelib.h"
1718
#include "util/file.h"
18-
#include "util/multifilelib.h"
1919
#include "util/path.h"
2020

2121

Common/util/data_ext.cpp renamed to Common/data/data_ext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// https://opensource.org/license/artistic-2-0/
1212
//
1313
//=============================================================================
14-
#include "util/data_ext.h"
14+
#include "data/data_ext.h"
1515
#include "debug/out.h"
1616
#include "util/stream.h"
1717

Common/util/data_ext.h renamed to Common/data/data_ext.h

File renamed without changes.

Common/game/data_helpers.cpp renamed to Common/data/data_helpers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// https://opensource.org/license/artistic-2-0/
1212
//
1313
//=============================================================================
14-
#include "game/data_helpers.h"
14+
#include "data/data_helpers.h"
1515

1616
namespace AGS
1717
{

Common/game/data_helpers.h renamed to Common/data/data_helpers.h

File renamed without changes.

Common/util/multifilelib.cpp renamed to Common/data/multifilelib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// https://opensource.org/license/artistic-2-0/
1212
//
1313
//=============================================================================
14+
#include "data/multifilelib.h"
1415
#include "util/bbop.h"
15-
#include "util/multifilelib.h"
1616
#include "util/stream.h"
1717
#include "util/string_utils.h"
1818

Common/util/multifilelib.h renamed to Common/data/multifilelib.h

File renamed without changes.

0 commit comments

Comments
 (0)
X Tutup