From ba43e4d238ab60255bde40afd3eb1430fb18ea08 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 18 Oct 2013 16:13:04 -0400
Subject: [PATCH] revert b17ef7f93880 (couldn't figure out better fix for the
 new PSTN bug), fix annoyance with clicking on save comments changing pages

---
 src/gui/preview/PreviewView.cpp  | 14 +++++++++-----
 src/simulation/elements/PSTN.cpp |  7 +++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp
index 9d091e14a..c961ffa94 100644
--- a/src/gui/preview/PreviewView.cpp
+++ b/src/gui/preview/PreviewView.cpp
@@ -384,12 +384,16 @@ void PreviewView::OnMouseWheel(int x, int y, int d)
 
 void PreviewView::OnMouseUp(int x, int y, unsigned int button)
 {
-	if(commentsPanel->GetScrollLimit() == 1)
-		c->NextCommentPage();
-	if(commentsPanel->GetScrollLimit() == -1)
+	//if mouse is on the scrollwheel or farther right, and you are at the top of bottom of a page, change pages
+	if (x > Position.X+commentsPanel->Position.X+commentsPanel->Size.X-6)
 	{
-		if (c->PrevCommentPage())
-			prevPage = true;
+		if (commentsPanel->GetScrollLimit() == 1)
+			c->NextCommentPage();
+		if (commentsPanel->GetScrollLimit() == -1)
+		{
+			if (c->PrevCommentPage())
+				prevPage = true;
+		}
 	}
 }
 
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index 998f7a2ba..6dda77ffc 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -167,7 +167,7 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS)
 //#TPT-Directive ElementHeader Element_PSTN static int CanMoveStack(Simulation * sim, int stackX, int stackY, int directionX, int directionY, int maxSize, int amount, bool retract, int block)
 int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int directionX, int directionY, int maxSize, int amount, bool retract, int block)
 {
-	int posX, posY, r, spaces = 0, currentPos = 0, num = 0;
+	int posX, posY, r, spaces = 0, currentPos = 0;
 	if (amount <= 0)
 		return 0;
 	for(posX = stackX, posY = stackY; currentPos < maxSize + amount && currentPos < XRES-1; posX += directionX, posY += directionY) {
@@ -176,7 +176,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
 		}
 		r = sim->pmap[posY][posX];
 		if (sim->IsWallBlocking(posX, posY, 0) || (block && (r&0xFF) == block))
-			return num;
+			return spaces;
 		if(!r) {
 			spaces++;
 			tempParts[currentPos++] = -1;
@@ -186,9 +186,8 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
 			if(spaces < maxSize && currentPos < maxSize && (!retract || ((r&0xFF) == PT_FRME) && posX == stackX && posY == stackY))
 				tempParts[currentPos++] = r>>8;
 			else
-				return num;
+				return spaces;
 		}
-		num++;
 	}
 	if (spaces)
 		return currentPos;