diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-05 12:48:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-05 12:48:50 (GMT) |
| commit | 8f8de875c6f7a68a3e47252a8653abb72fd398c1 (patch) | |
| tree | d2079a8422c3b591e3e31e272358825e0a597da3 /src/game | |
| parent | ea51cde1f07d2a63f824e78c44adad0993115853 (diff) | |
| download | powder-8f8de875c6f7a68a3e47252a8653abb72fd398c1.zip powder-8f8de875c6f7a68a3e47252a8653abb72fd398c1.tar.gz | |
Modifier keys for Lua, Air display, correct render mode saving
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/GameModel.cpp | 4 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 6a8f3d8..fa18e24 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -126,14 +126,14 @@ GameModel::~GameModel() { Client::Ref().configDocument["Renderer"]["ColourMode"] = json::Number(ren->GetColourMode()); - ((json::Array)Client::Ref().configDocument["Renderer"]["DisplayModes"]).Clear(); + Client::Ref().configDocument["Renderer"]["DisplayModes"] = json::Array(); std::vector<unsigned int> displayModes = ren->GetDisplayMode(); for (int i = 0; i < displayModes.size(); i++) { Client::Ref().configDocument["Renderer"]["DisplayModes"][i] = json::Number(displayModes[i]); } - ((json::Array)Client::Ref().configDocument["Renderer"]["RenderModes"]).Clear(); + Client::Ref().configDocument["Renderer"]["RenderModes"] = json::Array(); std::vector<unsigned int> renderModes = ren->GetRenderMode(); for (int i = 0; i < renderModes.size(); i++) { diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index d8ea4b8..bd4bd7a 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -840,6 +840,7 @@ void GameView::OnDraw() if(ren) { Graphics * g = ui::Engine::Ref().g; + ren->draw_air(); ren->render_parts(); ren->render_fire(); ren->DrawWalls(); |