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

Fix weapon projectile origin height when standing in water

Browse source
This commit is contained in:
Simon 2020-05-30 10:45:28 +01:00
parent a2dae210ca
commit f47f9593f8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.questzdoom" package="com.drbeef.questzdoom"
android:versionCode="18" android:versionCode="19"
android:versionName="1.1.0" android:installLocation="auto" > android:versionName="1.1.1" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/> <uses-feature android:glEsVersion="0x00030001" android:required="true"/>

4
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp
View file

@ -480,8 +480,8 @@ namespace s3d
player->mo->AttackPos.X = player->mo->X() - (weaponoffset[0] * vr_vunits_per_meter); player->mo->AttackPos.X = player->mo->X() - (weaponoffset[0] * vr_vunits_per_meter);
player->mo->AttackPos.Y = player->mo->Y() - (weaponoffset[2] * vr_vunits_per_meter); player->mo->AttackPos.Y = player->mo->Y() - (weaponoffset[2] * vr_vunits_per_meter);
player->mo->AttackPos.Z = player->mo->Z() + (((hmdPosition[1] + weaponoffset[1] + vr_height_adjust) * vr_vunits_per_meter) / pixelstretch) + (player->viewheight - player->mo->AttackPos.Z = r_viewpoint.CenterEyePos.Z + (((hmdPosition[1] + weaponoffset[1] + vr_height_adjust) * vr_vunits_per_meter) / pixelstretch) -
getDoomPlayerHeightWithoutCrouch(player)); getDoomPlayerHeightWithoutCrouch(player); // Fixes wrong shot height when in water
player->mo->AttackDir = MapAttackDir; player->mo->AttackDir = MapAttackDir;
} }

2
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h
View file

@ -41,7 +41,7 @@ const char *GetVersionString();
/** Lots of different version numbers **/ /** Lots of different version numbers **/
#define VERSIONSTR "DrBeef's QuestZDoom-1.1.0 (LZDoom 3.85)" #define VERSIONSTR "DrBeef's QuestZDoom-1.1.1 (LZDoom 3.85)"
// The version as seen in the Windows resource // The version as seen in the Windows resource
#define RC_FILEVERSION 3,85,0 #define RC_FILEVERSION 3,85,0