?

tatjam · Mar 28, 2020 · 0dd855c · 0dd855c
1 parent 022fdf8
commit 0dd855c
Show file tree

Hide file tree

Showing 51 changed files with 44 additions and 8 deletions.
diff --git a/7DRL.exe b/7DRL.exe
diff --git a/7DRL.zip b/7DRL.zip
diff --git a/7DRL/7DRL.exe b/7DRL/7DRL.exe
diff --git a/7DRL/SAMPLES.txt b/7DRL/SAMPLES.txt
@@ -0,0 +1,2 @@
+Some samples were taken from the ARMA 3 mod JSRS (Explosion sounds) and
+mixed with other effects.
diff --git a/7DRL/SDL2.dll b/7DRL/SDL2.dll
diff --git a/7DRL/Test.xp b/7DRL/Test.xp
diff --git a/7DRL/alien_die.wav b/7DRL/alien_die.wav
diff --git a/7DRL/biter/attack.wav b/7DRL/biter/attack.wav
diff --git a/7DRL/biter/idle.wav b/7DRL/biter/idle.wav
diff --git a/7DRL/click.wav b/7DRL/click.wav
diff --git a/7DRL/collide.wav b/7DRL/collide.wav
diff --git a/7DRL/collide2.wav b/7DRL/collide2.wav
diff --git a/7DRL/crawler/attack.wav b/7DRL/crawler/attack.wav
diff --git a/7DRL/crawler/idle.wav b/7DRL/crawler/idle.wav
diff --git a/7DRL/crawler/moving.wav b/7DRL/crawler/moving.wav
diff --git a/7DRL/diesel.wav b/7DRL/diesel.wav
diff --git a/7DRL/diesel_off.wav b/7DRL/diesel_off.wav
diff --git a/7DRL/distort.wav b/7DRL/distort.wav
diff --git a/7DRL/engine_off.wav b/7DRL/engine_off.wav
diff --git a/7DRL/engines_high.wav b/7DRL/engines_high.wav
diff --git a/7DRL/engines_low.wav b/7DRL/engines_low.wav
diff --git a/7DRL/explo_far_dist.wav b/7DRL/explo_far_dist.wav
diff --git a/7DRL/explo_med_dist.wav b/7DRL/explo_med_dist.wav
diff --git a/7DRL/explo_near_dist.wav b/7DRL/explo_near_dist.wav
diff --git a/7DRL/four_way.wav b/7DRL/four_way.wav
diff --git a/7DRL/grenade.wav b/7DRL/grenade.wav
diff --git a/7DRL/grenade_land.wav b/7DRL/grenade_land.wav
diff --git a/7DRL/gunshot.wav b/7DRL/gunshot.wav
diff --git a/7DRL/hurt.wav b/7DRL/hurt.wav
diff --git a/7DRL/hurt_alien.wav b/7DRL/hurt_alien.wav
diff --git a/7DRL/hurt_metal.wav b/7DRL/hurt_metal.wav
diff --git a/7DRL/libtcod.dll b/7DRL/libtcod.dll
diff --git a/7DRL/man_die.wav b/7DRL/man_die.wav
diff --git a/7DRL/metal_die.wav b/7DRL/metal_die.wav
diff --git a/7DRL/moving_fast.wav b/7DRL/moving_fast.wav
diff --git a/7DRL/moving_slow.wav b/7DRL/moving_slow.wav
diff --git a/7DRL/ping.wav b/7DRL/ping.wav
diff --git a/7DRL/radio.wav b/7DRL/radio.wav
diff --git a/7DRL/rc11.png b/7DRL/rc11.png
diff --git a/7DRL/shock.wav b/7DRL/shock.wav
diff --git a/7DRL/terminal.png b/7DRL/terminal.png
diff --git a/7DRL/torpedo_out.wav b/7DRL/torpedo_out.wav
diff --git a/7DRL/underwater.wav b/7DRL/underwater.wav
diff --git a/7DRL/waterflow.wav b/7DRL/waterflow.wav
diff --git a/7DRL/worm/attack.wav b/7DRL/worm/attack.wav
diff --git a/7DRL/worm/dive.wav b/7DRL/worm/dive.wav
diff --git a/src/Drawing.h b/src/Drawing.h
@@ -153,15 +153,26 @@ class Drawing
 	}
 
 	// Single letter hold button
