X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=68ab733d1da170d5e1b4ef6fd32be59d2a5a8903;hp=28c5b86976ccb1cb97f6cf464698034798d88587;hb=c0bb00824a48b78aee7140e3fa89ac69d59d7296;hpb=21e27adcd50196e94141390f96c8d4a089ccde08 diff --git a/src/gl/render.c b/src/gl/render.c index 28c5b86..68ab733 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" @@ -542,7 +557,7 @@ static image R_gl_loadimage (const char name[8]) { } static image R_gl_get_special_spr (const char n[4], int s, int d, rgba *(*fn)(vgaimg*)) { - return R_gl_get_special_image(F_getsprid(n, s, d), fn); + return R_gl_get_special_image(F_getsprid(n, s, d, NULL), fn); } static void R_gl_free_image (image *img) { @@ -636,10 +651,7 @@ static void R_gl_setmatrix (void) { /* --- Misc --- */ static image Z_getspr (const char n[4], int s, int d, char *dir) { - int h = F_getsprid(n, s, d); - if (dir != NULL) { - *dir = (h & 0x8000) ? 1 : 0; - } + int h = F_getsprid(n, s, d, dir); return R_gl_getimage(h); } @@ -806,58 +818,59 @@ static void get_entry_size (const menu_t *m, int i, int *w, int *h) { int type = 0; menu_msg_t msg; msg.type = GM_GETENTRY; - assert(GM_send(m, i, &msg)); - type = msg.integer.i; - switch (type) { - case GM_BUTTON: - case GM_SCROLLER: - case GM_TEXTFIELD: - case GM_TEXTFIELD_BUTTON: - msg.type = GM_GETCAPTION; - if (GM_send(m, i, &msg)) { - x = Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); - } - break; - case GM_SMALL_BUTTON: - msg.type = GM_GETCAPTION; - if (GM_send(m, i, &msg)) { - x = Z_get_small_string_width("%.*s", msg.string.maxlen, msg.string.s); - } - break; - default: - assert(0); - } - switch (type) { - case GM_BUTTON: - msg.type = GM_GETSTR; - if (GM_send(m, i, &msg)) { - x += Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); - } - y = 16; - break; - case GM_SMALL_BUTTON: - msg.type = GM_GETSTR; - if (GM_send(m, i, &msg)) { - x += Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); - } - y = 12; - break; - case GM_SCROLLER: - x += (SCROLLER_MIDDLE + 2) * 8; - y = 16; - break; - case GM_TEXTFIELD: - case GM_TEXTFIELD_BUTTON: - msg.type = GM_GETSTR; - if (GM_send(m, i, &msg)) { - x += (msg.string.maxlen + 2) * 8; - } else { - x += (TEXTFIELD_MIDDLE + 2) * 8; - } - y = 16; - break; - default: - assert(0); + if (GM_send(m, i, &msg)) { + type = msg.integer.i; + switch (type) { + case GM_BUTTON: + case GM_SCROLLER: + case GM_TEXTFIELD: + case GM_TEXTFIELD_BUTTON: + msg.type = GM_GETCAPTION; + if (GM_send(m, i, &msg)) { + x = Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); + } + break; + case GM_SMALL_BUTTON: + msg.type = GM_GETCAPTION; + if (GM_send(m, i, &msg)) { + x = Z_get_small_string_width("%.*s", msg.string.maxlen, msg.string.s); + } + break; + default: + assert(0); + } + switch (type) { + case GM_BUTTON: + msg.type = GM_GETSTR; + if (GM_send(m, i, &msg)) { + x += Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); + } + y = 16; + break; + case GM_SMALL_BUTTON: + msg.type = GM_GETSTR; + if (GM_send(m, i, &msg)) { + x += Z_get_big_string_width("%.*s", msg.string.maxlen, msg.string.s); + } + y = 12; + break; + case GM_SCROLLER: + x += (SCROLLER_MIDDLE + 2) * 8; + y = 16; + break; + case GM_TEXTFIELD: + case GM_TEXTFIELD_BUTTON: + msg.type = GM_GETSTR; + if (GM_send(m, i, &msg)) { + x += (msg.string.maxlen + 2) * 8; + } else { + x += (TEXTFIELD_MIDDLE + 2) * 8; + } + y = 16; + break; + default: + assert(0); + } } *w = x; *h = y; @@ -1340,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: @@ -1876,7 +1888,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]; @@ -1937,12 +1949,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) { @@ -2040,7 +2049,7 @@ void R_begin_load (void) { max_textures = 1; } -void R_load (char s[8], int f) { +void R_load (char s[8]) { assert(max_textures < 256); if (!s[0]) { walp[max_textures] = (image) { @@ -2062,9 +2071,6 @@ void R_load (char s[8], int f) { }; } else { walp[max_textures] = R_gl_loadimage(s); - if (f) { - walp[max_textures].res |= 0x8000; - } if (s[0] == 'S' && s[1] == 'W' && s[4] == '_') { walswp[max_textures] = 0; } @@ -2083,7 +2089,7 @@ void R_end_load (void) { if (walswp[i] == 0) { R_get_name(i, s); s[5] ^= 1; - g = F_getresid(s) | (walp[i].res & 0x8000); + g = F_getresid(s); k = 1; while (k < 256 && walp[k].res != g) { k += 1; @@ -2093,7 +2099,7 @@ void R_end_load (void) { j += 1; max_textures += 1; walp[k] = R_gl_getimage(g); - walf[k] = g & 0x8000 ? 1 : 0; + walf[k] = walf[i]; } walswp[i] = k; walswp[k] = i;