Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-03-27 08:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addressed some bugs caught during playtime today

Browse source
This commit is contained in:
Robert Fritzen 2017-07-01 22:46:11 -05:00
parent fa84b01691
commit 04f85e58a6
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/projectiles.cs
View file

@ -17,8 +17,14 @@
//
function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) {
if(isObject(%targetObject)) { // Console spam fix - ToS. z0ddm0d
if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType)) && (%targetObject.getDataBlock().getClassName() $= "PlayerData")) {
%damLoc = firstWord(%targetObject.getDamageLocation(%position));
if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType))
&& (%targetObject.getType() & ($TypeMasks::PlayerObjectType | $TypeMasks::VehicleObjectType))) {
if(%targetObject.getType() & $TypeMasks::PlayerObjectType) {
%damLoc = firstWord(%targetObject.getDamageLocation(%position));
}
else {
%damLoc = "";
}
%test = TWM2Damage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile");
if(%test == 0) {
return;