Skip to content

Commit 66f2121

Browse files
author
Pavel Kovalenko
committed
Rename UIChangeWeather -> ChangeWeatherDialog, (etc...)
UIChangeGameType -> ChangeGameTypeDialog.
1 parent 623132b commit 66f2121

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎src/xrGame/ui/UIChangeWeather.cpp renamed to ‎src/xrGame/ui/ChangeWeatherDialog.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "stdafx.h"
2-
#include "UIChangeWeather.h"
2+
#include "ChangeWeatherDialog.hpp"
33
#include "UIXmlInit.h"
44
#include "UI3tButton.h"
55
#include "../game_cl_teamdeathmatch.h"
@@ -86,7 +86,7 @@ void ButtonListDialog::SendMessage(CUIWindow* wnd, s16 msg, void* data /*= nullp
8686
}
8787
}
8888

89-
void CUIChangeWeather::InitChangeWeather(CUIXml& xmlDoc)
89+
void ChangeWeatherDialog::InitChangeWeather(CUIXml& xmlDoc)
9090
{
9191
CUIXmlInit::InitWindow(xmlDoc, "change_weather", 0, this);
9292
CUIXmlInit::InitTextWnd(xmlDoc, "change_weather:header", 0, Header);
@@ -107,15 +107,15 @@ void CUIChangeWeather::InitChangeWeather(CUIXml& xmlDoc)
107107
}
108108
}
109109

110-
void CUIChangeWeather::OnButtonClick(int i)
110+
void ChangeWeatherDialog::OnButtonClick(int i)
111111
{
112112
string1024 command;
113113
xr_sprintf(command, "cl_votestart changeweather %s %s", *weatherItems[i].Name, *weatherItems[i].Time);
114114
Console->Execute(command);
115115
HideDialog();
116116
}
117117

118-
void CUIChangeGameType::InitChangeGameType(CUIXml& xmlDoc)
118+
void ChangeGameTypeDialog::InitChangeGameType(CUIXml& xmlDoc)
119119
{
120120
CUIXmlInit::InitWindow(xmlDoc, "change_gametype", 0, this);
121121
CUIXmlInit::InitTextWnd(xmlDoc, "change_gametype:header", 0, Header);
@@ -136,7 +136,7 @@ void CUIChangeGameType::InitChangeGameType(CUIXml& xmlDoc)
136136
}
137137
}
138138

139-
void CUIChangeGameType::OnButtonClick(int i)
139+
void ChangeGameTypeDialog::OnButtonClick(int i)
140140
{
141141
string1024 command;
142142
xr_sprintf(command, "cl_votestart changegametype %s", gameTypeItems[i].c_str());

‎src/xrGame/ui/UIChangeWeather.h renamed to ‎src/xrGame/ui/ChangeWeatherDialog.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ButtonListDialog : public CUIDialogWnd
4040
virtual void OnCancel();
4141
};
4242

43-
class CUIChangeWeather : public ButtonListDialog
43+
class ChangeWeatherDialog : public ButtonListDialog
4444
{
4545
private:
4646
struct WeatherDesc
@@ -61,7 +61,7 @@ class CUIChangeWeather : public ButtonListDialog
6161
void ParseWeather();
6262
};
6363
// XXX nitrocaster: move to separate file
64-
class CUIChangeGameType : public ButtonListDialog
64+
class ChangeGameTypeDialog : public ButtonListDialog
6565
{
6666
private:
6767
xr_vector<shared_str> gameTypeItems;

‎src/xrGame/ui/UIVotingCategory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "UI3tButton.h"
55
#include "UIKickPlayer.h"
66
#include "UIChangeMap.h"
7-
#include "UIChangeWeather.h"
7+
#include "ChangeWeatherDialog.hpp"
88
#include "UIGameCustom.h"
99

1010
#include "../game_cl_teamdeathmatch.h"
@@ -148,14 +148,14 @@ void CUIVotingCategory::OnBtn(int i)
148148
case 5:
149149
HideDialog();
150150
if (!change_weather)
151-
change_weather = xr_new<CUIChangeWeather>();
151+
change_weather = xr_new<ChangeWeatherDialog>();
152152
change_weather->InitChangeWeather(*xml_doc);
153153
change_weather->ShowDialog (true);
154154
break;
155155
case 6:
156156
HideDialog();
157157
if (!change_gametype)
158-
change_gametype = xr_new<CUIChangeGameType>();
158+
change_gametype = xr_new<ChangeGameTypeDialog>();
159159
change_gametype->InitChangeGameType(*xml_doc);
160160
change_gametype->ShowDialog (true);
161161
break;

‎src/xrGame/ui/UIVotingCategory.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class CUIStatic;
66
class CUI3tButton;
77
class CUIKickPlayer;
88
class CUIChangeMap;
9-
class CUIChangeWeather;
10-
class CUIChangeGameType;
9+
class ChangeWeatherDialog;
10+
class ChangeGameTypeDialog;
1111
class CUIXml;
1212
class CUITextVote;
1313

@@ -38,7 +38,7 @@ class CUIVotingCategory : public CUIDialogWnd
3838

3939
CUIKickPlayer* kick;
4040
CUIChangeMap* change_map;
41-
CUIChangeWeather* change_weather;
42-
CUIChangeGameType* change_gametype;
41+
ChangeWeatherDialog* change_weather;
42+
ChangeGameTypeDialog* change_gametype;
4343
CUIXml* xml_doc;
4444
};

‎src/xrGame/xrGame.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@
16811681
<ClInclude Include="ui\UICellItem.h" />
16821682
<ClInclude Include="ui\UICellItemFactory.h" />
16831683
<ClInclude Include="ui\UIChangeMap.h" />
1684-
<ClInclude Include="ui\UIChangeWeather.h" />
1684+
<ClInclude Include="ui\ChangeWeatherDialog.hpp" />
16851685
<ClInclude Include="ui\UICharacterInfo.h" />
16861686
<ClInclude Include="ui\UIChatWnd.h" />
16871687
<ClInclude Include="ui\UICheckButton.h" />
@@ -3737,7 +3737,7 @@
37373737
<ClCompile Include="ui\UICellItem.cpp" />
37383738
<ClCompile Include="ui\UICellItemFactory.cpp" />
37393739
<ClCompile Include="ui\UIChangeMap.cpp" />
3740-
<ClCompile Include="ui\UIChangeWeather.cpp" />
3740+
<ClCompile Include="ui\ChangeWeatherDialog.cpp" />
37413741
<ClCompile Include="ui\UICharacterInfo.cpp" />
37423742
<ClCompile Include="ui\UIChatWnd.cpp" />
37433743
<ClCompile Include="ui\UICheckButton.cpp" />

‎src/xrGame/xrGame.vcxproj.filters

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7167,9 +7167,6 @@
71677167
<ClInclude Include="ui\UIChangeMap.h">
71687168
<Filter>UI\Multiplayer\Voting</Filter>
71697169
</ClInclude>
7170-
<ClInclude Include="ui\UIChangeWeather.h">
7171-
<Filter>UI\Multiplayer\Voting</Filter>
7172-
</ClInclude>
71737170
<ClInclude Include="ui\UIKickPlayer.h">
71747171
<Filter>UI\Multiplayer\Voting</Filter>
71757172
</ClInclude>
@@ -7377,6 +7374,9 @@
73777374
<ClInclude Include="physics_world_scripted.h">
73787375
<Filter>Physics\scripts</Filter>
73797376
</ClInclude>
7377+
<ClInclude Include="ui\ChangeWeatherDialog.hpp">
7378+
<Filter>UI\Multiplayer\Voting</Filter>
7379+
</ClInclude>
73807380
</ItemGroup>
73817381
<ItemGroup>
73827382
<ClCompile Include="damage_manager.cpp">
@@ -10820,9 +10820,6 @@
1082010820
<ClCompile Include="ui\UIChangeMap.cpp">
1082110821
<Filter>UI\Multiplayer\Voting</Filter>
1082210822
</ClCompile>
10823-
<ClCompile Include="ui\UIChangeWeather.cpp">
10824-
<Filter>UI\Multiplayer\Voting</Filter>
10825-
</ClCompile>
1082610823
<ClCompile Include="ui\UIKickPlayer.cpp">
1082710824
<Filter>UI\Multiplayer\Voting</Filter>
1082810825
</ClCompile>
@@ -11024,6 +11021,9 @@
1102411021
<ClCompile Include="physics_world_scripted.cpp">
1102511022
<Filter>Physics\scripts</Filter>
1102611023
</ClCompile>
11024+
<ClCompile Include="ui\ChangeWeatherDialog.cpp">
11025+
<Filter>UI\Multiplayer\Voting</Filter>
11026+
</ClCompile>
1102711027
</ItemGroup>
1102811028
<ItemGroup>
1102911029
<CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">

0 commit comments

Comments
 (0)