diff options
| author | jacob1 <jfu614@gmail.com> | 2013-07-18 21:57:04 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-07-18 21:57:04 (GMT) |
| commit | 6a4cc7e1f71ae042b58a84f4befa79e42072dd81 (patch) | |
| tree | 70ba5d4b31b878a9c71286f4f29043c05f485668 /src/simulation/elements | |
| parent | aa59c89fa2c401607adc7ac9a016537691602e6d (diff) | |
| download | powder-6a4cc7e1f71ae042b58a84f4befa79e42072dd81.zip powder-6a4cc7e1f71ae042b58a84f4befa79e42072dd81.tar.gz | |
stickmen element defaults to right selected element if possible, or else still DUST
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/SPAWN.cpp | 15 | ||||
| -rw-r--r-- | src/simulation/elements/SPAWN2.cpp | 15 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp index db12b2f..9598b4d 100644 --- a/src/simulation/elements/SPAWN.cpp +++ b/src/simulation/elements/SPAWN.cpp @@ -26,7 +26,7 @@ Element_SPAWN::Element_SPAWN() Weight = 100; - Temperature = R_TEMP+0.0f +273.15f; + Temperature = R_TEMP+273.15f; HeatConduct = 0; Description = "STKM spawn point."; @@ -42,19 +42,8 @@ Element_SPAWN::Element_SPAWN() HighTemperature = ITH; HighTemperatureTransition = NT; - Update = &Element_SPAWN::update; + Update = NULL; } -//#TPT-Directive ElementHeader Element_SPAWN static int update(UPDATE_FUNC_ARGS) -int Element_SPAWN::update(UPDATE_FUNC_ARGS) - { - if (!sim->player.spwn) - sim->create_part(-1, x, y, PT_STKM); - - return 0; -} - - - Element_SPAWN::~Element_SPAWN() {} diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp index 96a50da..eece19f 100644 --- a/src/simulation/elements/SPAWN2.cpp +++ b/src/simulation/elements/SPAWN2.cpp @@ -26,7 +26,7 @@ Element_SPAWN2::Element_SPAWN2() Weight = 100; - Temperature = R_TEMP+0.0f +273.15f; + Temperature = R_TEMP+273.15f; HeatConduct = 0; Description = "STK2 spawn point."; @@ -42,19 +42,8 @@ Element_SPAWN2::Element_SPAWN2() HighTemperature = ITH; HighTemperatureTransition = NT; - Update = &Element_SPAWN2::update; + Update = NULL; } -//#TPT-Directive ElementHeader Element_SPAWN2 static int update(UPDATE_FUNC_ARGS) -int Element_SPAWN2::update(UPDATE_FUNC_ARGS) - { - if (!sim->player2.spwn) - sim->create_part(-1, x, y, PT_STKM2); - - return 0; -} - - - Element_SPAWN2::~Element_SPAWN2() {} |
