From b63650a2e34722cbc2a248769ab232bfbb2b46e3 Mon Sep 17 00:00:00 2001 From: Waterdish Date: Sat, 16 Mar 2024 11:38:46 -0700 Subject: [PATCH] Fix pushblock resetting --- app/build.gradle | 2 +- app/jni/src/soh/src/code/z_bgcheck.c | 2 +- app/src/main/AndroidManifest.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4c73f37..a33e0c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { minSdkVersion 18 targetSdkVersion 31 versionCode 5 - versionName "1.2.0" + versionName "1.2.1" externalNativeBuild { //ndkBuild { // arguments "APP_PLATFORM=android-23" diff --git a/app/jni/src/soh/src/code/z_bgcheck.c b/app/jni/src/soh/src/code/z_bgcheck.c index 7c99e7c..c948b0e 100644 --- a/app/jni/src/soh/src/code/z_bgcheck.c +++ b/app/jni/src/soh/src/code/z_bgcheck.c @@ -398,7 +398,7 @@ s32 CollisionPoly_LineVsPoly(CollisionPoly* poly, Vec3s* vtxList, Vec3f* posA, V (poly->normal.x * posB->x + poly->normal.y * posB->y + poly->normal.z * posB->z) * COLPOLY_NORMAL_FRAC + plane.originDist; -#ifdef __WIIU__ +#if defined(__WIIU__) || defined(__ANDROID__) // on some platforms this ends up as very small numbers due to rounding issues if (IS_ZERO(planeDistA)) { planeDistA = 0.0f; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b724dde..d219268 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@