aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2013-03-29 17:32:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-03-29 17:32:54 +0000
commitee340fbccf7e480929dd410540b84d6b22e81fc3 (patch)
treebfc1e667eb7c949ec6b6d293b0bad056571e5d64
parent0b60f1f486f68eb45a08afba8e6cc5068935edf1 (diff)
parent12d33bd4b7b276b821c3ca301dec99a0a17d06e8 (diff)
downloadquake-ee340fbccf7e480929dd410540b84d6b22e81fc3.tar.gz
Merge "quake: Fix build with gcc 4.8"
-rw-r--r--Android.mk2
-rw-r--r--quake/src/WinQuake/gl_model.cpp2
-rw-r--r--quake/src/WinQuake/r_part.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 50c8ddc..45e2e91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@ include $(CLEAR_VARS)
# 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 \
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 @@ void Mod_LoadTexinfo (lump_t *l)
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;
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 @@ void R_EntityParticles (entity_t *ent)
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;
}