diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-03 11:38:09 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-03 11:38:09 (GMT) |
| commit | 1ac964d9bac38504f4b7fddc09230c56edf1eff5 (patch) | |
| tree | 025d21fb55656fcd1ccfa183e3832d746bfb7931 /src | |
| parent | 4e09a077a4d7494d1c1e1f494cbc36fa9abcb19c (diff) | |
| download | powder-1ac964d9bac38504f4b7fddc09230c56edf1eff5.zip powder-1ac964d9bac38504f4b7fddc09230c56edf1eff5.tar.gz | |
Ensure saves are expanded in memory when performing translate operations. Fixes #174
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/GameSave.cpp | 2 | ||||
| -rw-r--r-- | src/game/GameController.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index a6a1b89..7a24c45 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -297,6 +297,8 @@ char * GameSave::Serialise(int & dataSize) void GameSave::Transform(matrix2d transform, vector2d translate) { + if(Collapsed()) + Expand(); int i, x, y, nx, ny, width = blockWidth*CELL, height = blockHeight*CELL, newWidth, newHeight, newBlockWidth, newBlockHeight; vector2d pos, tmp, ctl, cbr, vel; vector2d cornerso[4]; diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 2c98f87..860c23a 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -447,11 +447,15 @@ void GameController::DrawPoints(int toolSelection, queue<ui::Point*> & pointQueu void GameController::LoadClipboard() { gameModel->SetPlaceSave(gameModel->GetClipboard()); + if(gameModel->GetPlaceSave() && gameModel->GetPlaceSave()->Collapsed()) + gameModel->GetPlaceSave()->Expand(); } void GameController::LoadStamp() { gameModel->SetPlaceSave(gameModel->GetStamp()); + if(gameModel->GetPlaceSave() && gameModel->GetPlaceSave()->Collapsed()) + gameModel->GetPlaceSave()->Expand(); } void GameController::TranslateSave(ui::Point point) |