diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-27 12:32:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-27 12:32:17 (GMT) |
| commit | 0ca680f4c8585642b7201d07a3632ed276e5794a (patch) | |
| tree | a75193ec7599209f24b5b488081cc61609b1eb2d /src/simulation | |
| parent | ebc411667550a0fbebc8ed9ab983b53b2f1c5f5f (diff) | |
| download | powder-0ca680f4c8585642b7201d07a3632ed276e5794a.zip powder-0ca680f4c8585642b7201d07a3632ed276e5794a.tar.gz | |
Enable decorations in renderer for local save items, disable for server save previews.
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/SaveRenderer.cpp | 8 | ||||
| -rw-r--r-- | src/simulation/SaveRenderer.h | 4 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index ecd284d..2de9a6c 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -38,7 +38,7 @@ SaveRenderer::SaveRenderer(){ #endif } -Thumbnail * SaveRenderer::Render(GameSave * save) +Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations) { int width, height; Thumbnail * tempThumb; @@ -52,7 +52,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save) if(!sim->Load(save)) { - ren->decorations_enable = false; + ren->decorations_enable = decorations; #if defined(OGLR) || defined(OGLI) pixel * pData = NULL; unsigned char * texData = NULL; @@ -123,7 +123,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save) return tempThumb; } -Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize) +Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize, bool decorations) { GameSave * tempSave; try { @@ -138,7 +138,7 @@ Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize) return thumb; } - Thumbnail * thumb = Render(tempSave); + Thumbnail * thumb = Render(tempSave, decorations); delete tempSave; return thumb; } diff --git a/src/simulation/SaveRenderer.h b/src/simulation/SaveRenderer.h index 22e3adf..e54517e 100644 --- a/src/simulation/SaveRenderer.h +++ b/src/simulation/SaveRenderer.h @@ -24,8 +24,8 @@ class SaveRenderer: public Singleton<SaveRenderer> { Renderer * ren; public: SaveRenderer(); - Thumbnail * Render(GameSave * save); - Thumbnail * Render(unsigned char * saveData, int saveDataSize); + Thumbnail * Render(GameSave * save, bool decorations = true); + Thumbnail * Render(unsigned char * saveData, int saveDataSize, bool decorations = true); virtual ~SaveRenderer(); private: diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 450f6d3..cb9b654 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -238,6 +238,7 @@ Snapshot * Simulation::CreateSnapshot() void Simulation::Restore(const Snapshot & snap) { + parts_lastActiveIndex = NPART-1; std::copy(snap.AirPressure.begin(), snap.AirPressure.end(), &pv[0][0]); std::copy(snap.AirVelocityX.begin(), snap.AirVelocityX.end(), &vx[0][0]); std::copy(snap.AirVelocityY.begin(), snap.AirVelocityY.end(), &vy[0][0]); |