From 7dfb65760d8d3c806c537bce34d502e9b01e2ba6 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sun, 6 Dec 2015 13:06:26 +0300
Subject: [PATCH] Add vibration support and swap next/prev weapon

---
 AndroidManifest.xml                 |   6 +++---
 assets/next_weap.png                | Bin 1133 -> 1226 bytes
 assets/prev_weap.png                | Bin 1226 -> 1133 bytes
 src/org/libsdl/app/SDLActivity.java |  21 +++++++++++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0fda1cc5..a3eb1296 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,10 +24,9 @@
                  android:hardwareAccelerated="true">
         <activity android:name="in.celest.xash3d.LauncherActivity"
                   android:label="@string/launcher_name"
-				  android:windowSoftInputMode="adjustResize"
-                  >
+		 android:windowSoftInputMode="adjustResize">
 			<intent-filter>
-						<action android:name="in.celest.xash3d.LauncherActivity"/>
+			<action android:name="in.celest.xash3d.LauncherActivity"/>
                         <action android:name="android.intent.action.MAIN" />
                         <category android:name="android.intent.category.LAUNCHER" />
         	</intent-filter>
@@ -76,5 +75,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 </manifest> 
diff --git a/assets/next_weap.png b/assets/next_weap.png
index 14aa5e0fd2d968a3df60488e08b6972a9d5aaffc..099c9b69af677ee7f6f0229f5c6b570b120d7c1d 100644
GIT binary patch
delta 1039
zcmV+q1n~Rq2+9eNBv_G2L_t(|obBAdPGn^q$Kl@?NJw@H@4&bXG)C?~qBr0j=oV&9
zr@b}yc0efb3iJjx@e<hBOekzfD9M<N2?>)N3)Wp=Sr}%{pZC1)^K?V?YrY@e>O_<A
z17wka1%L3kQQrr2;qdVA_lWqm?>op(UDqd7RlVx_j#Yiq_W@m~>-wbc8_3gWG#d0j
zmLgsN5fO)nhu=lSNkqif*4FFY-Q8dNy@(;2&*v|u)9L<Vv3MB~v%0SLs;YX^_g$+h
zCIAs4z<P2Ue?(ych!6o*ljHa!3JgGm2=F|)j(<O*&;Ue;0L#gF{1F8QAVLIqT<+tK
zC_DfWBEZ8+7=MHSM1%-%S1IF<5P)|?fQYijA0YsDh(Os&8-IiVd_V-sRO0v}1mHm;
zP?l21A0YrAB?4tAdHfLq@F)?;Tj}GE5P&C%K%R{Mh5#%<1oC41?+L(?L?92wf0qC}
zgMSDN+r`Dj=jZ3=`*mH9!}uejkWYd&Wipxk77^b^L|k26eRFzx`eVNrv8;RJKQ;av
zUH~ib5*U{I<By2F$z<|R-*=@z09GUd!(jZ66M!{{K-!G|X#%h&5lEBqFGm0xAOdMI
z{^bckLqs4A#{WD5&>#`$m+?QJ05nVl`hQ{ks}X<}h(NcDe{}-T5)tTz@vlb!S|kGP
zGXC`mK+8m+9md}b0qB4TG|Tv#BLE!{fo2$gvjm_+BCsCgZ=L{jOaxYA{Ou5c9^8(=
z=H}*K+uPf}jK|}D`@Je%#@`-a1nR-9FAL4CudlzDPN)0x`TRxCXC=w_+vNq&qkn^g
zgD*#;(Vr3V>Bh#!-#a@yKYIzhXZ-CGfS!rK!;HTh0+0X^xXbvvBLImIfg8r(EdfYK
z=@Bsg?g>C*N{xW=_d@^@R9Xa#zdr(ys8S+e{QVMugykLq<L{pUBrewo7=IcBU;uK9
zfbpk800ttL2pE4_1Ykgh9s%P|kADCR%upj>{Am(^0UBBaj6YohFi=B@fbpkI00u1e
z2pE6*1YqD&jlkL2+1Hnsmp{GzY5a-uNw9&ds_IQ$*Lx8$TPzkYQ~12tz48AM#-A)N
zfJ~(F61YA7x~@;Es(RJ+4J=OpGSYVhjDL6pATxbM!1#wr05a5d1dM;U1b-k?T}8n7
zhfM%7)^-GpfA|C-b8SVy`12qD1!y_~#-9%XC`3~cF#fy<Kta}xfbr)?01C5e1dKmV
z0#KmmM!@*<B>;t5HUh?<HvuTvQxP!!{0TteJ{AGvFM|N^K?KI*@$1=a_Ctj6=S~2K
zh`SN^|8K^hKLOyK+YvB+C=Af?@$qLzM@L`veFu?oNEpze{{TrMKg6qUD_Q^m002ov
JPDHLkV1j?Y;idop

delta 942
zcmW;JeM}p57zgm*9cO4WM!7X=ySdICuQ5|P)|5e4TC`=sGN{XBo2gydpvs1u-5|V}
z_3lh`G;|cQX`8t~m-vFInRY|x2(X&rL15UbK;3wC6-8Z#7hxP}clFNSUr(N2@_D{_
zo>5^`(2=oEQK~CG&~!OEr8;S<kqrOZXgUl#CO)jotRwD1cOirKna0DQp=HTx@}nQ`
zfC?LnuPGX^o4xfpBgwY=W2PSp=A+GhKM#Dro><X$l4W@4y#8TQ&REL;TkAixBmI7O
z^7!h`HFcQ*FhT3}^#aVESXqBV*Z&mxjS!&pBqK)OoGE>nG_w3J-QCs2+H5x3>OVA7
zGL(nSy`}tU`SjdyeLpB%TV&j0i>FX@I{IjGe0+SmN;0@Hm$VAC!?G<n21mt2xjLW4
zb;!Leu=QR;+#%>SfWqs`{D2Ff{<jdFjfG^;(vUw=q4Pcuhe$uw-Ktd~UfVI31|^jO
z?d?xDbJD7qDA}iGb;w^?VB@6|95i77n|G~oP|pRR$O!X=3n;MvJ8eMWy~xo<5!7R<
zjo_S}3LE|VhdFy4@$UbGx33Ac?;V$N_TnaDbVAA5qZ#1I&-suS_k!nMiE(638#v(o
zfR|FC9McItWD0Ejs*;E7u(4-~FU+vfYvyAY!A8#<U&vr%hnf2d#1U`WfD7lQH4C+n
zGf{+kT%g(-7m3McfwqK7C{WKFx9FCdcu=KMy@T8B?ATHNx93}HbnyZ6m-xupgNA;P
zCubkm-IzYet$BQQc6JS=t0eD--EKF&IOux<mhXya?nI-}{BSsYN^dd2^7M$NUEr($
z)}!%A8j0J4ffOfh!sIf@<Dn~FLa6OPoX6HW0yJX5D2)i+-44nE%paNXIWf^G#bwyr
z5=hcXbB!3+kl<3CMFY#>NN$_pK{;rzj@N7=X9WS&d8-clXAiWygANxXU0EPm&i1ti
zB8a7eI+BexdBB73n7{EX_=uR;D#f?x7K)%>Ncx5zVY5L{&MF;&TgZZtnpdJ}#9k@B
zt;I!vJpm^6(-{O=*g(yHW=?+=bnj#bS0xa{3^9(STo_KHf@jrwZwyE@qCYd?*OLQG
z^UET1NeQUn3$MAfZb)u_^y6uyZv#P}X{}5z4801R-N$+*<Vn~PcV78gP>&KmpKsf_
zswQ_V_0r0A%zU-d=ej8>7~+ocyFBIg*i3%ti>KM#PO@4;m>(xGl>SbFP)`BwmFmlN
JS6{Te`ybBwssjK3

diff --git a/assets/prev_weap.png b/assets/prev_weap.png
index 099c9b69af677ee7f6f0229f5c6b570b120d7c1d..14aa5e0fd2d968a3df60488e08b6972a9d5aaffc 100644
GIT binary patch
delta 942
zcmW;JeM}p57zgm*9cO4WM!7X=ySdICuQ5|P)|5e4TC`=sGN{XBo2gydpvs1u-5|V}
z_3lh`G;|cQX`8t~m-vFInRY|x2(X&rL15UbK;3wC6-8Z#7hxP}clFNSUr(N2@_D{_
zo>5^`(2=oEQK~CG&~!OEr8;S<kqrOZXgUl#CO)jotRwD1cOirKna0DQp=HTx@}nQ`
zfC?LnuPGX^o4xfpBgwY=W2PSp=A+GhKM#Dro><X$l4W@4y#8TQ&REL;TkAixBmI7O
z^7!h`HFcQ*FhT3}^#aVESXqBV*Z&mxjS!&pBqK)OoGE>nG_w3J-QCs2+H5x3>OVA7
zGL(nSy`}tU`SjdyeLpB%TV&j0i>FX@I{IjGe0+SmN;0@Hm$VAC!?G<n21mt2xjLW4
zb;!Leu=QR;+#%>SfWqs`{D2Ff{<jdFjfG^;(vUw=q4Pcuhe$uw-Ktd~UfVI31|^jO
z?d?xDbJD7qDA}iGb;w^?VB@6|95i77n|G~oP|pRR$O!X=3n;MvJ8eMWy~xo<5!7R<
zjo_S}3LE|VhdFy4@$UbGx33Ac?;V$N_TnaDbVAA5qZ#1I&-suS_k!nMiE(638#v(o
zfR|FC9McItWD0Ejs*;E7u(4-~FU+vfYvyAY!A8#<U&vr%hnf2d#1U`WfD7lQH4C+n
zGf{+kT%g(-7m3McfwqK7C{WKFx9FCdcu=KMy@T8B?ATHNx93}HbnyZ6m-xupgNA;P
zCubkm-IzYet$BQQc6JS=t0eD--EKF&IOux<mhXya?nI-}{BSsYN^dd2^7M$NUEr($
z)}!%A8j0J4ffOfh!sIf@<Dn~FLa6OPoX6HW0yJX5D2)i+-44nE%paNXIWf^G#bwyr
z5=hcXbB!3+kl<3CMFY#>NN$_pK{;rzj@N7=X9WS&d8-clXAiWygANxXU0EPm&i1ti
zB8a7eI+BexdBB73n7{EX_=uR;D#f?x7K)%>Ncx5zVY5L{&MF;&TgZZtnpdJ}#9k@B
zt;I!vJpm^6(-{O=*g(yHW=?+=bnj#bS0xa{3^9(STo_KHf@jrwZwyE@qCYd?*OLQG
z^UET1NeQUn3$MAfZb)u_^y6uyZv#P}X{}5z4801R-N$+*<Vn~PcV78gP>&KmpKsf_
zswQ_V_0r0A%zU-d=ej8>7~+ocyFBIg*i3%ti>KM#PO@4;m>(xGl>SbFP)`BwmFmlN
JS6{Te`ybBwssjK3

delta 1039
zcmV+q1n~Rq2+9eNBv_G2L_t(|obBAdPGn^q$Kl@?NJw@H@4&bXG)C?~qBr0j=oV&9
zr@b}yc0efb3iJjx@e<hBOekzfD9M<N2?>)N3)Wp=Sr}%{pZC1)^K?V?YrY@e>O_<A
z17wka1%L3kQQrr2;qdVA_lWqm?>op(UDqd7RlVx_j#Yiq_W@m~>-wbc8_3gWG#d0j
zmLgsN5fO)nhu=lSNkqif*4FFY-Q8dNy@(;2&*v|u)9L<Vv3MB~v%0SLs;YX^_g$+h
zCIAs4z<P2Ue?(ych!6o*ljHa!3JgGm2=F|)j(<O*&;Ue;0L#gF{1F8QAVLIqT<+tK
zC_DfWBEZ8+7=MHSM1%-%S1IF<5P)|?fQYijA0YsDh(Os&8-IiVd_V-sRO0v}1mHm;
zP?l21A0YrAB?4tAdHfLq@F)?;Tj}GE5P&C%K%R{Mh5#%<1oC41?+L(?L?92wf0qC}
zgMSDN+r`Dj=jZ3=`*mH9!}uejkWYd&Wipxk77^b^L|k26eRFzx`eVNrv8;RJKQ;av
zUH~ib5*U{I<By2F$z<|R-*=@z09GUd!(jZ66M!{{K-!G|X#%h&5lEBqFGm0xAOdMI
z{^bckLqs4A#{WD5&>#`$m+?QJ05nVl`hQ{ks}X<}h(NcDe{}-T5)tTz@vlb!S|kGP
zGXC`mK+8m+9md}b0qB4TG|Tv#BLE!{fo2$gvjm_+BCsCgZ=L{jOaxYA{Ou5c9^8(=
z=H}*K+uPf}jK|}D`@Je%#@`-a1nR-9FAL4CudlzDPN)0x`TRxCXC=w_+vNq&qkn^g
zgD*#;(Vr3V>Bh#!-#a@yKYIzhXZ-CGfS!rK!;HTh0+0X^xXbvvBLImIfg8r(EdfYK
z=@Bsg?g>C*N{xW=_d@^@R9Xa#zdr(ys8S+e{QVMugykLq<L{pUBrewo7=IcBU;uK9
zfbpk800ttL2pE4_1Ykgh9s%P|kADCR%upj>{Am(^0UBBaj6YohFi=B@fbpkI00u1e
z2pE6*1YqD&jlkL2+1Hnsmp{GzY5a-uNw9&ds_IQ$*Lx8$TPzkYQ~12tz48AM#-A)N
zfJ~(F61YA7x~@;Es(RJ+4J=OpGSYVhjDL6pATxbM!1#wr05a5d1dM;U1b-k?T}8n7
zhfM%7)^-GpfA|C-b8SVy`12qD1!y_~#-9%XC`3~cF#fy<Kta}xfbr)?01C5e1dKmV
z0#KmmM!@*<B>;t5HUh?<HvuTvQxP!!{0TteJ{AGvFM|N^K?KI*@$1=a_Ctj6=S~2K
zh`SN^|8K^hKLOyK+YvB+C=Af?@$qLzM@L`veFu?oNEpze{{TrMKg6qUD_Q^m002ov
JPDHLkV1j?Y;idop

diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index 39cd90ce..6021e80d 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -32,6 +32,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Vibrator;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Display;
@@ -77,6 +78,8 @@ public class SDLActivity extends Activity {
 	// If we want to separate mouse and touch events.
 	//  This is only toggled in native code when a hint is set!
 	public static boolean mSeparateMouseAndTouch;
+	
+	private static Vibrator mVibrator;
 
 	// Main components
 	protected static SDLActivity mSingleton;
@@ -136,6 +139,7 @@ public class SDLActivity extends Activity {
 		// The static nature of the singleton and Android quirkyness force us to initialize everything here
 		// Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
 		mSingleton = null;
+		mVibrator = null;
 		mSurface = null;
 		mTextEdit = null;
 		mLayout = null;
@@ -174,7 +178,7 @@ public class SDLActivity extends Activity {
 		// So we can call stuff from static callbacks
 		mSingleton = this;
 		mPref = this.getSharedPreferences("engine", 0);
-		mUseControls = mPref.getBoolean("controls", false);
+		mUseControls = mPref.getBoolean("controls", true);
 		mUseVolume = mPref.getBoolean("usevolume", false);
 		// Load shared libraries
 		String errorMsgBrokenLib = "";
@@ -261,6 +265,8 @@ public class SDLActivity extends Activity {
 			return;
 		}
 
+		mVibrator.cancel();
+		
 		SDLActivity.handlePause();
 	}
 
@@ -308,6 +314,8 @@ public class SDLActivity extends Activity {
 	protected void onDestroy() {
 		Log.v("SDL", "onDestroy()");
 
+		mVibrator.cancel();
+		
 		if (SDLActivity.mBrokenLibraries) {
 			super.onDestroy();
 			// Reset everything in case the user re opens the app
@@ -499,7 +507,16 @@ public class SDLActivity extends Activity {
 	public static void flipBuffers() {
 		SDLActivity.nativeFlipBuffers();
 	}
-
+	
+	/**
+         * This method is called by Xash3D engine using JNI
+         */
+        public void vibrate( short time ) {
+                mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ 
+                mVibrator.vibrate( time );
+        }
+         
 	/**
 	 * This method is called by SDL using JNI.
 	 */