Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 85aca10

Browse files
MaximDudeMaximDude
committed
Correcting filepaths (followup to followup to cortex-command-community/Cortex-Command-Community-Project-Data@d7e1cac)
Allow extracting flac from zipped modules
1 parent 7ec13cf commit 85aca10

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

‎GUI/GUISound.cpp

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,77 +39,77 @@ namespace RTE {
3939
int GUISound::Create() {
4040
// Interface sounds should not be pitched to reinforce the appearance of time decoupling between simulation and UI.
4141

42-
m_SplashSound.Create("Base.rte/Sounds/GUIs/MetaStart.wav", 0, false, 0, true);
42+
m_SplashSound.Create("Base.rte/Sounds/GUIs/MetaStart.flac", 0, false, 0, true);
4343

44-
m_EnterMenuSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
44+
m_EnterMenuSound.Create("Base.rte/Sounds/GUIs/MenuEnter.flac", 0, false, 0, true);
4545

46-
m_ExitMenuSound.Create("Base.rte/Sounds/GUIs/MenuExit1.wav", 0, false, 0, true);
47-
m_ExitMenuSound.AddSound("Base.rte/Sounds/GUIs/MenuExit2.wav", true);
46+
m_ExitMenuSound.Create("Base.rte/Sounds/GUIs/MenuExit1.flac", 0, false, 0, true);
47+
m_ExitMenuSound.AddSound("Base.rte/Sounds/GUIs/MenuExit2.flac", true);
4848

49-
m_FocusChangeSound.Create("Base.rte/Sounds/GUIs/FocusChange.wav", 0, false, 0, true);
49+
m_FocusChangeSound.Create("Base.rte/Sounds/GUIs/FocusChange.flac", 0, false, 0, true);
5050

51-
m_SelectionChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", 0, false, 0, true);
51+
m_SelectionChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.flac", 0, false, 0, true);
5252

53-
m_ItemChangeSound.Create("Base.rte/Sounds/GUIs/ItemChange.wav", 0, false, 0, true);
53+
m_ItemChangeSound.Create("Base.rte/Sounds/GUIs/ItemChange.flac", 0, false, 0, true);
5454

55-
m_ButtonPressSound.Create("Base.rte/Sounds/GUIs/ButtonPress.wav", 0, false, 0, true);
55+
m_ButtonPressSound.Create("Base.rte/Sounds/GUIs/ButtonPress.flac", 0, false, 0, true);
5656

57-
m_BackButtonPressSound.Create("Base.rte/Sounds/GUIs/BackButtonPress.wav", 0, false, 0, true);
57+
m_BackButtonPressSound.Create("Base.rte/Sounds/GUIs/BackButtonPress.flac", 0, false, 0, true);
5858

59-
m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit1.wav", 0, false, 0, true);
59+
m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit1.flac", 0, false, 0, true);
6060

61-
m_UserErrorSound.Create("Base.rte/Sounds/GUIs/UserError.wav", 0, false, 0, true);
61+
m_UserErrorSound.Create("Base.rte/Sounds/GUIs/UserError.flac", 0, false, 0, true);
6262

63-
m_TestSound.Create("Base.rte/Sounds/GUIs/Test.wav", 0, false, 0, true);
63+
m_TestSound.Create("Base.rte/Sounds/GUIs/Test.flac", 0, false, 0, true);
6464

65-
m_PieMenuEnterSound.Create("Base.rte/Sounds/GUIs/PieMenuEnter.wav", 0, false, 0, true);
65+
m_PieMenuEnterSound.Create("Base.rte/Sounds/GUIs/PieMenuEnter.flac", 0, false, 0, true);
6666

67-
m_PieMenuExitSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", 0, false, 0, true);
67+
m_PieMenuExitSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.flac", 0, false, 0, true);
6868

69-
// m_HoverChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.wav", 0, false, 0, true);
69+
// m_HoverChangeSound.Create("Base.rte/Sounds/GUIs/SelectionChange.flac", 0, false, 0, true);
7070
m_HoverChangeSound = m_SelectionChangeSound;
7171

72-
// m_HoverDisabledSound.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", 0, false, 0, true);
72+
// m_HoverDisabledSound.Create("Base.rte/Sounds/GUIs/PlacementBlip.flac", 0, false, 0, true);
7373
m_HoverDisabledSound = m_PlacementBlip;
7474

75-
m_SlicePickedSound.Create("Base.rte/Sounds/GUIs/SlicePicked.wav", 0, false, 0, true);
75+
m_SlicePickedSound.Create("Base.rte/Sounds/GUIs/SlicePicked.flac", 0, false, 0, true);
7676

77-
// m_DisabledPickedSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.wav", 0, false, 0, true);
77+
// m_DisabledPickedSound.Create("Base.rte/Sounds/GUIs/PieMenuExit.flac", 0, false, 0, true);
7878
m_DisabledPickedSound = m_PieMenuExitSound;
7979

80-
m_FundsChangedSound.Create("Base.rte/Sounds/GUIs/FundsChanged1.wav", 0, false, 0, true);
81-
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged2.wav", true);
82-
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged3.wav", true);
83-
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged4.wav", true);
84-
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged5.wav", true);
85-
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged6.wav", true);
80+
m_FundsChangedSound.Create("Base.rte/Sounds/GUIs/FundsChanged1.flac", 0, false, 0, true);
81+
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged2.flac", true);
82+
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged3.flac", true);
83+
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged4.flac", true);
84+
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged5.flac", true);
85+
m_FundsChangedSound.AddSound("Base.rte/Sounds/GUIs/FundsChanged6.flac", true);
8686

87-
m_ActorSwitchSound.Create("Base.rte/Sounds/GUIs/ActorSwitch.wav", 0, false, 0, true);
87+
m_ActorSwitchSound.Create("Base.rte/Sounds/GUIs/ActorSwitch.flac", 0, false, 0, true);
8888

89-
m_BrainSwitchSound.Create("Base.rte/Sounds/GUIs/BrainSwitch.wav", 0, false, 0, true);
89+
m_BrainSwitchSound.Create("Base.rte/Sounds/GUIs/BrainSwitch.flac", 0, false, 0, true);
9090

91-
m_CameraTravelSound.Create("Base.rte/Sounds/GUIs/CameraTravel1.wav", 0, false, 0, true);
92-
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel2.wav", true);
93-
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel3.wav", true);
91+
m_CameraTravelSound.Create("Base.rte/Sounds/GUIs/CameraTravel1.flac", 0, false, 0, true);
92+
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel2.flac", true);
93+
m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel3.flac", true);
9494

95-
// m_AreaPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
95+
// m_AreaPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.flac", 0, false, 0, true);
9696
m_AreaPickedSound = m_ConfirmSound;
9797

98-
// m_ObjectPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
98+
// m_ObjectPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.flac", 0, false, 0, true);
9999
m_ObjectPickedSound = m_ConfirmSound;
100100

101-
// m_PurchaseMadeSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
101+
// m_PurchaseMadeSound.Create("Base.rte/Sounds/GUIs/MenuEnter.flac", 0, false, 0, true);
102102
m_PurchaseMadeSound = m_ConfirmSound;
103103

104-
m_PlacementBlip.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", 0, false, 0, true);
104+
m_PlacementBlip.Create("Base.rte/Sounds/GUIs/PlacementBlip.flac", 0, false, 0, true);
105105

106-
m_PlacementThud.Create("Base.rte/Sounds/GUIs/PlacementThud1.wav", 0, false, 0, true);
107-
m_PlacementThud.AddSound("Base.rte/Sounds/GUIs/PlacementThud2.wav", true);
106+
m_PlacementThud.Create("Base.rte/Sounds/GUIs/PlacementThud1.flac", 0, false, 0, true);
107+
m_PlacementThud.AddSound("Base.rte/Sounds/GUIs/PlacementThud2.flac", true);
108108

109-
m_PlacementGravel.Create("Base.rte/Sounds/GUIs/PlacementGravel1.wav", 0, false, 0, true);
110-
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel2.wav", true);
111-
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel3.wav", true);
112-
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel4.wav", true);
109+
m_PlacementGravel.Create("Base.rte/Sounds/GUIs/PlacementGravel1.flac", 0, false, 0, true);
110+
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel2.flac", true);
111+
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel3.flac", true);
112+
m_PlacementGravel.AddSound("Base.rte/Sounds/GUIs/PlacementGravel4.flac", true);
113113

114114
return 0;
115115
}

‎Menus/LoadingGUI.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@ namespace RTE {
231231
g_System.MakeDirectory(outputFileName);
232232
// It's a file
233233
} else {
234-
// Validate so only certain file types are extracted: .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3
234+
// Validate so only certain file types are extracted: .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3 .flac
235235
// Get the file extension
236236
std::string fileExtension = std::filesystem::path(outputFileName).extension().string();
237237
std::transform(fileExtension.begin(), fileExtension.end(), fileExtension.begin(), ::tolower);
238238
const char *ext = fileExtension.c_str();
239-
// Validate only certain file types to be included! .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3
239+
// Validate only certain file types to be included! .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3 .flac
240240
if (!(std::strcmp(ext, ".ini") == 0 || std::strcmp(ext, ".txt") == 0 || std::strcmp(ext, ".lua") == 0 || std::strcmp(ext, ".cfg") == 0 ||
241241
std::strcmp(ext, ".bmp") == 0 || std::strcmp(ext, ".png") == 0 || std::strcmp(ext, ".jpg") == 0 || std::strcmp(ext, ".jpeg") == 0 ||
242-
std::strcmp(ext, ".wav") == 0 || std::strcmp(ext, ".ogg") == 0 || std::strcmp(ext, ".mp3") == 0)) {
242+
std::strcmp(ext, ".wav") == 0 || std::strcmp(ext, ".ogg") == 0 || std::strcmp(ext, ".mp3") == 0 || std::strcmp(ext, ".flac") == 0)) {
243243
LoadingSplashProgressReport("Skipping: " + std::string(outputFileName) + " - bad extension!", true);
244244

245245
// Keep going through!!

‎System/System.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace RTE {
6969
inputString = std::regex_replace(inputString, regexError, "\033[1;31m$&\033[0;0m");
7070

7171
// Color .rte-paths green
72-
std::regex regexPath("\\w*\\.rte\\/(\\w| |\\.|\\/)*(\\/|\\.bmp|\\.png|\\.wav|\\.lua|\\.ini)");
72+
std::regex regexPath("\\w*\\.rte\\/(\\w| |\\.|\\/)*(\\/|\\.bmp|\\.png|\\.wav|\\.ogg|\\.flac||\\.lua|\\.ini)");
7373
inputString = std::regex_replace(inputString, regexPath, "\033[1;32m$&\033[0;0m");
7474

7575
// Color names in quotes yellow

0 commit comments

Comments
 (0)