Linux build workse

tatjam · Mar 21, 2020 · 980efda · 980efda
1 parent 7fc6ea7
commit 980efda
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 14 deletions.
diff --git a/7DRL b/7DRL
diff --git a/CMakeFiles/7DRL.dir/CXX.includecache b/CMakeFiles/7DRL.dir/CXX.includecache
@@ -46,6 +46,12 @@ libtcod.h
 Status.h
 /home/tatjam/code/u101/src/Status.h
 
+/home/tatjam/code/u101/src/disembark/BuildingMap.h
+libtcod.hpp
+-
+../defines.h
+/home/tatjam/code/u101/src/defines.h
+
 /home/tatjam/code/u101/src/flight/FlightMap.h
 vector
 -
@@ -54,6 +60,12 @@ libtcod.h
 entity/FlightEntity.h
 /home/tatjam/code/u101/src/flight/entity/FlightEntity.h
 
+/home/tatjam/code/u101/src/flight/FlightScene.cpp
+FlightScene.h
+/home/tatjam/code/u101/src/flight/FlightScene.h
+entity/Buildings.h
+/home/tatjam/code/u101/src/flight/entity/Buildings.h
+
 /home/tatjam/code/u101/src/flight/FlightScene.h
 libtcod.h
 -
@@ -74,9 +86,11 @@ soloud_wav.h
 ../vehicle/Vehicle.h
 /home/tatjam/code/u101/src/vehicle/Vehicle.h
 
-/home/tatjam/code/u101/src/flight/entity/EntityTorpedo.h
+/home/tatjam/code/u101/src/flight/entity/Buildings.h
 FlightEntity.h
 /home/tatjam/code/u101/src/flight/entity/FlightEntity.h
+../../disembark/BuildingMap.h
+/home/tatjam/code/u101/src/disembark/BuildingMap.h
 
 /home/tatjam/code/u101/src/flight/entity/FlightEntity.h
 ../../defines.h
@@ -214,16 +228,6 @@ soloud_wav.h
 Workbench.h
 /home/tatjam/code/u101/src/vehicle/workbench/Workbench.h
 
-/home/tatjam/code/u101/src/vehicle/workbench/Targeting.cpp
-Targeting.h
-/home/tatjam/code/u101/src/vehicle/workbench/Targeting.h
-../../flight/entity/EntityTorpedo.h
-/home/tatjam/code/u101/src/flight/entity/EntityTorpedo.h
-../Vehicle.h
-/home/tatjam/code/u101/src/vehicle/Vehicle.h
-../../flight/FlightScene.h
-/home/tatjam/code/u101/src/flight/FlightScene.h
-
 /home/tatjam/code/u101/src/vehicle/workbench/Targeting.h
 string
 -
@@ -252,6 +256,10 @@ libtcod/src/libtcod.h
 libtcod/libtcod.h
 libtcod/src/libtcod/libtcod.h
 
+libtcod/src/libtcod.hpp
+libtcod.h
+libtcod/src/libtcod.h
+
 libtcod/src/libtcod/bresenham.h
 portability.h
 libtcod/src/libtcod/portability.h

diff --git a/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o b/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o
diff --git a/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o b/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o
diff --git a/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o
diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o
diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o
diff --git a/libtcod.so b/libtcod.so
diff --git a/src/disembark/EmbarkScene.cpp b/src/disembark/EmbarkScene.cpp
@@ -39,6 +39,7 @@ void EmbarkScene::update_entity(float dt, EmbarkMonster* monster)
 			{
 				if (is_free_crew(nx, ny))
 				{
+
 					monster->x = nx;
 					monster->y = ny;
 				}
@@ -826,6 +827,8 @@ bool EmbarkScene::is_free_crew(int x, int y)
 			return false;
 		}
 	}
+
+	return true;
 }
 
 void EmbarkScene::restart()
@@ -870,6 +873,8 @@ EmbarkMonster::EmbarkMonster(MonsterType type, TCODMap* map)
 {
 	path = new TCODPath(map, 0.0f);
 
+	x = 0;
+	y = 0;
 	this->seen = false;
 	this->type = type;
 	this->walkt = 0.0f;

diff --git a/src/flight/FlightScene.cpp b/src/flight/FlightScene.cpp
@@ -163,8 +163,9 @@ We are now going to send the location of all our outposts.\n";
 			}
 		}
 		/*if (ent->get_type() == E_NEST && !((Building*)ent)->is_explored())
-		{
+		{		
 			possible_embark = ent;
+			break;
 		}*/
 	}
 

diff --git a/src/vehicle/Vehicle.cpp b/src/vehicle/Vehicle.cpp
@@ -578,6 +578,11 @@ void Vehicle::update(float dt)
 		}
 	}
 
+	if(workbench_open != nullptr && g_key.vk == TCODK_ESCAPE)
+	{
+		workbench_open = nullptr;
+	}
+
 	auto old = get_tile();
 	bool was_breathing = breathing;
 
@@ -852,7 +857,7 @@ void Vehicle::draw(TCODConsole* target, int ox, int oy)
 		selected = nullptr;
 	}
 
-	if (!workbench_open)
+	if (workbench_open == nullptr)
 	{
 		for (int i = 0; i < workbenches.size(); i++)
 		{

diff --git a/src/vehicle/workbench/Battery.cpp b/src/vehicle/workbench/Battery.cpp
@@ -21,7 +21,9 @@ Battery::Battery() : console(50, 50)
 	bb_to_aux = false;
 	ba_to_eng = false;
 	bb_to_eng = false;
-
+	aux_to_a = false;
+	aux_to_b = false;
+	aux_to_eng = false;	
 }
 
 

diff --git a/src/vehicle/workbench/Sonar.cpp b/src/vehicle/workbench/Sonar.cpp
@@ -349,6 +349,7 @@ Sonar::Sonar(SoLoud::Soloud * soloud) : console(49, 56)
 	ping.load("ping.wav");
 	blink = true;
 	blinkt = 0.5f;
+	sonar_active = false;
 }
 
 Sonar::~Sonar()
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     		/*if (ent->get_type() == E_NEST && !((Building*)ent)->is_explored())
-    		{
+    		{
     			possible_embark = ent;
+    			break;
     		}*/
     	}
@@ Expand Down @@