Merge branch 'Anticlockwise'

Philbywhizz · Mar 18, 2012 · 2676aa0 · 2676aa0
2 parents 7e0c9c1 + 69a1d1b
commit 2676aa0
Show file tree

Hide file tree

Showing 7 changed files with 595 additions and 592 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -11,6 +11,7 @@ Alpha 21
    * Fixes
      * Don't take timesteps for dead ships. Stops the player firing during the
        death screen (#1056)
+     * Move all the custom stars into the right places (#1080, #1081)
 
    * Script changes
      * New custom system option :explored to explicitly set a system's

diff --git a/data/systems/01_epsilon_eridani.lua b/data/systems/01_epsilon_eridani.lua
@@ -141,4 +141,4 @@ local hercules = CustomSBody:new('Hercules', 'PLANET_GAS_GIANT')
 		hale,
 	})
 
-s:add_to_sector(1,0,-1,v(0.037,0.775,0.784))
+s:add_to_sector(1,-1,-1,v(0.037,0.325,0.784))
diff --git a/data/systems/02_local_stars.lua b/data/systems/02_local_stars.lua
diff --git a/data/systems/03_bright_stars.lua b/data/systems/03_bright_stars.lua
diff --git a/data/systems/custom/00_barnard_s_star.lua b/data/systems/custom/00_barnard_s_star.lua
@@ -22,4 +22,4 @@ local barnard_starports = {
         :rotation_period(f(1,24*60*4)),
 }
 s:bodies(barnard, barnard_starports)
-s:add_to_sector(-1,-1,0,v(0.260,0.993,0.060))
+s:add_to_sector(-1,0,0,v(0.260,0.007,0.060))
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -18,7 +18,7 @@
 #include "ObjectViewerView.h"
 #include "graphics/Renderer.h"
 
-static const int  s_saveVersion   = 46;
+static const int  s_saveVersion   = 47;
 static const char s_saveStart[]   = "PIONEER";
 static const char s_saveEnd[]     = "END";
 

diff --git a/src/Pi.cpp b/src/Pi.cpp
@@ -1041,7 +1041,7 @@ void Pi::HandleMenuKey(int n)
 
 		case 1: // Epsilon Eridani start point
 		{
-			game = new Game(SystemPath(1,0,-1,0,4));  // New Hope, New Hope
+			game = new Game(SystemPath(1,-1,-1,0,4));  // New Hope, New Hope
 			break;
 		}