From db3df6f8a771fcd7a0ae9a8f64b598c517c83d2b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 9 Sep 2018 11:12:04 +0900
Subject: [PATCH] Fix a bunch of dead increments.

---
 libs/util/riff.c                  |  2 +-
 libs/video/renderer/gl/vtxarray.c |  3 ---
 libs/video/renderer/sw32/d_scan.c | 12 ------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/libs/util/riff.c b/libs/util/riff.c
index 9bbeb461c..c4590ce2d 100644
--- a/libs/util/riff.c
+++ b/libs/util/riff.c
@@ -228,6 +228,7 @@ read_list (riff_d_chunk_t *ck, QFile *f, int len)
 					riff_data_t     *data = malloc (sizeof (riff_data_t));
 					if (!Rread (f, &data->ck, sizeof (data->ck))) {
 						free (data);
+						len = 0;
 					} else {
 						data->ck.len = LittleLong (data->ck.len);
 						data->data = read_data (f, data->ck.len);
@@ -235,7 +236,6 @@ read_list (riff_d_chunk_t *ck, QFile *f, int len)
 						chunk = &data->ck;
 					}
 				}
-				len = 0;
 				break;
 		}
 		if (chunk) {
diff --git a/libs/video/renderer/gl/vtxarray.c b/libs/video/renderer/gl/vtxarray.c
index 78e245a55..dda46974b 100644
--- a/libs/video/renderer/gl/vtxarray.c
+++ b/libs/video/renderer/gl/vtxarray.c
@@ -445,7 +445,6 @@ qfgl_InterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer)
 		case GL_C4UB_V2F:
 			qfgl_VertexPointer (2, GL_FLOAT, stride - 2 * sizeof (GLfloat),
 								ptr);
-			ptr += 2 * sizeof (GLfloat);
 			break;
 		case GL_V3F:
 		case GL_C4UB_V3F:
@@ -459,13 +458,11 @@ qfgl_InterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer)
 		case GL_T2F_C4F_N3F_V3F:
 			qfgl_VertexPointer (3, GL_FLOAT, stride - 3 * sizeof (GLfloat),
 								ptr);
-			ptr += 3 * sizeof (GLfloat);
 			break;
 		case GL_T4F_V4F:
 		case GL_T4F_C4F_N3F_V4F:
 			qfgl_VertexPointer (4, GL_FLOAT, stride - 4 * sizeof (GLfloat),
 								ptr);
-			ptr += 4 * sizeof (GLfloat);
 			break;
 		default:
 			break;
diff --git a/libs/video/renderer/sw32/d_scan.c b/libs/video/renderer/sw32/d_scan.c
index c77f131df..d5c2000ea 100644
--- a/libs/video/renderer/sw32/d_scan.c
+++ b/libs/video/renderer/sw32/d_scan.c
@@ -515,14 +515,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);
@@ -657,14 +653,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);
@@ -800,14 +792,10 @@ sw32_D_DrawSpans (espan_t *pspan)
 					}
 					if (count & 1)
 						pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 				else
 				{
 					pdest[0] = pbase[(t >> 16) * sw32_cachewidth + (s >> 16)];
-					s += sstep;
-					t += tstep;
 				}
 			}
 		} while ((pspan = pspan->pnext) != NULL);