Skip to content

Commit 51f3eb4

Browse files
committed
xrGamePersistent.cpp: use alias instead of typedef
"my_super" renamed to "super" related to previous commit of tamlin-mike: f5d67ba
1 parent f5d67ba commit 51f3eb4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/xrGame/GamePersistent.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
//#endif // DEBUG_MEMORY_MANAGER
5555

5656
// temporary hack to get rid of the Microsoft-specific "__super"
57-
typedef IGame_Persistent my_super;
57+
using super = IGame_Persistent;
5858

5959
CGamePersistent::CGamePersistent(void)
6060
{
@@ -158,7 +158,7 @@ void CGamePersistent::OnAppStart()
158158
// load game materials
159159
GMLib.Load();
160160
init_game_globals();
161-
my_super::OnAppStart();
161+
super::OnAppStart();
162162
m_pUI_core = new ui_core();
163163
m_pMainMenu = new CMainMenu();
164164
}
@@ -171,20 +171,20 @@ void CGamePersistent::OnAppEnd()
171171
xr_delete(m_pMainMenu);
172172
xr_delete(m_pUI_core);
173173

174-
my_super::OnAppEnd();
174+
super::OnAppEnd();
175175

176176
clean_game_globals();
177177

178178
GMLib.Unload();
179179
}
180180

181-
void CGamePersistent::Start(LPCSTR op) { my_super::Start(op); }
181+
void CGamePersistent::Start(LPCSTR op) { super::Start(op); }
182182
void CGamePersistent::Disconnect()
183183
{
184184
// destroy ambient particles
185185
CParticlesObject::Destroy(ambient_particles);
186186

187-
my_super::Disconnect();
187+
super::Disconnect();
188188
// stop all played emitters
189189
::Sound->stop_emitters();
190190
m_game_params.m_e_game_type = eGameIDNoGame;
@@ -194,7 +194,7 @@ void CGamePersistent::Disconnect()
194194

195195
void CGamePersistent::OnGameStart()
196196
{
197-
my_super::OnGameStart();
197+
super::OnGameStart();
198198
UpdateGameType();
199199
}
200200

@@ -215,7 +215,7 @@ LPCSTR GameTypeToString(EGameIDs gt, bool bShort)
215215

216216
void CGamePersistent::UpdateGameType()
217217
{
218-
my_super::UpdateGameType();
218+
super::UpdateGameType();
219219

220220
m_game_params.m_e_game_type = ParseStringToGameType(m_game_params.m_game_type);
221221

@@ -227,7 +227,7 @@ void CGamePersistent::UpdateGameType()
227227

228228
void CGamePersistent::OnGameEnd()
229229
{
230-
my_super::OnGameEnd();
230+
super::OnGameEnd();
231231

232232
xr_delete(g_stalker_animation_data_storage);
233233
xr_delete(g_stalker_velocity_holder);
@@ -641,7 +641,7 @@ void CGamePersistent::OnFrame()
641641
}
642642
#endif // MASTER_GOLD
643643
}
644-
my_super::OnFrame();
644+
super::OnFrame();
645645

646646
if (!Device.Paused())
647647
Engine.Sheduler.Update();

0 commit comments

Comments
 (0)