teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2025-04-24 10:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved haptics support for certain mods

Browse source
This commit is contained in:
Simon 2021-07-27 20:59:02 +01:00
parent 329dee523c
commit 925e85ca5f
2 changed files with 57 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_interaction.cpp
View file

@ -1357,19 +1357,64 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
QzDoom_Vibrate(200, 0, level); // left
QzDoom_Vibrate(200, 1, level); // right
DAngle attackAngle = (source != NULL) ? (target->AngleTo(source) - player->mo->Angles.Yaw) : angle;
if (mod == NAME_None ||
mod == NAME_Hitscan)
if (source == NULL)
{
if (damage >= 15) {
QzDoom_HapticEvent("shotgun", 0, 100 * C_GetExternalHapticLevelValue("damage_projectile"), attackAngle.Normalized360().Degrees, 0);
}
else {
QzDoom_HapticEvent("bullet", 0, 100 * C_GetExternalHapticLevelValue("damage_projectile"), attackAngle.Normalized360().Degrees, 0);
}
} else {
QzDoom_HapticEvent(mod, 0, 100 * C_GetExternalHapticLevelValue("damage_projectile"), attackAngle.Normalized360().Degrees, 0);
if (strcasestr(mod.GetChars(), "slime"))
{
QzDoom_HapticEvent("slime", 0,
100 * C_GetExternalHapticLevelValue("poison"),
0, 0);
}
else if (strcasestr(mod.GetChars(), "fire"))
{
QzDoom_HapticEvent("fire", 0,
100 * C_GetExternalHapticLevelValue("poison"),
0, 0);
}
else {
//No source - just use poison
QzDoom_HapticEvent("poison", 0,
100 * C_GetExternalHapticLevelValue("poison"),
0, 0);
}
}
else {
DAngle attackAngle = (target->AngleTo(source) - player->mo->Angles.Yaw);
if (strcasestr(mod.GetChars(), "melee") ||
strcasestr(mod.GetChars(), "strike") ||
strcasestr(mod.GetChars(), "rip") ||
strcasestr(mod.GetChars(), "tear") ||
strcasestr(mod.GetChars(), "slice") ||
strcasestr(mod.GetChars(), "claw"))
{
QzDoom_HapticEvent("melee", 0,
100 * C_GetExternalHapticLevelValue("damage_projectile"),
attackAngle.Normalized360().Degrees, 0);
}
else if (strcasestr(mod.GetChars(), "burn") ||
strcasestr(mod.GetChars(), "flame"))
{
QzDoom_HapticEvent("fireball", 0,
100 * C_GetExternalHapticLevelValue("damage_projectile"),
attackAngle.Normalized360().Degrees, 0);
}
else // Just pick on based on damage intensity
{
if (damage >= 20) {
QzDoom_HapticEvent("fireball", 0,
100 * C_GetExternalHapticLevelValue("damage_projectile"),
attackAngle.Normalized360().Degrees, 0);
} else if (damage >= 10) {
QzDoom_HapticEvent("shotgun", 0,
100 * C_GetExternalHapticLevelValue("damage_projectile"),
attackAngle.Normalized360().Degrees, 0);
} else {
QzDoom_HapticEvent("bullet", 0,
100 * C_GetExternalHapticLevelValue("damage_projectile"),
attackAngle.Normalized360().Degrees, 0);
}
}
}
}
}

BIN
Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/static.7z
View file

Binary file not shown.