X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=948a7b5cc8d3abb22ffd6484fde0957fa3c0d201;hb=1e058b808ddb343442012f01d6fd5692920a3018;hp=22667f7542880b709f7a543e38cff9aee566428c;hpb=14813cefff1cc036bf217346188c168429b52e81;p=flatwaifu.git

diff --git a/src/gl/render.c b/src/gl/render.c
index 22667f7..948a7b5 100644
--- a/src/gl/render.c
+++ b/src/gl/render.c
@@ -1,3 +1,18 @@
+/* Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "glob.h"
 #include "render.h"
 #include "system.h"
@@ -11,8 +26,8 @@
 #include "dots.h"
 #include "items.h"
 
-#include "sound.h" // snd_vol
-#include "music.h" // mus_vol
+#include "sound.h"
+#include "music.h"
 
 #include "fx.h"
 #include "player.h"
@@ -553,16 +568,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();
 }
 
@@ -1047,8 +1058,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();
@@ -1126,7 +1141,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;
@@ -1172,7 +1187,7 @@ static void R_draw_player (player_t *p) {
     case SLOP:
       s = plr_slopanim[p->s];
       break;
-    case OUT:
+    case OUT_:
       s = 0;
       break;
   }
@@ -1338,7 +1353,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:
@@ -1993,7 +2007,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;
@@ -2046,7 +2060,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,