Skip to content

Commit 0b40580

Browse files
uhhasheuhhashe
committed
correct some things
1 parent a61dd12 commit 0b40580

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/ObjCommon/DestructibleDef/DestructibleDefCommon.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <format>
44

5-
namespace destructibledef
5+
namespace destructible_def
66
{
77
std::string GetFileNameForDestructibleDef(const std::string& assetName)
88
{
@@ -13,4 +13,4 @@ namespace destructibledef
1313
{
1414
return std::format("destructiblepiece/{}_{}", assetName, pieceIndex);
1515
}
16-
} // namespace destructibledef
16+
} // namespace destructible_def

‎src/ObjCommon/DestructibleDef/DestructibleDefCommon.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <string>
44

5-
namespace destructibledef
5+
namespace destructible_def
66
{
77
std::string GetFileNameForDestructibleDef(const std::string& assetName);
88
std::string GetFileNameForDestructiblePiece(const std::string& assetName, const int pieceIndex);
9-
} // namespace destructibledef
9+
} // namespace destructible_def

‎src/ObjCommon/Game/T5/ObjConstantsT5.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace T5
44
{
5-
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLEDEF = "DESTRUCTIBLEDEF";
6-
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLEPIECE = "DESTRUCTIBLEPIECE";
5+
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLE_DEF = "DESTRUCTIBLEDEF";
6+
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE = "DESTRUCTIBLEPIECE";
77
static constexpr auto INFO_STRING_PREFIX_FLAME_TABLE = "FLAMETABLEFILE";
88
static constexpr auto INFO_STRING_PREFIX_PHYS_PRESET = "PHYSIC";
99
static constexpr auto INFO_STRING_PREFIX_WEAPON = "WEAPONFILE";
1010

11-
static constexpr auto GDF_FILENAME_DESTRUCTIBLEDEF = "destructibledef.gdf";
12-
static constexpr auto GDF_FILENAME_DESTRUCTIBLEPIECE = "destructiblepiece.gdf";
11+
static constexpr auto GDF_FILENAME_DESTRUCTIBLE_DEF = "destructibledef.gdf";
12+
static constexpr auto GDF_FILENAME_DESTRUCTIBLE_PIECE = "destructiblepiece.gdf";
1313
static constexpr auto GDF_FILENAME_PHYS_PRESET = "physpreset.gdf";
1414
static constexpr auto GDF_FILENAME_WEAPON = "weapon.gdf";
1515

‎src/ObjCommon/Game/T6/ObjConstantsT6.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace T6
44
{
5-
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLEDEF = "DESTRUCTIBLEDEF";
6-
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLEPIECE = "DESTRUCTIBLEPIECE";
5+
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLE_DEF = "DESTRUCTIBLEDEF";
6+
static constexpr auto INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE = "DESTRUCTIBLEPIECE";
77
static constexpr auto INFO_STRING_PREFIX_FLAME_TABLE = "FLAMETABLEFILE";
88
static constexpr auto INFO_STRING_PREFIX_PHYS_CONSTRAINTS = "PHYSCONSTRAINTS";
99
static constexpr auto INFO_STRING_PREFIX_PHYS_PRESET = "PHYSIC";
@@ -14,8 +14,8 @@ namespace T6
1414
static constexpr auto INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE = "ATTACHMENTUNIQUEFILE";
1515
static constexpr auto INFO_STRING_PREFIX_ZBARRIER = "ZBARRIER";
1616

17-
static constexpr auto GDF_FILENAME_DESTRUCTIBLEDEF = "destructibledef.gdf";
18-
static constexpr auto GDF_FILENAME_DESTRUCTIBLEPIECE = "destructiblepiece.gdf";
17+
static constexpr auto GDF_FILENAME_DESTRUCTIBLE_DEF = "destructibledef.gdf";
18+
static constexpr auto GDF_FILENAME_DESTRUCTIBLE_PIECE = "destructiblepiece.gdf";
1919
static constexpr auto GDF_FILENAME_PHYS_CONSTRAINTS = "physconstraints.gdf";
2020
static constexpr auto GDF_FILENAME_PHYS_PRESET = "physpreset.gdf";
2121
static constexpr auto GDF_FILENAME_TRACER = "tracer.gdf";

‎src/ObjWriting/Game/T5/DestructibleDef/DestructibleDefInfoStringDumperT5.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ namespace destructible_def
9191
if (context.m_gdt)
9292
{
9393
const auto infoString = CreateInfoString(asset);
94-
GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_DESTRUCTIBLEDEF);
95-
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLEDEF, gdtEntry);
94+
GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_DESTRUCTIBLE_DEF);
95+
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLE_DEF, gdtEntry);
9696
context.m_gdt->WriteEntry(gdtEntry);
9797
}
9898
else
@@ -103,7 +103,7 @@ namespace destructible_def
103103