-	static bool draw_button(TCODConsole* target, int x0, int y0, int rx, int ry, int ch)
+	static bool draw_button(TCODConsole* target, int x0, int y0, int rx, int ry, int ch, bool one_click = false)
 	{
 		TCOD_mouse_t pos = TCODMouse::getStatus();
 
 		int w = 2;
 		int h = 2;
 
+
 		bool clicked = false;
-		if (pos.cx - rx >= x0 && pos.cx - rx <= x0 + w && pos.cy - ry >= y0 && pos.cy - ry <= y0 + h && pos.lbutton)
+		bool button = false;
+		if (one_click)
+		{
+			button = pos.lbutton_pressed;
+		}
+		else
+		{
+			button = pos.lbutton;
+		}
+
+		if (pos.cx - rx >= x0 && pos.cx - rx <= x0 + w && pos.cy - ry >= y0 && pos.cy - ry <= y0 + h && button)
 		{
 			clicked = true;
 		}

diff --git a/src/disembark/EmbarkScene.cpp b/src/disembark/EmbarkScene.cpp
@@ -392,6 +392,10 @@ void EmbarkScene::update_crew(float dt, EmbarkCrew* crew)
 			}
 		}
 	}
+	else
+	{
+		crew->fired_timer = 0.0f;
+	}
 }
 
 void EmbarkScene::update(float dt)

diff --git a/src/flight/FlightScene.cpp b/src/flight/FlightScene.cpp
@@ -146,13 +146,17 @@ We are now going to send the location of all our outposts.\n";
 
 	for (FlightEntity* ent : map.entities)
 	{
+		possible_embark = nullptr;
+
 		if (ent->get_type() == E_NEST || ent->get_type() == E_STATION)
 		{
 			float dx = vehicle.x - ent->get_x();
 			float dy = vehicle.y - ent->get_y();
 			float dist = sqrt(dx * dx + dy * dy);
 
-			if (dist < 0.2f && !((Building*)ent)->is_explored())
+			bool is_explored = ((Building*)ent)->is_explored();
+
+			if (dist < 0.2f && !is_explored)
 			{
 				possible_embark = ent;
 				break;

diff --git a/src/flight/Gamemaster.cpp b/src/flight/Gamemaster.cpp
@@ -24,7 +24,9 @@ void Gamemaster::update(float dt)
 
 		if (embark_scene->finished)
 		{
-			if (g_master->clear_nest_count == 2 && g_master->clear_station_count == 0)
+			flight_scene->embark_target = nullptr;
+
+			if (g_master->clear_nest_count == 2)
 			{
 				std::string coords = "";
 				for (FlightEntity* ent : g_master->flight_scene->map.entities)
@@ -248,6 +250,19 @@ void Gamemaster::init()
 	{
 		crew.push_back(flight_scene->vehicle.crew[i].gc);
 	}
+
+	std::string coords = "";
+	for (FlightEntity* ent : g_master->flight_scene->map.entities)
+	{
+		if (ent->get_type() == E_STATION && !((Building*)ent)->is_explored())
+		{
+			coords += std::to_string((int)floor(ent->get_x()));
+			coords += ", ";
+			coords += std::to_string((int)floor(ent->get_x()));
+			break;
+		}
+	}
+
 }
 
 Gamemaster::Gamemaster()

diff --git a/src/vehicle/workbench/Radio.cpp b/src/vehicle/workbench/Radio.cpp
@@ -26,12 +26,12 @@ void Radio::draw(int rx, int ry)
 		}
 	}
 
-	if (Drawing::draw_button(&console, 1, console.getHeight() - 5, rx, ry, 174))
+	if (Drawing::draw_button(&console, 1, console.getHeight() - 5, rx, ry, 174, true))
 	{
 		msg = 0;
 	}
 
-	if (Drawing::draw_button(&console, 4, console.getHeight() - 5, rx, ry, '<'))
+	if (Drawing::draw_button(&console, 4, console.getHeight() - 5, rx, ry, '<', true))
 	{
 		msg--;
 		if (msg < 0)
@@ -40,7 +40,7 @@ void Radio::draw(int rx, int ry)
 		}
 	}
 
-	if (Drawing::draw_button(&console, console.getWidth() - 9, console.getHeight() - 5, rx, ry, '>'))
+	if (Drawing::draw_button(&console, console.getWidth() - 9, console.getHeight() - 5, rx, ry, '>', true))
 	{
 		msg++;
 		if (msg > messages.size() - 1)
@@ -49,7 +49,7 @@ void Radio::draw(int rx, int ry)
 		}
 	}
 
-	if (Drawing::draw_button(&console, console.getWidth() - 6, console.getHeight() - 5, rx, ry, 175))
+	if (Drawing::draw_button(&console, console.getWidth() - 6, console.getHeight() - 5, rx, ry, 175, true))
 	{
 		msg = messages.size() - 1;
 		if (msg < 0)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Some samples were taken from the ARMA 3 mod JSRS (Explosion sounds) and
		mixed with other effects.
-Original file line number
+Diff line change
@@ Expand Up / @@ -392,6 +392,10 @@ void EmbarkScene::update_crew(float dt, EmbarkCrew* crew) @@
     			}
     		}
     	}
+    	else
+    	{
+    		crew->fired_timer = 0.0f;
+    	}
     }
     void EmbarkScene::update(float dt)
@@ Expand Down @@