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

Commit f4d2776

Browse files
MaximDudeMaximDude
committed
Correcting filepaths (followup to followup to cortex-command-community/Cortex-Command-Community-Project-Data@4c7ef4e)
1 parent 39f0fff commit f4d2776

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎Activities/AreaEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ int AreaEditor::Start()
214214
m_pSaveDialogBox = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("SaveDialogBox"));
215215

216216
// Set the background image of the parent collection box
217-
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.bmp");
217+
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.png");
218218
// m_pSaveDialogBox->SetDrawImage(new AllegroBitmap(backgroundFile.GetAsBitmap()));
219219
// m_pSaveDialogBox->SetDrawBackground(true);
220220
// m_pSaveDialogBox->SetDrawType(GUICollectionBox::Image);

‎Activities/GibEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ int GibEditor::Start()
221221
m_pSaveDialogBox = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("SaveDialogBox"));
222222

223223
// Set the background image of the parent collection box
224-
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.bmp");
224+
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.png");
225225
// m_pSaveDialogBox->SetDrawImage(new AllegroBitmap(backgroundFile.GetAsBitmap()));
226226
// m_pSaveDialogBox->SetDrawBackground(true);
227227
// m_pSaveDialogBox->SetDrawType(GUICollectionBox::Image);

‎Activities/SceneEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ int SceneEditor::Start()
226226
m_pSaveDialogBox = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("SaveDialogBox"));
227227

228228
// Set the background image of the parent collection box
229-
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.bmp");
229+
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.png");
230230
// m_pSaveDialogBox->SetDrawImage(new AllegroBitmap(backgroundFile.GetAsBitmap()));
231231
// m_pSaveDialogBox->SetDrawBackground(true);
232232
// m_pSaveDialogBox->SetDrawType(GUICollectionBox::Image);

