5353// static void ode_free (void *ptr, size_t size) { return xr_free(ptr); }
5454// #endif // DEBUG_MEMORY_MANAGER
5555
56+ // temporary hack to get rid of the Microsoft-specific "__super"
57+ typedef IGame_Persistent my_super;
58+
5659CGamePersistent::CGamePersistent (void )
5760{
5861 m_bPickableDOF = false ;
@@ -155,7 +158,7 @@ void CGamePersistent::OnAppStart()
155158 // load game materials
156159 GMLib.Load ();
157160 init_game_globals ();
158- __super ::OnAppStart ();
161+ my_super ::OnAppStart ();
159162 m_pUI_core = new ui_core ();
160163 m_pMainMenu = new CMainMenu ();
161164}
@@ -168,20 +171,20 @@ void CGamePersistent::OnAppEnd()
168171 xr_delete (m_pMainMenu);
169172 xr_delete (m_pUI_core);
170173
171- __super ::OnAppEnd ();
174+ my_super ::OnAppEnd ();
172175
173176 clean_game_globals ();
174177
175178 GMLib.Unload ();
176179}
177180
178- void CGamePersistent::Start (LPCSTR op) { __super ::Start (op); }
181+ void CGamePersistent::Start (LPCSTR op) { my_super ::Start (op); }
179182void CGamePersistent::Disconnect ()
180183{
181184 // destroy ambient particles
182185 CParticlesObject::Destroy (ambient_particles);
183186
184- __super ::Disconnect ();
187+ my_super ::Disconnect ();
185188 // stop all played emitters
186189 ::Sound->stop_emitters ();
187190 m_game_params.m_e_game_type = eGameIDNoGame;
@@ -191,7 +194,7 @@ void CGamePersistent::Disconnect()
191194
192195void CGamePersistent::OnGameStart ()
193196{
194- __super ::OnGameStart ();
197+ my_super ::OnGameStart ();
195198 UpdateGameType ();
196199}
197200
@@ -212,7 +215,7 @@ LPCSTR GameTypeToString(EGameIDs gt, bool bShort)
212215
213216void CGamePersistent::UpdateGameType ()
214217{
215- __super ::UpdateGameType ();
218+ my_super ::UpdateGameType ();
216219
217220 m_game_params.m_e_game_type = ParseStringToGameType (m_game_params.m_game_type );
218221
@@ -224,7 +227,7 @@ void CGamePersistent::UpdateGameType()
224227
225228void CGamePersistent::OnGameEnd ()
226229{
227- __super ::OnGameEnd ();
230+ my_super ::OnGameEnd ();
228231
229232 xr_delete (g_stalker_animation_data_storage);
230233 xr_delete (g_stalker_velocity_holder);
@@ -638,7 +641,7 @@ void CGamePersistent::OnFrame()
638641 }
639642#endif // MASTER_GOLD
640643 }
641- __super ::OnFrame ();
644+ my_super ::OnFrame ();
642645
643646 if (!Device.Paused ())
644647 Engine.Sheduler .Update ();
0 commit comments