From ec228f855e3543aa7abc8c0df6dcf1281de52ed5 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sat, 21 Dec 2019 18:20:23 +0000
Subject: [PATCH] Fix missing comfort vignette

---
 Projects/Android/AndroidManifest.xml          |  4 ++--
 .../jni/quake2/src/common/header/common.h     |  2 +-
 .../drbeef/quake2quest/GLES3JNIActivity.java  | 24 ++++++++-----------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 8c84bd2..5b7f173 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.quake2quest"
-		android:versionCode="12"
-		android:versionName="1.0.1" android:installLocation="auto" >
+		android:versionCode="13"
+		android:versionName="1.0.2" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
diff --git a/Projects/Android/jni/quake2/src/common/header/common.h b/Projects/Android/jni/quake2/src/common/header/common.h
index 1b8fa7b..1b4477d 100644
--- a/Projects/Android/jni/quake2/src/common/header/common.h
+++ b/Projects/Android/jni/quake2/src/common/header/common.h
@@ -32,7 +32,7 @@
 #include "shared.h"
 #include "crc.h"
 
-#define Q2QVERSION "1.0.1"
+#define Q2QVERSION "1.0.2"
 #define YQ2VERSION "7.41"
 #define BASEDIRNAME "Quake2Quest"
 
diff --git a/java/com/drbeef/quake2quest/GLES3JNIActivity.java b/java/com/drbeef/quake2quest/GLES3JNIActivity.java
index 67cb83a..9276255 100644
--- a/java/com/drbeef/quake2quest/GLES3JNIActivity.java
+++ b/java/com/drbeef/quake2quest/GLES3JNIActivity.java
@@ -163,24 +163,20 @@ import static android.system.Os.setenv;
 	{
 		//This will copy the shareware version of quake2 if user doesn't have anything installed
 		copy_asset("/sdcard/Quake2Quest", "pak0.pak");
+
+		//HD Textures
+		copy_asset("/sdcard/Quake2Quest", "pak6.pak");
+
+		//Custom weapons
+		copy_asset("/sdcard/Quake2Quest", "pak99.pak");
+
+		//Configuration files
 		copy_asset("/sdcard/Quake2Quest", "config.cfg");
 		copy_asset("/sdcard/Quake2Quest", "autoexec.cfg");
 		copy_asset("/sdcard/Quake2Quest", "commandline.txt");
 
-		//The custom weapon PAK file
-		copy_asset("/sdcard/Quake2Quest", "pak6.pak");
-		copy_asset("/sdcard/Quake2Quest", "pak99.pak");
-
-/*			String models[] = {"g_blast", "v_blast",
-				"g_shotg", "v_shotg",
-				"g_shotg2", "v_shotg2"};
-
-		for (String model : models) {
-			copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/skin_new.pcx");
-			copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/skin_new.tga");
-			copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/tris.md2");
-		}
-		*/
+		//Comfort Vignette Mask
+		copy_asset("/sdcard/Quake2Quest", "vignette.tga");
 
 		//Read these from a file and pass through
 		commandLineParams = new String("quake2");