|
 |
e1d5b2e |
--- vegastrike-source-0.5.0/src/cmd/ai/aggressive.cpp 2008-04-26 12:00:20.000000000 +0200
|
|
|
e1d5b2e |
+++ vegastrike-source-0.5.0.new/src/cmd/ai/aggressive.cpp 2011-02-10 16:08:34.094259977 +0100
|
|
|
e1d5b2e |
@@ -25,6 +25,9 @@
|
|
|
e1d5b2e |
#include "cmd/unit_find.h"
|
|
|
e1d5b2e |
#include "faction_generic.h"
|
|
|
e1d5b2e |
#include "docking.h"
|
|
|
e1d5b2e |
+
|
|
|
e1d5b2e |
+extern double aggfire;
|
|
|
e1d5b2e |
+
|
|
|
e1d5b2e |
using namespace Orders;
|
|
|
e1d5b2e |
using stdext::hash_map;
|
|
|
e1d5b2e |
const EnumMap::Pair element_names[] = {
|
|
|
e1d5b2e |
@@ -1565,7 +1568,6 @@
|
|
|
e1d5b2e |
printf ("kewl");
|
|
|
e1d5b2e |
}
|
|
|
e1d5b2e |
|
|
|
e1d5b2e |
- extern double aggfire;
|
|
|
e1d5b2e |
jump_time_check++;//just so we get a nicely often wrapping var;
|
|
|
e1d5b2e |
jump_time_check%=5;
|
|
|
e1d5b2e |
Flightgroup * fg=parent->getFlightgroup();
|
|
|
e1d5b2e |
--- vegastrike-source-0.5.0/src/cmd/ai/fire.cpp 2008-04-26 12:00:20.000000000 +0200
|
|
|
e1d5b2e |
+++ vegastrike-source-0.5.0.new/src/cmd/ai/fire.cpp 2011-02-10 16:10:06.123260024 +0100
|
|
|
e1d5b2e |
@@ -14,6 +14,10 @@
|
|
|
e1d5b2e |
#include "vs_random.h"
|
|
|
e1d5b2e |
#include "lin_time.h" //DEBUG ONLY
|
|
|
e1d5b2e |
#include "cmd/pilot.h"
|
|
|
e1d5b2e |
+
|
|
|
e1d5b2e |
+extern int numprocessed;
|
|
|
e1d5b2e |
+extern double targetpick;
|
|
|
e1d5b2e |
+
|
|
|
e1d5b2e |
static bool NoDockWithClear() {
|
|
|
e1d5b2e |
static bool nodockwithclear = XMLSupport::parse_bool (vs_config->getVariable ("physics","dock_with_clear_planets","true"));
|
|
|
e1d5b2e |
return nodockwithclear;
|
|
|
e1d5b2e |
@@ -385,8 +389,6 @@
|
|
|
e1d5b2e |
void FireAt::ChooseTargets (int numtargs, bool force) {
|
|
|
e1d5b2e |
float gunspeed,gunrange,missilerange;
|
|
|
e1d5b2e |
parent->getAverageGunSpeed(gunspeed,gunrange,missilerange);
|
|
|
e1d5b2e |
- extern int numprocessed;
|
|
|
e1d5b2e |
- extern double targetpick;
|
|
|
e1d5b2e |
static float targettimer =UniverseUtil::GetGameTime(); // timer used to determine passage of physics frames
|
|
|
e1d5b2e |
static float mintimetoswitch = XMLSupport::parse_float(vs_config->getVariable ("AI","Targetting","MinTimeToSwitchTargets","3"));
|
|
|
e1d5b2e |
static float minnulltimetoswitch = XMLSupport::parse_float(vs_config->getVariable ("AI","Targetting","MinNullTimeToSwitchTargets","5"));
|
|
|
e1d5b2e |
--- vegastrike-source-0.5.0/src/cmd/collide_map.cpp 2008-04-26 12:00:24.000000000 +0200
|
|
|
e1d5b2e |
+++ vegastrike-source-0.5.0.new/src/cmd/collide_map.cpp 2011-02-10 13:22:53.765260020 +0100
|
|
|
e1d5b2e |
@@ -1,5 +1,6 @@
|
|
|
e1d5b2e |
#include <algorithm>
|
|
|
e1d5b2e |
#include <assert.h>
|
|
|
e1d5b2e |
+#include <cstddef>
|
|
|
e1d5b2e |
#include "collide_map.h"
|
|
|
e1d5b2e |
#include "unit_generic.h"
|
|
|
e1d5b2e |
#include "bolt.h"
|
|
|
e1d5b2e |
--- vegastrike-source-0.5.0/src/gfxlib.h 2008-04-26 12:00:34.000000000 +0200
|
|
|
e1d5b2e |
+++ vegastrike-source-0.5.0.new/src/gfxlib.h 2011-02-10 14:57:53.296260099 +0100
|
|
|
e1d5b2e |
@@ -38,6 +38,7 @@
|
|
|
e1d5b2e |
#endif
|
|
|
e1d5b2e |
#endif*/
|
|
|
e1d5b2e |
#include <vector>
|
|
|
e1d5b2e |
+#include <cstddef>
|
|
|
e1d5b2e |
class Matrix;
|
|
|
e1d5b2e |
|
|
|
e1d5b2e |
using std::vector;
|