summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5db6305)
raw | patch | inline | side by side (parent: 5db6305)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Fri, 15 May 2020 15:34:41 +0000 (18:34 +0300) | ||
committer | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Fri, 15 May 2020 15:34:41 +0000 (18:34 +0300) |
src/CMakeLists.txt | patch | blob | history | |
src/gl/render.c | patch | blob | history |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9028b81778374219276b037ba5a6178574b74339..d91997eb8fa0612fc4d61e2ab1b36ab55fcf6b70 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
set(D2D_DOOM2D_WAD doom2d.wad)
configure_file(${D2D_GAME_ROOT}/default.cfg default.cfg COPYONLY)
set(D2D_DEFAULT_CFG default.cfg)
- set(D2D_USED_LINKFLAGS ${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS})
- set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}")
+ set(D2D_USED_LINKFLAGS "${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS}")
+ set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s MINIFY_HTML=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=0 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}")
else()
target_link_libraries(doom2d ${D2D_USED_LIBRARY})
endif()
diff --git a/src/gl/render.c b/src/gl/render.c
index e38e63c9184730c4daeb6911df6cb1b3aa122605..68ab733d1da170d5e1b4ef6fd32be59d2a5a8903 100644 (file)
--- a/src/gl/render.c
+++ b/src/gl/render.c
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: