commit 684dc5b7fc5c3f0a43485e7fbd6c5028306f2371
author Jack Palevich <jackpal@google.com> Fri Mar 29 11:09:55 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 29 11:09:55 2013 -0700
tree ab0ec2bc9d830d0fd0f4f6330da59d4d1a7e5d8f
parent 54ee513885915f4e91588bbbaacf7409bf324354
parent ee340fbccf7e480929dd410540b84d6b22e81fc3

am ee340fbc: Merge "quake: Fix build with gcc 4.8"

* commit 'ee340fbccf7e480929dd410540b84d6b22e81fc3':
  quake: Fix build with gcc 4.8

Android.mk

diff --git a/Android.mk b/Android.mk
index 50c8ddc..45e2e91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@
 # Optional tag would mean it doesn't get installed by default
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter
 
 LOCAL_SRC_FILES:= \
   cd_null.cpp \

quake/src/WinQuake/gl_model.cpp

diff --git a/quake/src/WinQuake/gl_model.cpp b/quake/src/WinQuake/gl_model.cpp
index 72649bb..227b9f1 100644
--- a/quake/src/WinQuake/gl_model.cpp
+++ b/quake/src/WinQuake/gl_model.cpp
@@ -654,7 +654,7 @@
 	for ( i=0 ; i<count ; i++, in++, out++)
 	{
 		for (j=0 ; j<8 ; j++)
-			out->vecs[0][j] = LittleFloat (in->vecs[0][j]);
+			out->vecs[j/4][j%4] = LittleFloat (in->vecs[j/4][j%4]);
 		len1 = Length (out->vecs[0]);
 		len2 = Length (out->vecs[1]);
 		len1 = (len1 + len2)/2;

quake/src/WinQuake/r_part.cpp

diff --git a/quake/src/WinQuake/r_part.cpp b/quake/src/WinQuake/r_part.cpp
index b6fcdca..8551b2e 100644
--- a/quake/src/WinQuake/r_part.cpp
+++ b/quake/src/WinQuake/r_part.cpp
@@ -137,7 +137,7 @@
 if (!avelocities[0][0])
 {
 for (i=0 ; i<NUMVERTEXNORMALS*3 ; i++)
-avelocities[0][i] = (rand()&255) * 0.01;
+avelocities[i/3][i%3] = (rand()&255) * 0.01;
 }