‎Entities/Actor.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,31 +258,31 @@ int Actor::Create(const Actor &reference)
258258
// Only load the static AI mode icons once
259259
if (!m_sIconsLoaded)
260260
{
261-
ContentFile noTeamFile("Base.rte/GUIs/TeamIcons/NoTeam.bmp");
261+
ContentFile noTeamFile("Base.rte/GUIs/TeamIcons/NoTeam.png");
262262
m_apNoTeamIcon = noTeamFile.GetAsAnimation(2);
263263

264-
ContentFile iconFile("Base.rte/GUIs/PieIcons/Blank000.bmp");
264+
ContentFile iconFile("Base.rte/GUIs/PieIcons/Blank000.png");
265265
m_apAIIcons[AIMODE_NONE] = iconFile.GetAsBitmap();
266266
m_apAIIcons[AIMODE_BOMB] = iconFile.GetAsBitmap();
267-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Eye000.bmp");
267+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Eye000.png");
268268
m_apAIIcons[AIMODE_SENTRY] = iconFile.GetAsBitmap();
269-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Cycle000.bmp");
269+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Cycle000.png");
270270
m_apAIIcons[AIMODE_PATROL] = iconFile.GetAsBitmap();
271-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/GoTo000.bmp");
271+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/GoTo000.png");
272272
m_apAIIcons[AIMODE_GOTO] = iconFile.GetAsBitmap();
273-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Brain000.bmp");
273+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Brain000.png");
274274
m_apAIIcons[AIMODE_BRAINHUNT] = iconFile.GetAsBitmap();
275-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Dig000.bmp");
275+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Dig000.png");
276276
m_apAIIcons[AIMODE_GOLDDIG] = iconFile.GetAsBitmap();
277-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Return000.bmp");
277+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Return000.png");
278278
m_apAIIcons[AIMODE_RETURN] = iconFile.GetAsBitmap();
279-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Land000.bmp");
279+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Land000.png");
280280
m_apAIIcons[AIMODE_STAY] = iconFile.GetAsBitmap();
281-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Launch000.bmp");
281+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Launch000.png");
282282
m_apAIIcons[AIMODE_DELIVER] = iconFile.GetAsBitmap();
283-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Death000.bmp");
283+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Death000.png");
284284
m_apAIIcons[AIMODE_SCUTTLE] = iconFile.GetAsBitmap();
285-
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Follow000.bmp");
285+
iconFile.SetDataPath("Base.rte/GUIs/PieIcons/Follow000.png");
286286
m_apAIIcons[AIMODE_SQUAD] = iconFile.GetAsBitmap();
287287

288288
ContentFile arrowFile("Base.rte/GUIs/Indicators/SelectArrow.png");

‎Managers/PostProcessMan.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ namespace RTE {
2828

2929
int PostProcessMan::Create() {
3030
// TODO: Make more robust and load more glows!
31-
ContentFile glowFile("Base.rte/Effects/Glows/YellowTiny.bmp");
31+
ContentFile glowFile("Base.rte/Effects/Glows/YellowTiny.png");
3232
m_YellowGlow = glowFile.GetAsBitmap();
3333
m_YellowGlowHash = glowFile.GetHash();
34-
glowFile.SetDataPath("Base.rte/Effects/Glows/RedTiny.bmp");
34+
glowFile.SetDataPath("Base.rte/Effects/Glows/RedTiny.png");
3535
m_RedGlow = glowFile.GetAsBitmap();
3636
m_RedGlowHash = glowFile.GetHash();
37-
glowFile.SetDataPath("Base.rte/Effects/Glows/BlueTiny.bmp");
37+
glowFile.SetDataPath("Base.rte/Effects/Glows/BlueTiny.png");
3838
m_BlueGlow = glowFile.GetAsBitmap();
3939
m_BlueGlowHash = glowFile.GetHash();
4040

‎Menus/AreaPickerGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ int AreaPickerGUI::Create(Controller *pController, string onlyOfType)
9999
m_pParentBox = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("PickerGUIBox"));
100100

101101
// Set the background image of the parent collection box
102-
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.bmp");
102+
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.png");
103103
// m_pParentBox->SetDrawImage(new AllegroBitmap(backgroundFile.GetAsBitmap()));
104104
// m_pParentBox->SetDrawBackground(true);
105105
// m_pParentBox->SetDrawType(GUICollectionBox::Image);

‎Menus/ObjectPickerGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int ObjectPickerGUI::Create(Controller *pController, int whichModuleSpace, strin
130130
m_pParentBox = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("PickerGUIBox"));
131131

132132
// Set the background image of the parent collection box
133-
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.bmp");
133+
// ContentFile backgroundFile("Base.rte/GUIs/BuyMenuBackground.png");
134134
// m_pParentBox->SetDrawImage(new AllegroBitmap(backgroundFile.GetAsBitmap()));
135135
// m_pParentBox->SetDrawBackground(true);
136136
// m_pParentBox->SetDrawType(GUICollectionBox::Image);

‎Menus/PieMenuGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ int PieMenuGUI::Create(Controller *pController, Actor *pFocusActor)
295295
{
296296
ContentFile cursorFile("Base.rte/GUIs/Skins/PieCursor.png");
297297
s_pCursor = cursorFile.GetAsBitmap();
298-
// cursorFile.SetDataPath("Base.rte/Effects/Glows/YellowSmall.bmp");
298+
// cursorFile.SetDataPath("Base.rte/Effects/Glows/YellowSmall.png");
299299
// s_pCursorGlow = cursorFile.GetAsBitmap();
300300
}
301301

‎Menus/SceneEditorGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ int SceneEditorGUI::Create(Controller *pController, FeatureSets featureSet, int
151151
// Only load the static dot bitmaps once
152152
if (!s_pValidPathDot)
153153
{
154-
ContentFile dotFile("Base.rte/GUIs/Indicators/PathDotValid.bmp");
154+
ContentFile dotFile("Base.rte/GUIs/Indicators/PathDotValid.png");
155155
s_pValidPathDot = dotFile.GetAsBitmap();
156-
dotFile.SetDataPath("Base.rte/GUIs/Indicators/PathDotInvalid.bmp");
156+
dotFile.SetDataPath("Base.rte/GUIs/Indicators/PathDotInvalid.png");
157157
s_pInvalidPathDot = dotFile.GetAsBitmap();
158158
}
159159

0 commit comments

Comments
 (0)