Skip to content

Commit

Permalink
xrGame.vcxproj: added forgotten file to the project
Browse files Browse the repository at this point in the history
xrGame/ui/UILoadingScreen.cpp: cosmetic changes
  • Loading branch information
Xottab-DUTY committed Sep 29, 2018
1 parent b70691f commit c35b909
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/xrGame/ui/UILoadingScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ UILoadingScreen::UILoadingScreen()
void UILoadingScreen::Initialize()
{
CUIXml uiXml;
bool result = uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_mm_loading_screen.xml");
bool loaded = uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_mm_loading_screen.xml");

if (!result) // Robustness? Yes!
if (!loaded) // Robustness? Yes!
{
if (UI().is_widescreen())
uiXml.Set(LoadingScreenXML16x9);
Expand Down
1 change: 1 addition & 0 deletions src/xrGame/xrGame.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3489,6 +3489,7 @@
</ClCompile>
<ClCompile Include="ui\UIListItemServer.cpp" />
<ClCompile Include="ui\UILoadingScreen.cpp" />
<ClInclude Include="ui\UILoadingScreenHardcoded.h" />
<ClCompile Include="ui\UILogsWnd.cpp" />
<ClCompile Include="ui\UIMainIngameWnd.cpp" />
<ClCompile Include="ui\UIMap.cpp" />
Expand Down
3 changes: 3 additions & 0 deletions src/xrGame/xrGame.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -10185,6 +10185,9 @@
<ClCompile Include="WeaponScript.cpp">
<Filter>Core\Client\Objects\items &amp; weapons\Weapons\WeaponScript</Filter>
</ClCompile>
<ClCompile Include="ui\UILoadingScreenHardcoded.h">
<Filter>UI\Common\LoadingScreen</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">
Expand Down

0 comments on commit c35b909

Please sign in to comment.