fix: don't use RenderingEngine singleton when it's possible

EleutherAI · May 3, 2021 · a937124 · a937124
1 parent 5a02c37
commit a937124
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -1771,21 +1771,21 @@ void Client::afterContentReceived()
 
  // Rebuild inherited images and recreate textures
  infostream<<"- Rebuilding images and textures"<<std::endl;
- RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 70);
+ m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 70);
  m_tsrc->rebuildImagesAndTextures();
  delete[] text;
 
  // Rebuild shaders
  infostream<<"- Rebuilding shaders"<<std::endl;
  text = wgettext("Rebuilding shaders...");
- RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 71);
+ m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 71);
  m_shsrc->rebuildShaders();
  delete[] text;
 
  // Update node aliases
  infostream<<"- Updating node aliases"<<std::endl;
  text = wgettext("Initializing nodes...");
- RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 72);
+ m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 72);
  m_nodedef->updateAliases(m_itemdef);
  for (const auto &path : getTextureDirs()) {
  TextureOverrideSource override_source(path + DIR_DELIM + "override.txt");
@@ -1818,7 +1818,7 @@ void Client::afterContentReceived()
  m_script->on_client_ready(m_env.getLocalPlayer());
 
  text = wgettext("Done!");
- RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 100);
+ m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 100);
  infostream<<"Client::afterContentReceived() done"<<std::endl;
  delete[] text;
 }
@@ -1836,7 +1836,7 @@ float Client::getCurRate()
 
 void Client::makeScreenshot()
 {
- irr::video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+ irr::video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
  irr::video::IImage* const raw_image = driver->createScreenShot();
 
  if (!raw_image)