diff options
Diffstat (limited to 'src/object/auto')
26 files changed, 49 insertions, 64 deletions
diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 509904c..711497d 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -15,8 +15,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/auto.h" @@ -26,7 +24,8 @@ #include "ui/gauge.h" #include "ui/window.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index dd55904..2194924 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -19,7 +19,7 @@ #pragma once -#include "common/misc.h" +#include "common/global.h" #include "object/object.h" diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index 14fa4cf..ec4392b 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoconvert.h" #include "common/iman.h" @@ -27,7 +25,8 @@ #include "ui/window.h" #include "ui/displaytext.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index 432c5ea..3578c0d 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoderrick.h" #include "common/iman.h" @@ -28,7 +26,8 @@ #include "ui/window.h" #include "ui/displaytext.h" - +#include <stdio.h> +#include <string.h> const float DERRICK_DELAY = 10.0f; // duration of the extraction diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index d91af29..740f600 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autodestroyer.h" #include "common/iman.h" @@ -25,7 +23,8 @@ #include "ui/interface.h" #include "ui/window.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 04d03f9..35a6add 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -16,15 +16,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoegg.h" #include "math/geometry.h" #include "common/iman.h" #include "script/cmdtoken.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index d0117ab..18a21ab 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoenergy.h" #include "common/iman.h" @@ -29,6 +27,8 @@ #include "ui/window.h" #include "ui/displaytext.h" +#include <stdio.h> +#include <string.h> const float ENERGY_POWER = 0.4f; // Necessary energy for a battery diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 8e7d480..0789443 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autofactory.h" #include "common/global.h" @@ -30,7 +28,8 @@ #include "ui/window.h" #include "ui/displaytext.h" - +#include <stdio.h> +#include <string.h> diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index acab2d0..e88ee3a 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -16,13 +16,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoflag.h" #include "math/geometry.h" #include "graphics/engine/terrain.h" +#include <stdio.h> + #define ADJUST_ANGLE false // true -> adjusts the angles of the members diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index 1dd92f0..1e81a65 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -16,14 +16,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autohuston.h" #include "ui/interface.h" #include "ui/window.h" - +#include <stdio.h> // Object's constructor. diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp index 1edd5e0..78cc249 100644 --- a/src/object/auto/autoinfo.cpp +++ b/src/object/auto/autoinfo.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoinfo.h" #include "script/cmdtoken.h" @@ -25,7 +23,8 @@ #include "ui/list.h" #include "ui/window.h" - +#include <stdio.h> +#include <string.h> diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index 68fe6d1..788b562 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -16,11 +16,9 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autojostle.h" - +#include <stdio.h> // Object's constructor. diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index 0ffbd7f..7004e6b 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -16,13 +16,12 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autokid.h" #include "graphics/engine/particle.h" #include "graphics/engine/water.h" +#include <stdio.h> // Object's constructor. diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index c5e4c82..af780e0 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autolabo.h" #include "common/global.h" @@ -29,6 +27,8 @@ #include "ui/window.h" #include "ui/displaytext.h" +#include <stdio.h> +#include <string.h> const float LABO_DELAY = 20.0f; // duration of the analysis diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index 0b1608b..d7aa98e 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -16,14 +16,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/automush.h" #include "common/iman.h" #include "script/cmdtoken.h" +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index d7f94e1..4a8132a 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -16,15 +16,14 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autonest.h" #include "common/iman.h" #include "graphics/engine/terrain.h" #include "script/cmdtoken.h" - +#include <stdio.h> +#include <string.h> // Object's constructor. diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index d8a3bdf..bb20dde 100644 --- a/src/object/auto/autonuclear.cpp +++ b/src/object/auto/autonuclear.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autonuclear.h" #include "common/iman.h" @@ -27,6 +25,8 @@ #include "ui/window.h" #include "ui/displaytext.h" +#include <stdio.h> +#include <string.h> const float NUCLEAR_DELAY = 30.0f; // duration of the generation diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 973a847..b52344f 100644 --- a/src/object/auto/autopara.cpp +++ b/src/object/auto/autopara.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autopara.h" @@ -27,6 +25,8 @@ #include "ui/interface.h" #include "ui/window.h" +#include <stdio.h> +#include <string.h> diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 3d93411..01c981d 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -16,14 +16,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoportico.h" #include "object/robotmain.h" - +#include <stdio.h> +#include <string.h> const int PARAM_DEPOSE = 2; // run=2 -> deposits the spaceship diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 224246c..b586521 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoradar.h" #include "common/iman.h" @@ -26,6 +24,8 @@ #include "ui/window.h" #include "ui/gauge.h" +#include <stdio.h> + // Object's constructor. diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index 2f679fa..4662699 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autorepair.h" #include "common/iman.h" @@ -26,6 +24,9 @@ #include "ui/interface.h" #include "ui/window.h" +#include <stdio.h> +#include <string.h> + // Object's constructor. diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index c2395e8..a3ce464 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoresearch.h" #include "common/global.h" @@ -29,6 +27,8 @@ #include "ui/window.h" #include "ui/displaytext.h" +#include <stdio.h> +#include <string.h> const float SEARCH_TIME = 30.0f; // duration of a research diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index b43f40b..4413d56 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -15,15 +15,13 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autoroot.h" #include "graphics/engine/particle.h" #include "graphics/engine/terrain.h" #include "math/geometry.h" - +#include <stdio.h> // Object's constructor. diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index 144f36e..82b1c12 100644 --- a/src/object/auto/autosafe.cpp +++ b/src/object/auto/autosafe.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autosafe.h" #include "common/iman.h" @@ -27,6 +25,9 @@ #include "ui/interface.h" #include "ui/window.h" +#include <stdio.h> +#include <string.h> + const float OPEN_DELAY = 8.0f; // duration of opening diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 3771c0f..1dbcf26 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autostation.h" #include "common/iman.h" @@ -28,7 +26,7 @@ #include "ui/gauge.h" #include "ui/window.h" - +#include <stdio.h> // Object's constructor. diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 8410086..7674794 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -16,8 +16,6 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autotower.h" #include "common/iman.h" @@ -29,6 +27,9 @@ #include "ui/window.h" #include "ui/gauge.h" +#include <stdio.h> +#include <string.h> + const float TOWER_SCOPE = 200.0f; // range of beam const float ENERGY_FIRE = 0.125f; // energy consumed by fire |