Don't crash if no loading tips found

OpenXRay · Apr 2, 2019 · a799fc4 · a799fc4
1 parent 7984af7
commit a799fc4
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp
@@ -880,21 +880,28 @@ void CGamePersistent::LoadTitle(bool change_tip, shared_str map_name)
  pApp->LoadStage();
  if (change_tip)
  {
+ bool noTips = false;
  string512 buff;
  u8 tip_num;
  luabind::functor<u8> m_functor;
- bool is_single = !xr_strcmp(m_game_params.m_game_type, "single");
+ const bool is_single = !xr_strcmp(m_game_params.m_game_type, "single");
  if (is_single)
  {
- R_ASSERT(GEnv.ScriptEngine->functor("loadscreen.get_tip_number", m_functor));
- tip_num = m_functor(map_name.c_str());
+ if (GEnv.ScriptEngine->functor("loadscreen.get_tip_number", m_functor))
+ tip_num = m_functor(map_name.c_str());
+ else
+ noTips = true;
  }
  else
  {
- R_ASSERT(GEnv.ScriptEngine->functor("loadscreen.get_mp_tip_number", m_functor));
- tip_num = m_functor(map_name.c_str());
+ if (GEnv.ScriptEngine->functor("loadscreen.get_mp_tip_number", m_functor))
+ tip_num = m_functor(map_name.c_str());
+ else
+ noTips = true;
  }
- // tip_num = 83;
+ if (noTips)
+ return;
+
  xr_sprintf(buff, "%s%d:", StringTable().translate("ls_tip_number").c_str(), tip_num);
  shared_str tmp = buff;