Index: core3/trunk/MMOCoreORB/src/server/zone/objects/creature/VehicleObject.idl =================================================================== diff -u -N -r3325 -r5697 --- core3/trunk/MMOCoreORB/src/server/zone/objects/creature/VehicleObject.idl (.../VehicleObject.idl) (revision 3325) +++ core3/trunk/MMOCoreORB/src/server/zone/objects/creature/VehicleObject.idl (.../VehicleObject.idl) (revision 5697) @@ -54,13 +54,14 @@ import engine.lua.LuaObject; import system.util.Vector; import server.zone.Zone; +include server.zone.objects.scene.SceneObjectType; import server.zone.templates.SharedObjectTemplate; class VehicleObject extends CreatureObject { protected int vehicleType; public VehicleObject() { - vehicleType = SceneObject.HOVERVEHICLE; + vehicleType = SceneObjectType.HOVERVEHICLE; Logger.setLoggingName("VehicleObject"); Logger.setLogging(false); @@ -101,12 +102,22 @@ } /** + * Sends BasePacket msg to the owner of this object, needs to be overriden + * @pre { } + * @post {owner of this object received message, message is deleted } + * @param msg BasePacket to be sent + */ + @dirty + public native void sendMessage(BasePacket msg); + + /** * Inflicts damage into the object * @pre { this object is locked } * @post { this object is locked } * @return unused for now */ - public native int inflictDamage(TangibleObject attacker, int damageType, int damage, boolean destroy, boolean notifyClient = true); + public native int inflictDamage(TangibleObject attacker, int damageType, float damage, boolean destroy, boolean notifyClient = true); + public native int inflictDamage(TangibleObject attacker, int damageType, float damage, boolean destroy, final string xp, boolean notifyClient = true); /** * Heals damage @@ -121,7 +132,7 @@ * @post { this object is locked, defender is in the defender vector } * @param defender SceneObject to add to the defender vector */ - public native void addDefender(SceneObject defender) { + public void addDefender(SceneObject defender) { } @@ -131,7 +142,7 @@ * @post { this object is locked, defender is not in the defender vector } * @param defender SceneObject to remove from the defender vector */ - public native void removeDefender(SceneObject defender) { + public void removeDefender(SceneObject defender) { } @@ -141,7 +152,7 @@ * @post { this object is locked, defender is active } * @param defender SceneObject to set as the active defender */ - public native void setDefender(SceneObject defender) { + public void setDefender(SceneObject defender) { } @@ -152,10 +163,12 @@ * @return returns true if the creature object can attack this */ public boolean isAttackableBy(CreatureObject object) { - if (super.linkedCreature == null) + CreatureObject creature = super.linkedCreature; + + if (creature == null) return false; - return super.linkedCreature.isAttackableBy(object); + return creature.isAttackableBy(object); } /**