Merge pull request #33390 from duncathan/atmos-defines

cleans up atmos defines
2017-12-09 15:53:34 -06:00
parent edce62494d
commit 7a90baa1f8
3 changed files with 70 additions and 62 deletions
@@ -1,5 +1,3 @@
-#define NO_REACTION	0
-#define REACTING	1
 //Plasma fire properties
 #define OXYGEN_BURN_RATE_BASE				1.4
 #define PLASMA_BURN_RATE_DELTA				9
@@ -359,9 +357,6 @@
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)

-
-#undef REACTING
-#undef NO_REACTION
 #undef OXYGEN_BURN_RATE_BASE
 #undef PLASMA_BURN_RATE_DELTA
 #undef PLASMA_UPPER_TEMPERATURE
@@ -386,4 +381,4 @@
 #undef CATALYST_COEFFICENT
 #undef FUSION_PURITY_THRESHOLD
 #undef FUSION_HEAT_DROPOFF
-#undef NOBLIUM_FORMATION_ENERGY
+#undef NOBLIUM_FORMATION_ENERGY