opengl: limit cache texture to 512x512

[flatwaifu.git] / src / gl / render.c

diff --git a/src/gl/render.c b/src/gl/render.c
index c1260da8f3f8aebbcb67b00d299922a6d606e6b9..6b62793494c418920d95a9206420ceba7e3c1aae 100644 (file)
--- a/src/gl/render.c
+++ b/src/gl/render.c
@@ -215,7 +215,7 @@ static cache *R_cache_new (void) {
   GLint size = 0;
   cache *c = NULL;
   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size);
-  size /= 2; // TODO remove hack or detect ibook bug
+  size = size < 512 ? size : 512; // more can be buggy on older hardware
   if (size) {
     glGenTextures(1, &id);
     if (id) {
@@ -1632,10 +1632,10 @@ void R_get_name (int n, char s[8]) {
 
 static short getani (char n[8]) {
   short i = 0;
-  while (i < ANIT && strncasecmp(n, anm[i][0], 8) != 0) {
+  while (i < ANIT - 1 && strncasecmp(n, anm[i][0], 8) != 0) {
     i++;
   }
-  return i < ANIT ? i + 1 : 0;
+  return i < ANIT - 1 ? i + 1 : 0;
 }
 
 int R_get_special_id (int n) {
@@ -1673,7 +1673,7 @@ void R_load (char s[8], int f) {
     };
   } else if (strncasecmp(s, "_WATER_", 7) == 0) {
     walp[max_textures] = (image) {
-      .n = (void*)(s[7] - '0' + 1),
+      .n = (void*)((intptr_t)s[7] - '0' + 1),
       .x = 0,
       .y = 0,
       .w = 8,