Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Just a few small fixes.

Browse Source
This commit is contained in:
Rtch90 2018-02-08 21:21:18 +00:00
parent 4f992dd0ce
commit 7a48e570dd
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/serializer.h
View File

@ -7,7 +7,6 @@
class Frame; class Frame;
class Body; class Body;
class StarSystem; class StarSystem;
class StarSystem::SBody;
namespace Serializer { namespace Serializer {
void IndexFrames(void); void IndexFrames(void);

3
src/space.cpp
View File

@ -71,11 +71,10 @@ void Space::Clear(void) {
} }
PruneCorpses(); PruneCorpses();
L3D::player->SetFrame(rootFrame);
for(std::list<Frame*>::iterator i = rootFrame->m_children.begin(); for(std::list<Frame*>::iterator i = rootFrame->m_children.begin();
i != rootFrame->m_children.end(); ++i) delete *i; i != rootFrame->m_children.end(); ++i) delete *i;
rootFrame->m_children.clear(); rootFrame->m_children.clear();
L3D::player->SetFrame(rootFrame);
} }
void Space::MoveOrbitingObjectFrames(Frame* f) { void Space::MoveOrbitingObjectFrames(Frame* f) {

4
src/star_system.cpp
View File

@ -837,12 +837,12 @@ void StarSystem::SBody::PickPlanetType(StarSystem* system, SBody* star, const fi
} }
/* Starports - surface. */ /* Starports - surface. */
if((averageTemp < CELSIUS+80) && (averageTemp > 100) && if((averageTemp < CELSIUS+80) && (averageTemp > 100) &&
(type == TYPE_PLANET_DWARF) || ((type == TYPE_PLANET_DWARF) ||
(type == TYPE_PLANET_SMALL) || (type == TYPE_PLANET_SMALL) ||
(type == TYPE_PLANET_WATER) || (type == TYPE_PLANET_WATER) ||
(type == TYPE_PLANET_CO2) || (type == TYPE_PLANET_CO2) ||
(type == TYPE_PLANET_METHANE) || (type == TYPE_PLANET_METHANE) ||
(type == TYPE_PLANET_INDIGENOUS_LIFE)) { (type == TYPE_PLANET_INDIGENOUS_LIFE))) {
fixed activ = humanActivity; fixed activ = humanActivity;
if(type == TYPE_PLANET_INDIGENOUS_LIFE) humanActivity *= 2; if(type == TYPE_PLANET_INDIGENOUS_LIFE) humanActivity *= 2;