diff --git a/android/app/src/main/assets/pak66.pk3 b/android/app/src/main/assets/pak66.pk3 deleted file mode 100644 index b2cc694e..00000000 Binary files a/android/app/src/main/assets/pak66.pk3 and /dev/null differ diff --git a/android/app/src/main/cpp/code/cgame/cg_event.c b/android/app/src/main/cpp/code/cgame/cg_event.c index 1bd655d0..adf2ee9c 100644 --- a/android/app/src/main/cpp/code/cgame/cg_event.c +++ b/android/app/src/main/cpp/code/cgame/cg_event.c @@ -1217,6 +1217,10 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) { trap_S_StartSound(NULL, es->number, CHAN_VOICE, CG_CustomSound(es->number, va("*death%i.wav", event - EV_DEATH1 + 1))); } + if(es->clientNum == cg.snap->ps.clientNum) + { + trap_HapticEvent("fireball", 0, 0, 100, 0, 0); + } break; diff --git a/android/app/src/main/cpp/code/cgame/cg_playerstate.c b/android/app/src/main/cpp/code/cgame/cg_playerstate.c index 969261d7..e8e0c2c2 100644 --- a/android/app/src/main/cpp/code/cgame/cg_playerstate.c +++ b/android/app/src/main/cpp/code/cgame/cg_playerstate.c @@ -97,7 +97,7 @@ void CG_DamageFeedback( int yawByte, int pitchByte, int damage ) { vec3_t dir; vec3_t angles; float dist; - float yaw, pitch; + float yaw=0, pitch=0; // show the attacking player's head and name in corner cg.attackerTime = cg.time; diff --git a/android/app/src/main/cpp/code/vr/vr_input.c b/android/app/src/main/cpp/code/vr/vr_input.c index b5b86345..543c2c79 100644 --- a/android/app/src/main/cpp/code/vr/vr_input.c +++ b/android/app/src/main/cpp/code/vr/vr_input.c @@ -425,7 +425,7 @@ void VR_HapticEvent(const char* event, int position, int flags, int intensity, f engine_t* engine = VR_GetEngine(); jstring StringArg1 = (*(engine->java.Env))->NewStringUTF(engine->java.Env, event); - (*(engine->java.Env))->CallVoidMethod(engine->java.Env, engine->java.ActivityObject, android_haptic_event, StringArg1, position, flags, intensity * vr_hapticIntensity->value, angle, yHeight); + (*(engine->java.Env))->CallVoidMethod(engine->java.Env, engine->java.ActivityObject, android_haptic_event, StringArg1, position, flags, (int)(intensity * vr_hapticIntensity->value), angle, yHeight); //Controller Haptic Support int weaponFireChannel = vr.weapon_stabilised ? 3 : (vr_righthanded->integer ? 2 : 1); diff --git a/android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java b/android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java index d891f2dc..3ed36d50 100644 --- a/android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java +++ b/android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java @@ -105,9 +105,6 @@ public class MainActivity extends SDLActivity // implements KeyEvent.Callback copy_asset("/sdcard/ioquake3Quest/baseq3", "pak66.pk3", true); copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true); - //Copy omarlego's background image pak - copy_asset("/sdcard/ioquake3Quest/baseq3", "pak66.pk3", false); - //If open arena is installed then copy necessary stuff if (new File("/sdcard/ioquake3Quest/baseoa").exists()) { copy_asset("/sdcard/ioquake3Quest/baseoa", "autoexec_oa.cfg", "autoexec.cfg", false);