Merge branch 'master' into martin-t/mg-solidpen

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / common.qh

diff --git a/qcsrc/server/weapons/common.qh b/qcsrc/server/weapons/common.qh
index 6618367ed2369acef19e40131b0c065ae4b57ef6..1b4b179d2485d32f22fb06665f280f2014b3f22c 100644 (file)
--- a/qcsrc/server/weapons/common.qh
+++ b/qcsrc/server/weapons/common.qh
@@ -1,10 +1,9 @@
-#ifndef WEAPONS_COMMON_H
-#define WEAPONS_COMMON_H
+#pragma once
 
+bool W_DualWielding(entity player);
 void W_GiveWeapon (entity e, float wep);
 .float prevstrengthsound;
 .float prevstrengthsoundattempt;
 void W_PlayStrengthSound(entity player);
-float W_CheckProjectileDamage(entity inflictor, entity projowner, float deathtype, float exception);
-void W_PrepareExplosionByDamage(entity attacker, void() explode);
-#endif
\ No newline at end of file
+float W_CheckProjectileDamage(entity inflictor, entity projowner, int deathtype, float exception);
+void W_PrepareExplosionByDamage(entity this, entity attacker, void(entity this) explode);