merging windows fix and local changes

src/hexgame.cpp

@@ -88,10 +88,8 @@ getSingleHex(int32 x, int32 y)
 	for (hex_info &hxi : *g_game_state->hex_array)
 	{
 		if (hex_equal(h, hxi.hex))
-		{
 			return &hxi;
 	}
-	}
 	
 	return 0;
 }
@@ -111,16 +109,12 @@ startHexFill(int32 x, int32 y)
 	resetHexes();
 	hex_info *hex = getSingleHex(x, y);
 	if (hex)
-	{
 		setStartHex(hex);
-	}
 }
 
 void
 updateHexFill(int32 x, int32 y)
 {
-	if (g_game_state->is_selecting)
-	{
 	hex_info *hxi = getSingleHex(x, y);
 	if (hxi && (hxi != g_game_state->current_hex))
 	{
@@ -141,7 +135,6 @@ updateHexFill(int32 x, int32 y)
 			}
 		}
 	}
-	}
 }
 
 void
@@ -150,16 +143,12 @@ startHexLineDraw(int32 x, int32 y)
 	resetHexes();
 	hex_info *hex = getSingleHex(x, y);
 	if (hex)
-	{
 		setStartHex(hex);
-	}
 }
 
 void
 updateHexLineDraw(int32 x, int32 y)
 {
-	if (g_game_state->is_selecting)
-	{
 	hex_info *hxi = getSingleHex(x, y);
 	if (hxi && (hxi != g_game_state->current_hex))
 	{
@@ -168,7 +157,7 @@ updateHexLineDraw(int32 x, int32 y)
 		
 		for (hex_info &h1 : *g_game_state->hex_array)
 		{
-				for (uint32 i = 0; i < hexLine.size(); i++)
+			for (uint i = 0; i < hexLine.size(); i++)
 			{	
 				Hex h2 = hexLine[i];
 				if (hex_equal(h1.hex, h2))
@@ -185,7 +174,6 @@ updateHexLineDraw(int32 x, int32 y)
 			}
 		}
 	}
-	}
 }
 
 void
@@ -194,16 +182,12 @@ startHexConeFill(int32 x, int32 y)
 	resetHexes();
 	hex_info *hex = getSingleHex(x, y);
 	if (hex)
-	{
 		setStartHex(hex);
-	}
 }
 
 void
 updateHexConeFill(int32 x, int32 y)
 {
-	if (g_game_state->is_selecting)
-	{
 	hex_info *hxi = getSingleHex(x, y);
 	if (hxi && (hxi != g_game_state->current_hex))
 	{
@@ -214,9 +198,8 @@ updateHexConeFill(int32 x, int32 y)
 			// TODO: define a system of linear inequalities in hex-space to represent
 			// 	cones/arbitrary polygons
 			if (&h == g_game_state->start_hex)
-				{
 				continue;
-				}
+
 			if (hex_equal(h.hex, hxi->hex))
 			{
 				h.selected = true;
@@ -229,7 +212,6 @@ updateHexConeFill(int32 x, int32 y)
 			}
 		}
 	}
-	}
 }
 
 void
@@ -370,7 +352,7 @@ processSDLEvents(SDL_Handles &handles)
 				}
 				break;
 			case SDL_MOUSEMOTION:
-				if (!gooey_wants)
+				if (!gooey_wants && g_game_state->is_selecting)
 					handleMouseMove(e.motion);
 				break;
 			default:

src/hexgame.h

@@ -5,7 +5,11 @@
 #include <vector>
 #include <cassert>
 
-#include <SDL.h>
+#if defined (_WIN32) 
+	#include <SDL.h>
+#else
+	#include <SDL2/SDL.h>
+#endif
 #include "aixlog.hpp"
 
 #include "hexlib.h"
@@ -109,3 +113,4 @@ SafeTruncateToInt32(int64 val)
 }
 
 #endif // HEXGAME_H
+

src/imgui.ini

@@ -0,0 +1,5 @@
+[Window][Debug##Default]
+Pos=0,5
+Size=400,400
+Collapsed=0
+

src/renderer.h

@@ -493,7 +493,7 @@ renderDebug(hex_info *start_hex, hex_info *current_hex)
 	Point p2(current_hex->XPos, current_hex->YPos);
 	real64 angle = std::atan2(p2.y - p1.y, p2.x - p1.x);
 	real64 len = std::hypot(p2.y - p1.y, p2.x - p1.x);
-	real64 coneAngle = 24.5f * M_PI / 180; // M_PI is non-standard and may not be portable
+	real64 coneAngle = 30.f * M_PI / 180; // M_PI is non-standard and may not be portable
 	
 	// TODO: add matrix math library for rotation transform?
 	// |x|   | cos(a + b) -sin(a + b)  0 |