Show stamp selection and placement in zoom window. Fixes #140

1 files changed, 37 insertions, 37 deletions

diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index f354df0..26477e0 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1822,35 +1822,6 @@ void GameView::OnDraw()
 				}
 			}
 		}
-		ren->RenderEnd();
-
-		if(doScreenshot)
-		{
-			VideoBuffer screenshot(ren->DumpFrame());
-			std::vector<char> data = format::VideoBufferToPNG(screenshot);
-
-			std::stringstream filename;
-			filename << "screenshot_";
-			filename << std::setfill('0') << std::setw(6) << (screenshotIndex++);
-			filename << ".png";
-
-			Client::Ref().WriteFile(data, filename.str());
-			doScreenshot = false;
-		}
-
-		if(recording)
-		{
-			VideoBuffer screenshot(ren->DumpFrame());
-			std::vector<char> data = format::VideoBufferToPPM(screenshot);
-
-			std::stringstream filename;
-			filename << "frame_";
-			filename << std::setfill('0') << std::setw(6) << (recordingIndex++);
-			filename << ".ppm";
-
-			Client::Ref().WriteFile(data, filename.str());
-		}
-
 
 		if(selectMode!=SelectNone)
 		{
@@ -1874,16 +1845,16 @@ void GameView::OnDraw()
 					if(thumbPos.Y+(tempThumb->Size.Y)>=YRES)
 						thumbPos.Y = YRES-tempThumb->Size.Y;
 
-					g->draw_image(tempThumb->Data, thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y, 128);
+					ren->draw_image(tempThumb->Data, thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y, 128);
 
-					g->xor_rect(thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y);
+					ren->xor_rect(thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y);
 				}
 			}
 			else
 			{
 				if(selectPoint1.X==-1)
 				{
-					g->fillrect(0, 0, XRES, YRES, 0, 0, 0, 100);
+					ren->fillrect(0, 0, XRES, YRES, 0, 0, 0, 100);
 				}
 				else
 				{
@@ -1897,17 +1868,46 @@ void GameView::OnDraw()
 					if(y2>YRES-1)
 						y2 = YRES-1;
 
-					g->fillrect(0, 0, XRES, y1, 0, 0, 0, 100);
-					g->fillrect(0, y2, XRES, YRES-y2, 0, 0, 0, 100);
+					ren->fillrect(0, 0, XRES, y1, 0, 0, 0, 100);
+					ren->fillrect(0, y2, XRES, YRES-y2, 0, 0, 0, 100);
 
-					g->fillrect(0, y1, x1, (y2-y1), 0, 0, 0, 100);
-					g->fillrect(x2, y1, XRES-x2, (y2-y1), 0, 0, 0, 100);
+					ren->fillrect(0, y1, x1, (y2-y1), 0, 0, 0, 100);
+					ren->fillrect(x2, y1, XRES-x2, (y2-y1), 0, 0, 0, 100);
 
-					g->xor_rect(x1, y1, (x2-x1)+1, (y2-y1)+1);
+					ren->xor_rect(x1, y1, (x2-x1)+1, (y2-y1)+1);
 				}
 			}
 		}
 
+		ren->RenderEnd();
+
+		if(doScreenshot)
+		{
+			VideoBuffer screenshot(ren->DumpFrame());
+			std::vector<char> data = format::VideoBufferToPNG(screenshot);
+
+			std::stringstream filename;
+			filename << "screenshot_";
+			filename << std::setfill('0') << std::setw(6) << (screenshotIndex++);
+			filename << ".png";
+
+			Client::Ref().WriteFile(data, filename.str());
+			doScreenshot = false;
+		}
+
+		if(recording)
+		{
+			VideoBuffer screenshot(ren->DumpFrame());
+			std::vector<char> data = format::VideoBufferToPPM(screenshot);
+
+			std::stringstream filename;
+			filename << "frame_";
+			filename << std::setfill('0') << std::setw(6) << (recordingIndex++);
+			filename << ".ppm";
+
+			Client::Ref().WriteFile(data, filename.str());
+		}
+
 		int startX = 20;
 		int startY = YRES-20;
 		int startAlpha;