104104
auto& stream = *assetFile;
105105
const auto infoString = CreateInfoString(asset);
106-
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLEDEF);
106+
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLE_DEF);
107107
stream.write(stringValue.c_str(), stringValue.size());
108108
}
109109

@@ -115,8 +115,8 @@ namespace destructible_def
115115
if (context.m_gdt)
116116
{
117117
const auto infoString = CreateDestructiblePieceInfoString(dPiece, asset);
118-
GdtEntry gdtEntry(asset.m_name + "::piece_" + std::to_string(i), GDF_FILENAME_DESTRUCTIBLEPIECE);
119-
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLEPIECE, gdtEntry);
118+
GdtEntry gdtEntry(asset.m_name + "::piece_" + std::to_string(i), GDF_FILENAME_DESTRUCTIBLE_PIECE);
119+
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE, gdtEntry);
120120
context.m_gdt->WriteEntry(gdtEntry);
121121
}
122122
else
@@ -127,7 +127,7 @@ namespace destructible_def
127127

128128
auto& stream = *assetFile;
129129
const auto infoString = CreateDestructiblePieceInfoString(dPiece, asset);
130-
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLEPIECE);
130+
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE);
131131
stream.write(stringValue.c_str(), stringValue.size());
132132
}
133133
}

‎src/ObjWriting/Game/T6/DestructibleDef/DestructibleDefInfoStringDumperT6.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ namespace destructible_def
9191
if (context.m_gdt)
9292
{
9393
const auto infoString = CreateInfoString(asset);
94-
GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_DESTRUCTIBLEDEF);
95-
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLEDEF, gdtEntry);
94+
GdtEntry gdtEntry(asset.m_name, GDF_FILENAME_DESTRUCTIBLE_DEF);
95+
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLE_DEF, gdtEntry);
9696
context.m_gdt->WriteEntry(gdtEntry);
9797
}
9898
else
@@ -103,7 +103,7 @@ namespace destructible_def
103103

104104
auto& stream = *assetFile;
105105
const auto infoString = CreateInfoString(asset);
106-
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLEDEF);
106+
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLE_DEF);
107107
stream.write(stringValue.c_str(), stringValue.size());
108108
}
109109

@@ -115,8 +115,8 @@ namespace destructible_def
115115
if (context.m_gdt)
116116
{
117117
const auto infoString = CreateDestructiblePieceInfoString(piece, asset);
118-
GdtEntry gdtEntry(asset.m_name + "::piece_" + std::to_string(i), GDF_FILENAME_DESTRUCTIBLEPIECE);
119-
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLEPIECE, gdtEntry);
118+
GdtEntry gdtEntry(asset.m_name + "::piece_" + std::to_string(i), GDF_FILENAME_DESTRUCTIBLE_PIECE);
119+
infoString.ToGdtProperties(INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE, gdtEntry);
120120
context.m_gdt->WriteEntry(gdtEntry);
121121
}
122122
else
@@ -127,7 +127,7 @@ namespace destructible_def
127127

128128
auto& stream = *assetFile;
129129
const auto infoString = CreateDestructiblePieceInfoString(piece, asset);
130-
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLEPIECE);
130+
const auto stringValue = infoString.ToString(INFO_STRING_PREFIX_DESTRUCTIBLE_PIECE);
131131
stream.write(stringValue.c_str(), stringValue.size());
132132
}
133133
}

0 commit comments

Comments
 (0)