xrGame: Use standard try-catch blocks

OpenXRay · Sep 27, 2018 · cc46ec3 · cc46ec3
1 parent 13b0766
commit cc46ec3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/xrGame/physics_game.cpp b/src/xrGame/physics_game.cpp
@@ -156,11 +156,11 @@ static void play_object(dxGeomUserData* data, SGameMtlPair* mtl_pair, const dCon
 
     CPHSoundPlayer* sp = NULL;
 #ifdef DEBUG
-    __try
+    try
     {
         sp = data->ph_ref_object->ObjectPhSoundPlayer();
     }
-    __except (EXCEPTION_EXECUTE_HANDLER)
+    catch (...)
     {
         Msg("data->ph_ref_object: %p ", data->ph_ref_object);
         Msg("data: %p ", data);

diff --git a/src/xrGame/script_game_object_impl.h b/src/xrGame/script_game_object_impl.h
@@ -15,12 +15,13 @@
 IC CGameObject& CScriptGameObject::object() const
 {
 #ifdef DEBUG
-    __try
+    // What does this even throw? Think about rewriting this try-catch block
+    try
     {
         if (m_game_object && m_game_object->lua_game_object() == this)
             return (*m_game_object);
     }
-    __except (EXCEPTION_EXECUTE_HANDLER)
+    catch (...)
     {
     }