From d7d33e8097ccffb37ef1f682c76c1e41e71351ea Mon Sep 17 00:00:00 2001
From: Allanis <allanis.saracraft.studios@gmail.com>
Date: Thu, 8 Feb 2018 21:21:18 +0000
Subject: [PATCH] [Fix] Just a few small fixes.
---
src/serializer.h | 1 -
src/space.cpp | 3 +--
src/star_system.cpp | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/serializer.h b/src/serializer.h
index 4353355..0caec26 100644
--- a/src/serializer.h
+++ b/src/serializer.h
@@ -7,7 +7,6 @@
class Frame;
class Body;
class StarSystem;
-class StarSystem::SBody;
namespace Serializer {
void IndexFrames(void);
diff --git a/src/space.cpp b/src/space.cpp
index b05c759..6cf14b2 100644
--- a/src/space.cpp
+++ b/src/space.cpp
@@ -71,11 +71,10 @@ void Space::Clear(void) {
}
PruneCorpses();
+ L3D::player->SetFrame(rootFrame);
for(std::list<Frame*>::iterator i = rootFrame->m_children.begin();
i != rootFrame->m_children.end(); ++i) delete *i;
rootFrame->m_children.clear();
-
- L3D::player->SetFrame(rootFrame);
}
void Space::MoveOrbitingObjectFrames(Frame* f) {
diff --git a/src/star_system.cpp b/src/star_system.cpp
index 7be2c40..e6eeb86 100644
--- a/src/star_system.cpp
+++ b/src/star_system.cpp
@@ -837,12 +837,12 @@ void StarSystem::SBody::PickPlanetType(StarSystem* system, SBody* star, const fi
}
/* Starports - surface. */
if((averageTemp < CELSIUS+80) && (averageTemp > 100) &&
- (type == TYPE_PLANET_DWARF) ||
+ ((type == TYPE_PLANET_DWARF) ||
(type == TYPE_PLANET_SMALL) ||
(type == TYPE_PLANET_WATER) ||
(type == TYPE_PLANET_CO2) ||
(type == TYPE_PLANET_METHANE) ||
- (type == TYPE_PLANET_INDIGENOUS_LIFE)) {
+ (type == TYPE_PLANET_INDIGENOUS_LIFE))) {
fixed activ = humanActivity;
if(type == TYPE_PLANET_INDIGENOUS_LIFE) humanActivity *= 2;