Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 10:22:52 +01:00
Code Issues Projects Releases Activity

rwviewer: load gamedata before passing it to gameworld

Browse Source
This commit is contained in:
Anonymous Maarten 2018-08-28 22:15:20 +02:00 committed by Daniel Evans
parent 2670de509f
commit 3628faf72b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rwviewer/ViewerWindow.cpp
View File

@ -144,12 +144,12 @@ void ViewerWindow::loadGame(const QString& path) {
} }
gameData = std::make_unique<GameData>(&engineLog, gameDir.absolutePath().toStdString()); gameData = std::make_unique<GameData>(&engineLog, gameDir.absolutePath().toStdString());
gameData->load();
gameWorld = std::make_unique<GameWorld>(&engineLog, gameData.get()); gameWorld = std::make_unique<GameWorld>(&engineLog, gameData.get());
renderer = std::make_unique<GameRenderer>(&engineLog, gameData.get()); renderer = std::make_unique<GameRenderer>(&engineLog, gameData.get());
gameWorld->state = new GameState; gameWorld->state = new GameState;
gameWorld->data->load();
renderer->text.setFontTexture(FONT_PAGER, "pager"); renderer->text.setFontTexture(FONT_PAGER, "pager");
renderer->text.setFontTexture(FONT_PRICEDOWN, "font1"); renderer->text.setFontTexture(FONT_PRICEDOWN, "font1");
renderer->text.setFontTexture(FONT_ARIAL, "font2"); renderer->text.setFontTexture(FONT_ARIAL, "font2");