aboutsummaryrefslogtreecommitdiff
path: root/astro/celestia/files/patch-src::celestia::celestiacore.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'astro/celestia/files/patch-src::celestia::celestiacore.cpp')
-rw-r--r--astro/celestia/files/patch-src::celestia::celestiacore.cpp26
1 files changed, 22 insertions, 4 deletions
diff --git a/astro/celestia/files/patch-src::celestia::celestiacore.cpp b/astro/celestia/files/patch-src::celestia::celestiacore.cpp
index e874e237c589..e001e090a83e 100644
--- a/astro/celestia/files/patch-src::celestia::celestiacore.cpp
+++ b/astro/celestia/files/patch-src::celestia::celestiacore.cpp
@@ -1,5 +1,5 @@
---- src/celestia/celestiacore.cpp.orig Sat Aug 30 20:44:13 2003
-+++ src/celestia/celestiacore.cpp Sat Aug 30 20:48:22 2003
+--- src/celestia/celestiacore.cpp.orig Thu May 2 10:53:49 2002
++++ src/celestia/celestiacore.cpp Sat Aug 30 21:32:21 2003
@@ -38,7 +38,6 @@
#include "celestiacore.h"
#include <celutil/debug.h>
@@ -8,14 +8,32 @@
using namespace std;
static const int DragThreshold = 3;
+@@ -194,7 +193,7 @@
+ sim->setFrame(fav.coordSys, sim->getSelection());
+ }
+
+-void CelestiaCore::addFavorite(string name, string parentFolder, FavoritesList::const_iterator* iter)
++void CelestiaCore::addFavorite(std::string name, std::string parentFolder, FavoritesList::iterator* iter)
+ {
+ FavoritesList::iterator pos;
+ if(!iter)
+@@ -214,7 +213,7 @@
+ favorites->insert(pos, fav);
+ }
+
+-void CelestiaCore::addFavoriteFolder(string name, FavoritesList::const_iterator* iter)
++void CelestiaCore::addFavoriteFolder(std::string name, FavoritesList::iterator* iter)
+ {
+ FavoritesList::iterator pos;
+ if(!iter)
@@ -1138,8 +1137,8 @@
{
double distFromSun = body.getHeliocentricPosition(t).distanceFromOrigin();
float planetTemp = sun->getTemperature() *
- (float) (pow(1 - body.getAlbedo(), 0.25) *
- sqrt(sun->getRadius() / (2 * distFromSun)));
-+ (float) (pow((double)(1 - body.getAlbedo()),(double)( 0.25) *
-+ sqrt(sun->getRadius() / (2 * distFromSun))));
++ (float) (pow((float)(1 - body.getAlbedo()),(float)(( 0.25) *
++ sqrt(sun->getRadius() / (2 * distFromSun)))));
overlay << setprecision(0);
overlay << "Temperature: " << planetTemp << " K\n";
overlay << setprecision(3);