cp866: move to common/

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

diff --git a/src/gl/render.c b/src/gl/render.c
index e38e63c9184730c4daeb6911df6cb1b3aa122605..db23448f445dc9f999a4a87b710a6dbf5c9e4fd3 100644 (file)
--- 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
@@ -568,16 +570,12 @@ static void R_gl_free_image (image *img) {
   img->res = -1;
 }
 
-static void R_gl_quad_vetexes (int x, int y, int w, int h) {
+static void R_gl_draw_quad (int x, int y, int w, int h) {
+  glBegin(GL_QUADS);
   glVertex2i(x + w, y);
   glVertex2i(x,     y);
   glVertex2i(x,     y + h);
   glVertex2i(x + w, y + h);
-}
-
-static void R_gl_draw_quad (int x, int y, int w, int h) {
-  glBegin(GL_QUADS);
-  R_gl_quad_vetexes(x, y, w, h);
   glEnd();
 }
 
@@ -1062,8 +1060,12 @@ static void R_draw_dots (void) {
   glBegin(GL_QUADS);
   for (i = 0; i < MAXDOT; i++) {
     if (dot[i].t != 0) {
-      R_gl_set_color(dot[i].c);
-      R_gl_quad_vetexes(dot[i].o.x, dot[i].o.y, 1, 1);
+      int x = dot[i].o.x;
+      int y = dot[i].o.y;
+      R_gl_set_color(dot[i].c); glVertex2i(x + 1, y);
+      R_gl_set_color(dot[i].c); glVertex2i(x, y);
+      R_gl_set_color(dot[i].c); glVertex2i(x, y + 1);
+      R_gl_set_color(dot[i].c); glVertex2i(x + 1, y + 1);
     }
   }
   glEnd();
@@ -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;
   }
@@ -1353,7 +1355,6 @@ static void R_draw_smoke (void) {
 static void R_draw_effects (void) {
   enum {NONE, TFOG, IFOG, BUBL}; // copypasted from fx.c
   int i, s;
-  glPointSize(screen_scale);
   for (i = 0; i < MAXFX; ++i) {
     switch (fx[i].t) {
       case TFOG:
@@ -2008,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;
@@ -2061,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,