summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-03-12 19:00:51 (GMT)
committer jacob1 <jfu614@gmail.com>2013-03-12 19:00:51 (GMT)
commit134d1fab10a713ce0e99bfc3325b099abcbbe591 (patch)
tree7a118d945440c2d96ed88a2319bd68624ec138e5
parent319ffb7e77bfce648f085a1ecc8275dee57ece05 (diff)
downloadpowder-134d1fab10a713ce0e99bfc3325b099abcbbe591.zip
powder-134d1fab10a713ce0e99bfc3325b099abcbbe591.tar.gz
delete ancient changelog.txt
-rw-r--r--Changelog.txt19
-rw-r--r--README2
-rw-r--r--src/interface/Window.cpp2
3 files changed, 2 insertions, 21 deletions
diff --git a/Changelog.txt b/Changelog.txt
deleted file mode 100644
index 5b06236..0000000
--- a/Changelog.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- - Special brush types
- - Special brush delete
- - LOVE
- - LOLZ
- - Property edit
- - Saving, loading, thumbnailing, etc
- - HEAT/COOL
- - Streamlines
- - Grid
- - Sign moving
- - Electron fancyness with glass, fire_r-g-b now out of scope
- - Grav fancyness, use current frame index to determine colour, not globals!
- - Emp flash
- - Stickman HP
-
- To do:
- See TODO's
- Char * and string, hmm....
- Vectors for things like signs, stamp list, etc where appropriate \ No newline at end of file
diff --git a/README b/README
index 359ed7c..a98ee4e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-The Powder Toy - November 2012
+The Powder Toy - March 2013
Get the latest version here: http://powdertoy.co.uk/Download.html
diff --git a/src/interface/Window.cpp b/src/interface/Window.cpp
index e36f9c1..3cd22e6 100644
--- a/src/interface/Window.cpp
+++ b/src/interface/Window.cpp
@@ -408,7 +408,7 @@ void Window::DoMouseDown(int x_, int y_, unsigned button)
if(!stop)
OnMouseDown(x_, y_, button);
- if(x_ < Position.X || y_ < Position.Y || x_ > Position.X+Size.X || y_ > Position.Y+Size.Y)
+ if(!clickState && (x_ < Position.X || y_ < Position.Y || x_ > Position.X+Size.X || y_ > Position.Y+Size.Y))
OnTryExit(MouseOutside);
if(destruct)