X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=e29dd232c40cfd39ff164ab81e1483e17d710948;hb=2cd3d04c04fb347e6eea354dccf14099f56bd352;hp=0dc1ac30144082ebe1a292f9bf0e419cfd42fe25;hpb=99e9995ba077aa90b20b47d528ccd3ff27949652;p=flatwaifu.git
diff --git a/src/gl/render.c b/src/gl/render.c
index 0dc1ac3..e29dd23 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 .
+ */
+
#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"
@@ -23,6 +38,7 @@
#include "switch.h" // sw_secrets
#include "cp866.h"
+#include "common/endianness.h"
#ifdef __APPLE__
# include
@@ -553,16 +569,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 +1059,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 +1142,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 +1188,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 +1354,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:
@@ -1874,7 +1889,7 @@ void R_set_videomode (int w, int h, int fullscreen) {
R_reload_textures();
}
-static int video_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int video_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
static int w, h, fullscreen;
static char buf[16];
@@ -1935,12 +1950,9 @@ static int video_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int
return simple_menu_handler(msg, i, __NUM__, &sm, &cur);
}
-static const menu_t video_menu = {
- NULL, &video_menu_handler
-};
-
const menu_t *R_menu (void) {
- return &video_menu;
+ static const menu_t m = { video_menu_handler };
+ return &m;
}
const cfg_t *R_args (void) {
@@ -1996,7 +2008,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;
@@ -2049,7 +2061,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,