Added Attack Type argument for HOOK_COMBATDAMAGE (from Crafty) #100

artifacts/scripting/hookscripts.txt

@@ -169,6 +169,7 @@ int     arg8  - The bodypart that was struck
 int     arg9  - Roll result of the attack (check with is_success, etc functions; basically: 0-crit. fail, 1-fail, 2-success, 3-crit. success)
 int     arg10 - Number of bullets actually hit the target (1 for melee attacks)
 int     arg11 - The amount of knockback to the target
+int     arg12 - Attack Type (see ATKTYPE_* constants)
 
 int     ret1 - The damage to the target
 int     ret2 - The damage to the attacker

sfall/HookScripts.cpp

@@ -321,7 +321,7 @@ static void __declspec(naked) CombatDamageHook() {
 		jz hookscript;
 		inc dword ptr ds:[edx+0x2c];
 hookscript:
-		hookbegin(11);
+		hookbegin(12);
 		mov ebx, [edx+0x20];
 		mov args[0x00], ebx;
 		mov ebx, [edx+0x00];
@@ -344,6 +344,8 @@ hookscript:
 		mov args[0x24], ebx;
 		mov ebx, [edx+0x34]; // knockback value
 		mov args[0x28], ebx;
+		mov ebx, [edx+0x04]; // attack type
+		mov args[0x2c], ebx;
 
 		pushad;
 		push HOOK_COMBATDAMAGE;