Version 26.4 (also Linux / cross compiling fixes)

Author: jacob1

build/readme.txt

@@ -645,6 +645,14 @@ Version 26.3 1/16/14
 Fix steamline drawing and floodfill crash. Fix glitch where ARAY didn't spark 
 INST. Possible element search crash fix. Fix STKM(AIR) blowing ability.
 
+Version 26.4 2/3/14
+Rewrites / fixes to Tool, box, and ellipse brush drawing. Fix possible crash
+when shifting stamps, and make ctrl key not needed. Lots of crash fixes for
+some lua functions. Fix STKM2 spawning with really high life (probably). New
+bug icon. PROP remembers what property you set last. Fix things coming out
+the wrong side of portals. Fix some bugs with clicking after exiting out of
+certain interfaces.
+
 
 
 

includes/defines.h

@@ -30,9 +30,9 @@
 //VersionInfoEnd
 
 #define MOD_VERSION 26
-#define MOD_MINOR_VERSION 3
+#define MOD_MINOR_VERSION 4
 #define MOD_SAVE_VERSION 17 //This is not the version number of my mod anymore, it's only changed when I change the saving code
-#define MOD_BUILD_VERSION 29 //For update checks
+#define MOD_BUILD_VERSION 30 //For update checks
 #define BETA_VERSION 89
 #define BETA_MINOR_VER 1
 #define RELEASE_VERSION 89

src/interface.cpp

@@ -1761,6 +1761,8 @@ void prop_edit_ui(pixel *vid_buf)
 	int x0=(XRES-xsize)/2,y0=(YRES-MENUSIZE-ysize)/2,b=1,bq,mx,my;
 	ui_list ed;
 	ui_edit ed2;
+	PropTool* propTool = (PropTool*)GetToolFromIdentifier("DEFAULT_TOOL_PROP");
+	bool name = false;
 
 	ed.x = x0+8;
 	ed.y = y0+25;
@@ -1836,7 +1838,6 @@ void prop_edit_ui(pixel *vid_buf)
 		}
 	}
 
-	bool name = false;
 	if(ed.selected != -1)
 	{
 		if (!strcmp(ed.str, "type")) {
@@ -1882,7 +1883,6 @@ void prop_edit_ui(pixel *vid_buf)
 		goto exit;
 	}
 
-	PropTool* propTool = (PropTool*)GetToolFromIdentifier("DEFAULT_TOOL_PROP");
 	propTool->propOffset = propoffset;
 	if (format == 0)
 	{

src/simulation/Simulation.cpp

@@ -1,4 +1,4 @@
-/*
+/*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or