Merge pull request #1808 from Citadel-Station-13/upstream-merge-28870

[MIRROR] Fixes emergency shuttle endgame state
2017-06-29 05:58:11 -05:00
parent 988bd998a9 8404651a82
commit 5d220ca7cd
4 changed files with 42 additions and 12 deletions
@@ -27,6 +27,7 @@
 #define UNLAUNCHED 0
 #define ENDGAME_LAUNCHED 1
 #define EARLY_LAUNCHED 2
+#define ENDGAME_TRANSIT 3

 // Ripples, effects that signal a shuttle's arrival
 #define SHUTTLE_RIPPLE_TIME 100
@@ -50,4 +51,4 @@
 //Engine related
 #define ENGINE_COEFF_MIN 0.5
 #define ENGINE_COEFF_MAX 2
-#define ENGINE_DEFAULT_MAXSPEED_ENGINES 5
+#define ENGINE_DEFAULT_MAXSPEED_ENGINES 5