X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=db23448f445dc9f999a4a87b710a6dbf5c9e4fd3;hb=b7c6f2a0e12b4ee2d4111d1e671bf2b8b14c71b4;hp=d6f021de16a267021e347dfc8cda8b4c3b6eb76f;hpb=fba39716b1a5f4503c35d97fbcdab340e66c33d3;p=flatwaifu.git

diff --git a/src/gl/render.c b/src/gl/render.c
index d6f021d..db23448 100644
--- a/src/gl/render.c
+++ b/src/gl/render.c
@@ -37,16 +37,18 @@
 #include "view.h"
 #include "switch.h" // sw_secrets
 
-#include "cp866.h"
+#include "common/cp866.h"
+#include "common/endianness.h"
 
 #ifdef __APPLE__
 #  include <OpenGL/gl.h>
 #else
 #  include <GL/gl.h>
 #endif
-#include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <assert.h>
 
 #define VGA_TRANSPARENT_COLOR 0
@@ -1141,7 +1143,7 @@ static int wpnspr (player_t *p) {
 }
 
 static void R_draw_player (player_t *p) {
-  enum {STAND, GO, DIE, SLOP, DEAD, MESS, OUT, FALL}; // copypasted from player.c!
+  enum {STAND, GO, DIE, SLOP, DEAD, MESS, OUT_, FALL}; // copypasted from player.c!
   static const int wytab[] = {-1, -2, -1, 0};
   int s = 'A';
   int w = 0;
@@ -1187,7 +1189,7 @@ static void R_draw_player (player_t *p) {
     case SLOP:
       s = plr_slopanim[p->s];
       break;
-    case OUT:
+    case OUT_:
       s = 0;
       break;
   }
@@ -2007,7 +2009,7 @@ void R_get_name (int n, char s[8]) {
 
 static short getani (char n[8]) {
   short i = 0;
-  while (i < ANIT - 1 && strncasecmp(n, anm[i][0], 8) != 0) {
+  while (i < ANIT - 1 && cp866_strncasecmp(n, anm[i][0], 8) != 0) {
     i++;
   }
   return i < ANIT - 1 ? i + 1 : 0;
@@ -2060,7 +2062,7 @@ void R_load (char s[8]) {
       .h = 0,
       .res = -1,
     };
-  } else if (strncasecmp(s, "_WATER_", 7) == 0) {
+  } else if (cp866_strncasecmp(s, "_WATER_", 7) == 0) {
     walp[max_textures] = (image) {
       .n = (void*)((intptr_t)s[7] - '0' + 1),
       .x = 0,