| Attached Files |
-
 fix_targetborder_vertical_behaviour.patch (564 bytes) 2007-07-18 00:31 
Index: rts/Sim/Weapons/Weapon.cpp
===================================================================
--- rts/Sim/Weapons/Weapon.cpp (revision 3995)
+++ rts/Sim/Weapons/Weapon.cpp (working copy)
@@ -567,9 +567,9 @@
float r;
if (!unit || cylinderTargetting < 0.01) {
- r=GetRange2D(owner->pos.y-pos.y);
+ r=GetRange2D(owner->pos.y-(owner->pos+dif).y);
} else {
- if (cylinderTargetting * unit->radius > owner->pos.y-pos.y) {
+ if (cylinderTargetting * unit->radius > owner->pos.y-(owner->pos+dif).y) {
r = GetRange2D(0);
} else {
r = 0;
-
fix_targetborder_vertical_behaviour_v2.patch (872 bytes) 2007-07-18 08:26
Index: rts/Sim/Weapons/Weapon.cpp
===================================================================
--- rts/Sim/Weapons/Weapon.cpp (revision 3995)
+++ rts/Sim/Weapons/Weapon.cpp (working copy)
@@ -550,6 +550,7 @@
return false;
float3 dif=pos-weaponPos;
+ float heightDiff;
if (targetBorder != 0 && unit) {
float3 diff(dif);
@@ -563,13 +564,16 @@
//logOutput << "outside\n";
}
//geometricObjects->AddLine(weaponMuzzlePos, weaponMuzzlePos+dif, 3, 0, 16);
+ heightDiff = pos.y - (weaponPos.y + dif.y);
+ } else {
+ heightDiff = dif.y;
}
float r;
if (!unit || cylinderTargetting < 0.01) {
- r=GetRange2D(owner->pos.y-pos.y);
+ r=GetRange2D(heightDiff);
} else {
- if (cylinderTargetting * unit->radius > owner->pos.y-pos.y) {
+ if (cylinderTargetting * unit->radius > heightDiff) {
r = GetRange2D(0);
} else {
r = 0;
-
fix_targetborder_vertical_behaviour_v3.patch (894 bytes) 2007-07-18 08:32
Index: rts/Sim/Weapons/Weapon.cpp
===================================================================
--- rts/Sim/Weapons/Weapon.cpp (revision 3995)
+++ rts/Sim/Weapons/Weapon.cpp (working copy)
@@ -550,6 +550,7 @@
return false;
float3 dif=pos-weaponPos;
+ float heightDiff;
if (targetBorder != 0 && unit) {
float3 diff(dif);
@@ -563,13 +564,16 @@
//logOutput << "outside\n";
}
//geometricObjects->AddLine(weaponMuzzlePos, weaponMuzzlePos+dif, 3, 0, 16);
+ heightDiff = owner->pos.y - (weaponPos.y + dif.y);
+ } else {
+ heightDiff = owner->pos.y - pos.y;
}
float r;
if (!unit || cylinderTargetting < 0.01) {
- r=GetRange2D(owner->pos.y-pos.y);
+ r=GetRange2D(heightDiff);
} else {
- if (cylinderTargetting * unit->radius > owner->pos.y-pos.y) {
+ if (cylinderTargetting * unit->radius > heightDiff) {
r = GetRange2D(0);
} else {
r = 0;
|
|---|
Relationships