From 7dd51d6d1c2f1f425b529ed3742c342d032a4255 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 22 Dec 2016 11:00:20 +0200 Subject: [PATCH 1/9] Fixed infinite execution of error CCMD https://forum.zdoom.org/viewtopic.php?t=54659 --- src/c_console.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/c_console.cpp b/src/c_console.cpp index 691c4a3ca..0a324eb8f 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1523,8 +1523,6 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer) buffer.Text.StripLeftRight(); Printf(127, TEXTCOLOR_WHITE "]%s\n", buffer.Text.GetChars()); - AddCommandString(buffer.Text.LockBuffer()); - buffer.Text.UnlockBuffer(); if (buffer.Text.Len() == 0) { @@ -1568,7 +1566,21 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer) } } HistPos = NULL; - buffer.SetString(""); + { + // Work with a copy of command to avoid side effects caused by + // exception raised during execution, like with 'error' CCMD. + // It's problematic to maintain FString's lock symmetry. + static TArray command; + const size_t length = buffer.Text.Len(); + + command.Resize(length + 1); + memcpy(&command[0], buffer.Text.GetChars(), length); + command[length] = '\0'; + + buffer.SetString(""); + + AddCommandString(&command[0]); + } TabbedLast = false; TabbedList = false; break; From 36f87b7135afa27dde8e74b457bf03585402c38f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 22 Dec 2016 11:14:13 +0100 Subject: [PATCH 2/9] - removed gl_light_ambient. This really serves no use anymore and is mostly a remnant of old times with dark CRT monitors. The default ambient level was set at 20, meaning a sector light level of 40. This is a value actual levels rarely get to, except when using some lighting effects - but it's for those that the ambient clamping did the most damage. --- src/gl/renderer/gl_lightdata.cpp | 11 ----------- wadsrc/static/menudef.zz | 1 - 2 files changed, 12 deletions(-) diff --git a/src/gl/renderer/gl_lightdata.cpp b/src/gl/renderer/gl_lightdata.cpp index 0dd180dfb..25ad12344 100644 --- a/src/gl/renderer/gl_lightdata.cpp +++ b/src/gl/renderer/gl_lightdata.cpp @@ -46,12 +46,6 @@ int fogdensity; int outsidefogdensity; int skyfog; -CUSTOM_CVAR (Int, gl_light_ambient, 20, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -{ - // ambient of 0 does not work correctly because light level 0 is special. - if (self < 1) self = 1; -} - CVAR(Int, gl_weaponlight, 8, CVAR_ARCHIVE); CUSTOM_CVAR(Bool, gl_enhanced_nightvision, true, CVAR_ARCHIVE|CVAR_NOINITCALL) { @@ -209,11 +203,6 @@ int gl_CalcLightLevel(int lightlevel, int rellight, bool weapon) light=lightlevel; } - if (light>=1; - } return clamp(light+rellight, 0, 255); } diff --git a/wadsrc/static/menudef.zz b/wadsrc/static/menudef.zz index 253f984eb..1261286d6 100644 --- a/wadsrc/static/menudef.zz +++ b/wadsrc/static/menudef.zz @@ -231,7 +231,6 @@ OptionMenu "GLPrefOptions" Option "$GLPREFMNU_SPRBILLBOARD", gl_billboard_mode, "BillboardModes" Option "$GLPREFMNU_SPRBILLFACECAMERA", gl_billboard_faces_camera, "OnOff" Option "$GLPREFMNU_PARTICLESTYLE", gl_particles_style, "Particles" - Slider "$GLPREFMNU_AMBLIGHT", gl_light_ambient, 1.0, 255.0, 5.0 Option "$GLPREFMNU_RENDERQUALITY", gl_render_precise, "Precision" Option "$GLPREFMNU_VRMODE", vr_mode, "VRMode" Option "$GLPREFMNU_VRQUADSTEREO", vr_enable_quadbuffered, "OnOff" From 8a9ea2eda8eeb8e75727cf8fb5f3405545ddc33c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Tue, 20 Dec 2016 13:31:38 -0500 Subject: [PATCH 3/9] - Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows. (cherry picked from commit b3bed807de48069c0454c211ab7f2729d6d41421) --- src/win32/i_system.cpp | 18 ++++++++++++++++++ src/win32/resource.h | 7 +++++++ src/win32/zdoom.rc | 31 +++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index acea7a788..ebb3d8c67 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -127,6 +127,9 @@ static void DestroyCustomCursor(); EXTERN_CVAR(String, language); EXTERN_CVAR (Bool, queryiwad); +// Used on welcome/IWAD screen. +EXTERN_CVAR (Int, vid_renderer) +EXTERN_CVAR (Bool, fullscreen) extern HWND Window, ConWindow, GameTitleWindow; extern HANDLE StdOut; @@ -1159,6 +1162,18 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa newlabel.Format(GAMESIG " %s: %s", GetVersionString(), label); SetWindowText(hDlg, newlabel.GetChars()); } + + // [SP] Upstreamed from Zandronum + char szString[256]; + + // Check the current video settings. + SendDlgItemMessage( hDlg, vid_renderer ? IDC_WELCOME_OPENGL : IDC_WELCOME_SOFTWARE, BM_SETCHECK, BST_CHECKED, 0 ); + SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_SETCHECK, fullscreen ? BST_CHECKED : BST_UNCHECKED, 0 ); + + // Set up our version string. + sprintf(szString, "Version %s.", GetVersionString()); + SetDlgItemText (hDlg, IDC_WELCOME_VERSION, szString); + // Populate the list with all the IWADs found ctrl = GetDlgItem(hDlg, IDC_IWADLIST); for (i = 0; i < NumWads; i++) @@ -1192,6 +1207,9 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa (LOWORD(wParam) == IDC_IWADLIST && HIWORD(wParam) == LBN_DBLCLK)) { SetQueryIWad(hDlg); + // [SP] Upstreamed from Zandronum + vid_renderer = SendDlgItemMessage( hDlg, IDC_WELCOME_OPENGL, BM_GETCHECK, 0, 0 ) == BST_CHECKED; + fullscreen = SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_GETCHECK, 0, 0 ) == BST_CHECKED; ctrl = GetDlgItem (hDlg, IDC_IWADLIST); EndDialog(hDlg, SendMessage (ctrl, LB_GETCURSEL, 0, 0)); } diff --git a/src/win32/resource.h b/src/win32/resource.h index 6886e83fd..52db9de2e 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -164,3 +164,10 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + +// [SP] Upstreamed from Zandronum +#define IDC_WELCOME_VERSION 4019 // [RC] "Welcome" screen. +#define IDC_WELCOME_OPENGL 4020 +#define IDC_WELCOME_SOFTWARE 4021 +#define IDC_WELCOME_FULLSCREEN 4022 +#define IDI_ICONST 151 diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index 5e2226c6d..e64f27c4d 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -220,6 +220,7 @@ END // Dialog // +/* IDD_IWADDIALOG DIALOGEX 0, 0, 212, 186 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW @@ -233,6 +234,36 @@ BEGIN LTEXT "ZDoom found more than one IWAD present.",IDC_STATIC,5,5,140,8 LTEXT "Select from the list below to determine which one to use:",IDC_STATIC,5,15,200,8 END +*/ +// [SP] Upstreamed from Zandronum +IDD_IWADDIALOG DIALOGEX 0, 0, 224, 236 +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Welcome" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON IDI_ICON1,IDC_STATIC,7,7,32,32 + LTEXT "Welcome to QZDoom!",IDC_STATIC,42,8,180,8 + LTEXT "",IDC_WELCOME_VERSION,42,18,180,8 + GROUPBOX "IWAD selection",IDC_STATIC,8,32,224-16,102 + LTEXT "Select which game file (IWAD) to run.", IDC_STATIC,12,32+12,190,8 + LISTBOX IDC_IWADLIST,12,32+24,224-24,72,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + GROUPBOX "Video settings",IDC_STATIC,8,138,224-16,48 + LTEXT "Choose how QZDoom will render the game.", IDC_STATIC,12,148,190,8 + CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button", + BS_AUTORADIOBUTTON,12,170,93,10 + CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button", + BS_AUTORADIOBUTTON,12,160,93,10 + CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP, 124,160,48,10 + CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10 + DEFPUSHBUTTON "Play QZDoom",IDOK,8,236-18,90,14 + PUSHBUTTON "Exit",IDCANCEL,224-58,236-18,50,14 + +END IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VSCROLL From 240f973f0cc3769166fa9f33da6f1ae789526fe9 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Tue, 20 Dec 2016 23:03:06 -0500 Subject: [PATCH 4/9] - Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. (cherry picked from commit 578e3270e20f6b0dc6dba7e1001c95a963acc283) --- src/d_main.cpp | 4 +++- src/win32/i_system.cpp | 6 ++++++ src/win32/resource.h | 3 +++ src/win32/zdoom.rc | 11 ++++++----- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 04ba34cbb..2b8ff7437 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -205,6 +205,8 @@ CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL) } } +bool disableautoload = false; // [SP] No auto load + bool wantToRestart; bool DrawFSHUD; // [RH] Draw fullscreen HUD? TArray allwads; @@ -2038,7 +2040,7 @@ static void AddAutoloadFiles(const char *autoname) { LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string - if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload")) + if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload) { FString file; diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index ebb3d8c67..52f054dc2 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -130,6 +130,7 @@ EXTERN_CVAR (Bool, queryiwad); // Used on welcome/IWAD screen. EXTERN_CVAR (Int, vid_renderer) EXTERN_CVAR (Bool, fullscreen) +extern bool disableautoload; extern HWND Window, ConWindow, GameTitleWindow; extern HANDLE StdOut; @@ -1169,6 +1170,7 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa // Check the current video settings. SendDlgItemMessage( hDlg, vid_renderer ? IDC_WELCOME_OPENGL : IDC_WELCOME_SOFTWARE, BM_SETCHECK, BST_CHECKED, 0 ); SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_SETCHECK, fullscreen ? BST_CHECKED : BST_UNCHECKED, 0 ); + SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_SETCHECK, disableautoload ? BST_CHECKED : BST_UNCHECKED, 0 ); // Set up our version string. sprintf(szString, "Version %s.", GetVersionString()); @@ -1210,6 +1212,10 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa // [SP] Upstreamed from Zandronum vid_renderer = SendDlgItemMessage( hDlg, IDC_WELCOME_OPENGL, BM_GETCHECK, 0, 0 ) == BST_CHECKED; fullscreen = SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_GETCHECK, 0, 0 ) == BST_CHECKED; + + // [SP] This is our's. + disableautoload = SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_GETCHECK, 0, 0 ) == BST_CHECKED; + ctrl = GetDlgItem (hDlg, IDC_IWADLIST); EndDialog(hDlg, SendMessage (ctrl, LB_GETCURSEL, 0, 0)); } diff --git a/src/win32/resource.h b/src/win32/resource.h index 52db9de2e..937a73658 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -171,3 +171,6 @@ #define IDC_WELCOME_SOFTWARE 4021 #define IDC_WELCOME_FULLSCREEN 4022 #define IDI_ICONST 151 + +// [SP] This is our's. +#define IDC_WELCOME_NOAUTOLOAD 4023 diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index e64f27c4d..8b29aef9e 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -236,7 +236,7 @@ BEGIN END */ // [SP] Upstreamed from Zandronum -IDD_IWADDIALOG DIALOGEX 0, 0, 224, 236 +IDD_IWADDIALOG DIALOGEX 0, 0, 224, 246 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW @@ -258,11 +258,12 @@ BEGIN BS_AUTORADIOBUTTON,12,160,93,10 CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 124,160,48,10 - CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", + CONTROL "Disable autoload",IDC_WELCOME_NOAUTOLOAD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10 - DEFPUSHBUTTON "Play QZDoom",IDOK,8,236-18,90,14 - PUSHBUTTON "Exit",IDCANCEL,224-58,236-18,50,14 - + CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,72,202,87,10 + DEFPUSHBUTTON "Play QZDoom",IDOK,8,246-18,90,14 + PUSHBUTTON "Exit",IDCANCEL,224-58,246-18,50,14 END IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404 From 5fa6094e4f74e62d431179fe6634fe9ca28a3a51 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Tue, 20 Dec 2016 23:09:15 -0500 Subject: [PATCH 5/9] - Changed QZDoom messages to GZDoom. --- src/win32/zdoom.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index 8b29aef9e..123f744a2 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -244,14 +244,14 @@ CAPTION "Welcome" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_ICON1,IDC_STATIC,7,7,32,32 - LTEXT "Welcome to QZDoom!",IDC_STATIC,42,8,180,8 + LTEXT "Welcome to GZDoom!",IDC_STATIC,42,8,180,8 LTEXT "",IDC_WELCOME_VERSION,42,18,180,8 GROUPBOX "IWAD selection",IDC_STATIC,8,32,224-16,102 LTEXT "Select which game file (IWAD) to run.", IDC_STATIC,12,32+12,190,8 LISTBOX IDC_IWADLIST,12,32+24,224-24,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Video settings",IDC_STATIC,8,138,224-16,48 - LTEXT "Choose how QZDoom will render the game.", IDC_STATIC,12,148,190,8 + LTEXT "Choose how GZDoom will render the game.", IDC_STATIC,12,148,190,8 CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button", BS_AUTORADIOBUTTON,12,170,93,10 CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button", @@ -262,7 +262,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10 CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,72,202,87,10 - DEFPUSHBUTTON "Play QZDoom",IDOK,8,246-18,90,14 + DEFPUSHBUTTON "Play GZDoom",IDOK,8,246-18,90,14 PUSHBUTTON "Exit",IDCANCEL,224-58,246-18,50,14 END From cb2c1e591a009bb419779e598c6623321643181b Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 21 Dec 2016 02:16:44 -0500 Subject: [PATCH 6/9] - Added Zandronum-specific copyright notices for IWAD picker. --- src/win32/i_system.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 52f054dc2..2dc6c4d3d 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -4,6 +4,8 @@ ** **--------------------------------------------------------------------------- ** Copyright 1998-2009 Randy Heit +** Copyright (C) 2007-2012 Skulltag Development Team +** Copyright (C) 2007-2016 Zandronum Development Team ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without @@ -17,6 +19,15 @@ ** documentation and/or other materials provided with the distribution. ** 3. The name of the author may not be used to endorse or promote products ** derived from this software without specific prior written permission. +** 4. Redistributions in any form must be accompanied by information on how to +** obtain complete source code for the software and any accompanying software +** that uses the software. The source code must either be included in the +** distribution or be available for no more than the cost of distribution plus +** a nominal fee, and must be freely redistributable under reasonable +** conditions. For an executable file, complete source code means the source +** code for all modules it contains. It does not include source code for +** modules or files that typically accompany the major components of the +** operating system on which the executable file runs. ** ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES From 38103281939f71adaf28acba1a0a0d7c0c06ff1f Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 21 Dec 2016 05:11:29 -0500 Subject: [PATCH 7/9] - More options for the IWAD picker. - Rearranged some options around a bit. - Disable auto load is now an archived cvar. # Conflicts: # src/win32/zdoom.rc --- src/d_main.cpp | 22 ++++++++++++++++++++- src/win32/i_system.cpp | 11 +++++++++-- src/win32/resource.h | 5 +++-- src/win32/zdoom.rc | 45 +++++++++++++++++++----------------------- 4 files changed, 53 insertions(+), 30 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 2b8ff7437..1ea2d2707 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -205,7 +205,10 @@ CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL) } } -bool disableautoload = false; // [SP] No auto load +// Controlled by startup dialog +CVAR (Bool, disableautoload, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) +CVAR (Bool, autoloadbrightmaps, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) +CVAR (Bool, autoloadlights, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) bool wantToRestart; bool DrawFSHUD; // [RH] Draw fullscreen HUD? @@ -2040,6 +2043,23 @@ static void AddAutoloadFiles(const char *autoname) { LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string + // [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices + if (!(gameinfo.flags & GI_SHAREWARE)) + { + if (autoloadlights) + { + const char *lightswad = BaseFileSearch ("lights.pk3", NULL); + if (lightswad) + D_AddFile (allwads, lightswad); + } + if (autoloadbrightmaps) + { + const char *bmwad = BaseFileSearch ("brightmaps.pk3", NULL); + if (bmwad) + D_AddFile (allwads, bmwad); + } + } + if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload) { FString file; diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 2dc6c4d3d..f07fb8f1d 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -141,7 +141,9 @@ EXTERN_CVAR (Bool, queryiwad); // Used on welcome/IWAD screen. EXTERN_CVAR (Int, vid_renderer) EXTERN_CVAR (Bool, fullscreen) -extern bool disableautoload; +EXTERN_CVAR (Bool, disableautoload) +EXTERN_CVAR (Bool, autoloadlights) +EXTERN_CVAR (Bool, autoloadbrightmaps) extern HWND Window, ConWindow, GameTitleWindow; extern HANDLE StdOut; @@ -1181,7 +1183,11 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa // Check the current video settings. SendDlgItemMessage( hDlg, vid_renderer ? IDC_WELCOME_OPENGL : IDC_WELCOME_SOFTWARE, BM_SETCHECK, BST_CHECKED, 0 ); SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_SETCHECK, fullscreen ? BST_CHECKED : BST_UNCHECKED, 0 ); + + // [SP] This is our's SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_SETCHECK, disableautoload ? BST_CHECKED : BST_UNCHECKED, 0 ); + SendDlgItemMessage( hDlg, IDC_WELCOME_LIGHTS, BM_SETCHECK, autoloadlights ? BST_CHECKED : BST_UNCHECKED, 0 ); + SendDlgItemMessage( hDlg, IDC_WELCOME_BRIGHTMAPS, BM_SETCHECK, autoloadbrightmaps ? BST_CHECKED : BST_UNCHECKED, 0 ); // Set up our version string. sprintf(szString, "Version %s.", GetVersionString()); @@ -1226,7 +1232,8 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa // [SP] This is our's. disableautoload = SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_GETCHECK, 0, 0 ) == BST_CHECKED; - + autoloadlights = SendDlgItemMessage( hDlg, IDC_WELCOME_LIGHTS, BM_GETCHECK, 0, 0 ) == BST_CHECKED; + autoloadbrightmaps = SendDlgItemMessage( hDlg, IDC_WELCOME_BRIGHTMAPS, BM_GETCHECK, 0, 0 ) == BST_CHECKED; ctrl = GetDlgItem (hDlg, IDC_IWADLIST); EndDialog(hDlg, SendMessage (ctrl, LB_GETCURSEL, 0, 0)); } diff --git a/src/win32/resource.h b/src/win32/resource.h index 937a73658..cf41b6f1f 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -158,7 +158,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 150 +#define _APS_NEXT_RESOURCE_VALUE 151 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1084 #define _APS_NEXT_SYMED_VALUE 101 @@ -170,7 +170,8 @@ #define IDC_WELCOME_OPENGL 4020 #define IDC_WELCOME_SOFTWARE 4021 #define IDC_WELCOME_FULLSCREEN 4022 -#define IDI_ICONST 151 // [SP] This is our's. #define IDC_WELCOME_NOAUTOLOAD 4023 +#define IDC_WELCOME_LIGHTS 4024 +#define IDC_WELCOME_BRIGHTMAPS 4025 diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index 123f744a2..5c85a4e21 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -120,9 +120,9 @@ BEGIN IDD_IWADDIALOG, DIALOG BEGIN LEFTMARGIN, 5 - RIGHTMARGIN, 205 + RIGHTMARGIN, 222 TOPMARGIN, 7 - BOTTOMMARGIN, 179 + BOTTOMMARGIN, 242 END IDD_EAXPROPERTYLIST, DIALOG @@ -237,33 +237,28 @@ END */ // [SP] Upstreamed from Zandronum IDD_IWADDIALOG DIALOGEX 0, 0, 224, 246 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Welcome" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON IDI_ICON1,IDC_STATIC,7,7,32,32 - LTEXT "Welcome to GZDoom!",IDC_STATIC,42,8,180,8 - LTEXT "",IDC_WELCOME_VERSION,42,18,180,8 - GROUPBOX "IWAD selection",IDC_STATIC,8,32,224-16,102 - LTEXT "Select which game file (IWAD) to run.", IDC_STATIC,12,32+12,190,8 - LISTBOX IDC_IWADLIST,12,32+24,224-24,72,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP - GROUPBOX "Video settings",IDC_STATIC,8,138,224-16,48 - LTEXT "Choose how GZDoom will render the game.", IDC_STATIC,12,148,190,8 - CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button", - BS_AUTORADIOBUTTON,12,170,93,10 - CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button", - BS_AUTORADIOBUTTON,12,160,93,10 - CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP, 124,160,48,10 - CONTROL "Disable autoload",IDC_WELCOME_NOAUTOLOAD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10 - CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,72,202,87,10 - DEFPUSHBUTTON "Play GZDoom",IDOK,8,246-18,90,14 - PUSHBUTTON "Exit",IDCANCEL,224-58,246-18,50,14 + ICON IDI_ICON1,IDC_STATIC,7,7,21,20 + LTEXT "Welcome to GZDoom!",IDC_STATIC,42,8,180,8 + LTEXT "",IDC_WELCOME_VERSION,42,18,180,8 + GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,102 + LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8 + LISTBOX IDC_IWADLIST,12,56,200,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Video settings",IDC_STATIC,8,138,208,48 + LTEXT "Choose how GZDoom will render the game.",IDC_STATIC,12,148,190,8 + CONTROL "Hardware (OpenGL)",IDC_WELCOME_OPENGL,"Button",BS_AUTORADIOBUTTON,12,170,93,10 + CONTROL "Software (Doom)",IDC_WELCOME_SOFTWARE,"Button",BS_AUTORADIOBUTTON,12,160,93,10 + CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,160,48,10 + CONTROL "Disable autoload",IDC_WELCOME_NOAUTOLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,39,65,10 + CONTROL "Lights.pk3",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,192,51,10 + CONTROL "Brightmaps.pk3",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,192,65,10 + CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,73,211,87,10 + DEFPUSHBUTTON "Play GZDoom",IDOK,8,228,90,14 + PUSHBUTTON "Exit",IDCANCEL,166,228,50,14 END IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404 From 18242ab0cf99dd29c5a6e6013752c6637646257e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 22 Dec 2016 11:28:04 +0100 Subject: [PATCH 8/9] - removed obsolete project files from VC++ 2005. --- wadsrc_bm/brightmaps.vcproj | 121 ------------------------------------ wadsrc_lights/lights.vcproj | 121 ------------------------------------ 2 files changed, 242 deletions(-) delete mode 100644 wadsrc_bm/brightmaps.vcproj delete mode 100644 wadsrc_lights/lights.vcproj diff --git a/wadsrc_bm/brightmaps.vcproj b/wadsrc_bm/brightmaps.vcproj deleted file mode 100644 index eaf6a4729..000000000 --- a/wadsrc_bm/brightmaps.vcproj +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wadsrc_lights/lights.vcproj b/wadsrc_lights/lights.vcproj deleted file mode 100644 index b3b2cc5d4..000000000 --- a/wadsrc_lights/lights.vcproj +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f6b9944169084ab3841cd5deaeb1cfd46bedcc5e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 22 Dec 2016 11:41:25 +0100 Subject: [PATCH 9/9] - light definition update for Doom and Heretic to reduce the use of strong primary light colors. --- wadsrc_lights/static/doomdefs.txt | 130 ++++++++++----------- wadsrc_lights/static/hticdefs.txt | 188 +++++++++++++++--------------- 2 files changed, 159 insertions(+), 159 deletions(-) diff --git a/wadsrc_lights/static/doomdefs.txt b/wadsrc_lights/static/doomdefs.txt index 4e9f1e760..3690120e3 100644 --- a/wadsrc_lights/static/doomdefs.txt +++ b/wadsrc_lights/static/doomdefs.txt @@ -38,7 +38,7 @@ pointlight ROCKET flickerlight ROCKET_X1 { - color 1.0 0.7 0.0 + color 1.0 0.7 0.5 size 64 secondarySize 72 chance 0.3 @@ -46,7 +46,7 @@ flickerlight ROCKET_X1 flickerlight ROCKET_X2 { - color 0.5 0.1 0.0 + color 0.5 0.3 0.2 size 80 secondarySize 88 chance 0.3 @@ -54,7 +54,7 @@ flickerlight ROCKET_X2 flickerlight ROCKET_X3 { - color 0.3 0.0 0.0 + color 0.3 0.1 0.1 size 96 secondarySize 104 chance 0.3 @@ -72,13 +72,13 @@ object Rocket // Plasma pointlight PLASMABALL { - color 0.0 0.1 1.0 + color 0.5 0.5 1.0 size 56 } flickerlight PLASMA_X1 { - color 0.2 0.2 1.0 + color 0.5 0.5 1.0 size 64 secondarySize 72 chance 0.4 @@ -86,7 +86,7 @@ flickerlight PLASMA_X1 flickerlight PLASMA_X2 { - color 0.2 0.2 0.8 + color 0.4 0.4 0.8 size 80 secondarySize 88 chance 0.4 @@ -94,7 +94,7 @@ flickerlight PLASMA_X2 flickerlight PLASMA_X3 { - color 0.1 0.1 0.5 + color 0.25 0.25 0.5 size 64 secondarySize 72 chance 0.4 @@ -102,7 +102,7 @@ flickerlight PLASMA_X3 flickerlight PLASMA_X4 { - color 0.0 0.0 0.2 + color 0.1 0.1 0.2 size 8 secondarySize 16 chance 0.4 @@ -215,13 +215,13 @@ object PlasmaBall2 // BFG pointlight BFGBALL { - color 0.0 1.0 0.0 + color 0.5 1.0 0.5 size 80 } flickerlight BFGBALL_X1 { - color 0.2 1.0 0.2 + color 0.5 1.0 0.5 size 80 secondarySize 88 chance 0.3 @@ -229,7 +229,7 @@ flickerlight BFGBALL_X1 flickerlight BFGBALL_X2 { - color 0.3 1.0 0.3 + color 0.6 1.0 0.6 size 104 secondarySize 112 chance 0.3 @@ -237,7 +237,7 @@ flickerlight BFGBALL_X2 flickerlight BFGBALL_X3 { - color 0.5 1.0 0.5 + color 0.7 1.0 0.7 size 120 secondarySize 128 chance 0.3 @@ -245,7 +245,7 @@ flickerlight BFGBALL_X3 flickerlight BFGBALL_X4 { - color 0.2 0.7 0.2 + color 0.4 0.7 0.4 size 56 secondarySize 64 chance 0.3 @@ -353,7 +353,7 @@ object TechLamp // Tall red torch flickerlight2 BIGREDTORCH { - color 1.0 0.3 0.0 + color 1.0 0.5 0.2 size 64 secondarySize 72 interval 0.1 @@ -368,7 +368,7 @@ object RedTorch // Tall green torch flickerlight2 BIGGREENTORCH { - color 0.0 1.0 0.0 + color 0.3 1.0 0.3 size 64 secondarySize 72 interval 0.1 @@ -383,7 +383,7 @@ object GreenTorch // Tall blue torch flickerlight2 BIGBLUETORCH { - color 0.0 0.0 1.0 + color 0.3 0.3 1.0 size 64 secondarySize 72 interval 0.1 @@ -398,7 +398,7 @@ object BlueTorch // Small red torch flickerlight2 SMALLREDTORCH { - color 1.0 0.3 0.0 + color 1.0 0.5 0.2 size 48 secondarySize 54 interval 0.1 @@ -413,7 +413,7 @@ object ShortRedTorch // Small green torch flickerlight2 SMALLGREENTORCH { - color 0.0 1.0 0.0 + color 0.3 1.0 0.3 size 48 secondarySize 54 interval 0.1 @@ -428,7 +428,7 @@ object ShortGreenTorch // Small blue torch flickerlight2 SMALLBLUETORCH { - color 0.0 0.0 1.0 + color 0.3 0.3 1.0 size 48 secondarySize 54 interval 0.1 @@ -443,7 +443,7 @@ object ShortBlueTorch // Burning barrel flickerlight2 FIREBARREL { - color 1.0 0.9 0.0 + color 1.0 0.9 0.4 size 48 secondarySize 54 interval 0.1 @@ -458,7 +458,7 @@ object BurningBarrel // Skulls w/candles flickerlight2 SKULLCANDLES { - color 1.0 1.0 0.0 + color 1.0 1.0 0.3 size 32 secondarySize 34 interval 0.1 @@ -473,7 +473,7 @@ object HeadCandles // Candle pointlight CANDLE { - color 1.0 1.0 0.0 + color 1.0 1.0 0.3 size 16 offset 0 16 0 } @@ -486,7 +486,7 @@ object Candlestick // Candelabra pointlight CANDELABRA { - color 1.0 1.0 0.0 + color 1.0 1.0 0.3 size 48 offset 0 52 0 } @@ -505,7 +505,7 @@ object Candelabra // Soul Sphere pulselight SOULSPHERE { - color 0.0 0.0 1.0 + color 0.3 0.3 1.0 size 40 secondarySize 42 interval 2.0 @@ -520,7 +520,7 @@ object SoulSphere // Invulnerability Sphere pulselight INVULN { - color 0.0 1.0 0.0 + color 0.3 1.0 0.3 size 40 secondarySize 42 interval 2.0 @@ -595,7 +595,7 @@ object HealthBonus // Armour Helmet pulselight ARMORBONUS { - color 0.0 0.6 0.0 + color 0.2 0.6 0.2 size 16 secondarySize 14 interval 1.0 @@ -735,14 +735,14 @@ object DoomPlayer // Doom Imp Fireball pointlight IMPBALL { - color 1.0 0.5 0.0 + color 1.0 0.7 0.4 size 64 } // Doom imp fireball explosion flickerlight IMPBALL_X1 { - color 0.7 0.2 0.0 + color 0.7 0.4 0.25 size 80 secondarySize 88 chance 0.25 @@ -750,7 +750,7 @@ flickerlight IMPBALL_X1 flickerlight IMPBALL_X2 { - color 0.4 0.0 0.0 + color 0.4 0.2 0.1 size 96 secondarySize 104 chance 0.25 @@ -758,7 +758,7 @@ flickerlight IMPBALL_X2 flickerlight IMPBALL_X3 { - color 0.2 0.0 0.0 + color 0.2 0.1 0.0 size 112 secondarySize 120 chance 0.25 @@ -792,7 +792,7 @@ object Spectre // Cacodemon fireball flickerlight CACOBALL { - color 1.0 0.2 0.6 + color 1.0 0.5 0.8 size 56 secondarySize 64 chance 0.5 @@ -800,7 +800,7 @@ flickerlight CACOBALL flickerlight CACOBALL_X1 { - color 0.9 0.1 0.4 + color 0.9 0.4 0.7 size 72 secondarySize 80 chance 0.25 @@ -808,7 +808,7 @@ flickerlight CACOBALL_X1 flickerlight CACOBALL_X2 { - color 0.6 0.0 0.1 + color 0.6 0.3 0.5 size 88 secondarySize 96 chance 0.25 @@ -816,7 +816,7 @@ flickerlight CACOBALL_X2 flickerlight CACOBALL_X3 { - color 0.3 0.0 0.0 + color 0.3 0.1 0.1 size 104 secondarySize 112 chance 0.25 @@ -841,7 +841,7 @@ pointlight BARONBALL flickerlight BARONBALL_X1 { - color 0.0 0.7 0.0 + color 0.6 0.9 0.6 size 80 secondarySize 88 chance 0.25 @@ -849,7 +849,7 @@ flickerlight BARONBALL_X1 flickerlight BARONBALL_X2 { - color 0.0 0.4 0.0 + color 0.45 0.6 0.45 size 96 secondarySize 104 chance 0.25 @@ -857,7 +857,7 @@ flickerlight BARONBALL_X2 flickerlight BARONBALL_X3 { - color 0.0 0.2 0.0 + color 0.2 0.3 0.2 size 112 secondarySize 120 chance 0.25 @@ -876,7 +876,7 @@ object BaronBall // Lost Soul flickerlight LOSTSOUL { - color 1.0 0.3 0.0 + color 1.0 0.6 0.3 size 56 secondarysize 64 chance 0.1 @@ -884,7 +884,7 @@ flickerlight LOSTSOUL flickerlight LOSTSOUL_X1 { - color 0.8 0.3 0.0 + color 0.8 0.5 0.3 size 72 secondarySize 80 chance 0.25 @@ -892,7 +892,7 @@ flickerlight LOSTSOUL_X1 flickerlight LOSTSOUL_X2 { - color 0.6 0.2 0.0 + color 0.6 0.3 0.2 size 88 secondarySize 96 chance 0.25 @@ -944,13 +944,13 @@ object FatShot // Arachnotron Fireball pointlight ARACHPLAS { - color 0.6 1.0 0.0 + color 0.6 1.0 0.4 size 56 } flickerlight ARACHPLAS_X1 { - color 0.4 0.8 0.0 + color 0.4 0.8 0.3 size 72 secondarySize 80 chance 0.3 @@ -958,7 +958,7 @@ flickerlight ARACHPLAS_X1 flickerlight ARACHPLAS_X2 { - color 0.6 0.6 0.0 + color 0.6 0.6 0.3 size 88 secondarySize 96 chance 0.3 @@ -966,7 +966,7 @@ flickerlight ARACHPLAS_X2 flickerlight ARACHPLAS_X3 { - color 0.4 0.4 0.0 + color 0.4 0.4 0.2 size 48 secondarySize 32 chance 0.3 @@ -974,7 +974,7 @@ flickerlight ARACHPLAS_X3 flickerlight ARACHPLAS_X4 { - color 0.2 0.2 0.0 + color 0.2 0.2 0.1 size 24 secondarySize 16 chance 0.3 @@ -995,13 +995,13 @@ object ArachnotronPlasma // Revenant tracer pointlight TRACER { - color 1.0 0.3 0.0 + color 1.0 0.5 0.3 size 48 } flickerlight TRACER_X1 { - color 1.0 0.2 0.0 + color 1.0 0.5 0.2 size 64 secondarySize 72 chance 0.25 @@ -1009,7 +1009,7 @@ flickerlight TRACER_X1 flickerlight TRACER_X2 { - color 0.6 0.0 0.0 + color 0.6 0.3 0.1 size 80 secondarySize 88 chance 0.25 @@ -1017,7 +1017,7 @@ flickerlight TRACER_X2 flickerlight TRACER_X3 { - color 0.3 0.0 0.0 + color 0.3 0.1 0.0 size 96 secondarySize 104 chance 0.25 @@ -1036,7 +1036,7 @@ object RevenantTracer // Arch Vile Fire flickerlight ARCHFIRE1 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.5 size 24 secondarySize 32 chance 0.3 @@ -1045,7 +1045,7 @@ flickerlight ARCHFIRE1 flickerlight ARCHFIRE2 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.5 size 40 secondarySize 48 chance 0.3 @@ -1054,7 +1054,7 @@ flickerlight ARCHFIRE2 flickerlight ARCHFIRE3 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.5 size 64 secondarySize 72 chance 0.3 @@ -1063,7 +1063,7 @@ flickerlight ARCHFIRE3 flickerlight ARCHFIRE4 { - color 0.8 0.8 0.0 + color 0.8 0.8 0.4 size 64 secondarySize 72 chance 0.3 @@ -1072,7 +1072,7 @@ flickerlight ARCHFIRE4 flickerlight ARCHFIRE5 { - color 0.8 0.8 0.0 + color 0.8 0.8 0.4 size 64 secondarySize 72 chance 0.3 @@ -1081,7 +1081,7 @@ flickerlight ARCHFIRE5 flickerlight ARCHFIRE6 { - color 0.6 0.6 0.0 + color 0.6 0.6 0.3 size 48 secondarySize 56 chance 0.3 @@ -1090,7 +1090,7 @@ flickerlight ARCHFIRE6 flickerlight ARCHFIRE7 { - color 0.4 0.4 0.0 + color 0.4 0.4 0.2 size 32 secondarySize 40 chance 0.3 @@ -1099,7 +1099,7 @@ flickerlight ARCHFIRE7 flickerlight ARCHFIRE8 { - color 0.2 0.2 0.0 + color 0.2 0.2 0.1 size 16 secondarySize 24 chance 0.3 @@ -1121,7 +1121,7 @@ object ArchvileFire // Arch-vile flickerlight ARCHATK1 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.4 size 32 secondarySize 48 chance 0.3 @@ -1130,7 +1130,7 @@ flickerlight ARCHATK1 flickerlight ARCHATK2 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.4 size 56 secondarySize 64 chance 0.3 @@ -1139,7 +1139,7 @@ flickerlight ARCHATK2 flickerlight ARCHATK3 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.4 size 56 secondarySize 64 chance 0.3 @@ -1148,7 +1148,7 @@ flickerlight ARCHATK3 flickerlight ARCHATK4 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.4 size 64 secondarySize 72 chance 0.3 @@ -1157,7 +1157,7 @@ flickerlight ARCHATK4 flickerlight ARCHATK5 { - color 1.0 1.0 0.0 + color 1.0 1.0 0.4 size 80 secondarySize 88 chance 0.3 @@ -1166,7 +1166,7 @@ flickerlight ARCHATK5 flickerlight ARCHATK6 { - color 0.7 0.7 0.0 + color 0.7 0.7 0.3 size 96 secondarySize 104 chance 0.3 @@ -1175,7 +1175,7 @@ flickerlight ARCHATK6 flickerlight ARCHATK7 { - color 0.3 0.3 0.0 + color 0.3 0.3 0.1 size 104 secondarySize 112 chance 0.3 @@ -1184,7 +1184,7 @@ flickerlight ARCHATK7 pulselight ARCHRES { - color 0.6 0.0 0.0 + color 0.6 0.3 0.3 size 64 secondarySize 70 interval 0.5 diff --git a/wadsrc_lights/static/hticdefs.txt b/wadsrc_lights/static/hticdefs.txt index 92fa2852d..b8823db66 100644 --- a/wadsrc_lights/static/hticdefs.txt +++ b/wadsrc_lights/static/hticdefs.txt @@ -9,25 +9,25 @@ // Wand puffs pointlight WANDPUFF1 { - color 1.0 1.0 0.0 + color 0.9 0.9 0.5 size 32 } pointlight WANDPUFF2 { - color 0.7 0.7 0.0 + color 0.6 0.6 0.35 size 24 } pointlight WANDPUFF3 { - color 0.4 0.4 0.0 + color 0.3 0.3 0.2 size 16 } pointlight WANDPUFF4 { - color 0.2 0.2 0.0 + color 0.15 0.15 0.1 size 8 } @@ -48,31 +48,31 @@ object GoldWandPuff2 // Tomed wand projectile pointlight WANDBALL { - color 1.0 1.0 0.0 + color 0.9 0.9 0.5 size 24 } pointlight WANDBALL_X1 { - color 0.8 0.8 0.0 + color 0.72 0.72 0.4 size 32 } pointlight WANDBALL_X2 { - color 0.6 0.6 0.0 + color 0.54 0.54 0.3 size 34 } pointlight WANDBALL_X3 { - color 0.4 0.4 0.0 + color 0.36 0.36 0.2 size 36 } pointlight WANDBALL_X4 { - color 0.2 0.2 0.0 + color 0.18 0.18 0.1 size 38 } @@ -90,13 +90,13 @@ object GoldWandFX2 // Crossbow secondary projectile pointlight SMALLBOWBOLT { - color 0.0 1.0 0.0 + color 0.5 1.0 0.5 size 40 } flickerlight SMALLBOWBOLT_X1 { - color 0.0 0.7 0.0 + color 0.35 0.7 0.35 size 48 secondarySize 52 chance 0.3 @@ -104,7 +104,7 @@ flickerlight SMALLBOWBOLT_X1 flickerlight SMALLBOWBOLT_X2 { - color 0.0 0.4 0.0 + color 0.2 0.4 0.2 size 40 secondarySize 44 chance 0.3 @@ -112,7 +112,7 @@ flickerlight SMALLBOWBOLT_X2 flickerlight SMALLBOWBOLT_X3 { - color 0.0 0.2 0.0 + color 0.1 0.2 0.1 size 32 secondarySize 36 chance 0.3 @@ -130,13 +130,13 @@ object CrossbowFX3 // Crossbow primary proectile pointlight BIGBOWBOLT { - color 0.7 1.0 0.0 + color 0.8 1.0 0.5 size 64 } flickerlight BIGBOWBOLT_X1 { - color 0.4 0.8 0.0 + color 0.48 0.8 0.4 size 72 secondarySize 74 chance 0.3 @@ -144,7 +144,7 @@ flickerlight BIGBOWBOLT_X1 flickerlight BIGBOWBOLT_X2 { - color 0.4 0.6 0.0 + color 0.44 0.6 0.3 size 56 secondarySize 64 chance 0.3 @@ -152,7 +152,7 @@ flickerlight BIGBOWBOLT_X2 flickerlight BIGBOWBOLT_X3 { - color 0.2 0.4 0.0 + color 0.22 0.4 0.2 size 32 secondarySize 40 chance 0.3 @@ -276,13 +276,13 @@ object BlasterFX1 // Hellstaff bolt pointlight HELLSTAFFBALL { - color 1.0 0.2 0.2 + color 1.0 0.5 0.5 size 56 } flickerlight HELLSTAFFBALL_X1 { - color 1.0 0.4 0.4 + color 1.0 0.7 0.7 size 56 secondarySize 64 chance 0.3 @@ -290,7 +290,7 @@ flickerlight HELLSTAFFBALL_X1 flickerlight HELLSTAFFBALL_X2 { - color 0.8 0.3 0.3 + color 0.8 0.5 0.5 size 64 secondarySize 72 chance 0.3 @@ -298,7 +298,7 @@ flickerlight HELLSTAFFBALL_X2 flickerlight HELLSTAFFBALL_X3 { - color 0.6 0.2 0.2 + color 0.6 0.3 0.3 size 80 secondarySize 88 chance 0.3 @@ -306,7 +306,7 @@ flickerlight HELLSTAFFBALL_X3 flickerlight HELLSTAFFBALL_X4 { - color 0.4 0.1 0.1 + color 0.4 0.2 0.2 size 88 secondarySize 96 chance 0.3 @@ -314,7 +314,7 @@ flickerlight HELLSTAFFBALL_X4 flickerlight HELLSTAFFBALL_X5 { - color 0.2 0.0 0.0 + color 0.2 0.1 0.1 size 96 secondarySize 104 chance 0.3 @@ -391,7 +391,7 @@ object RainPillar // Phoenix rod shot pointlight PHOENIXSHOT { - color 1.0 0.6 0.0 + color 1.0 0.6 0.4 size 64 } @@ -405,7 +405,7 @@ flickerlight PHOENIX_X1 flickerlight PHOENIX_X2 { - color 1.0 0.6 0.0 + color 1.0 0.6 0.3 size 88 secondarySize 96 chance 0.3 @@ -413,7 +413,7 @@ flickerlight PHOENIX_X2 flickerlight PHOENIX_X3 { - color 0.8 0.6 0.0 + color 0.8 0.6 0.25 size 72 secondarySize 80 chance 0.3 @@ -421,7 +421,7 @@ flickerlight PHOENIX_X3 flickerlight PHOENIX_X4 { - color 0.6 0.4 0.0 + color 0.6 0.4 0.2 size 56 secondarySize 64 chance 0.3 @@ -429,7 +429,7 @@ flickerlight PHOENIX_X4 flickerlight PHOENIX_X5 { - color 0.4 0.2 0.0 + color 0.4 0.2 0.1 size 40 secondarySize 48 chance 0.3 @@ -437,7 +437,7 @@ flickerlight PHOENIX_X5 flickerlight PHOENIX_X6 { - color 0.2 0.0 0.0 + color 0.2 0.1 0.0 size 24 secondarySize 32 chance 0.3 @@ -460,7 +460,7 @@ object PhoenixFX1 // Phoenix rod flamethrower flickerlight PHOENIXFLAME { - color 0.7 0.4 0.0 + color 0.7 0.4 0.2 size 48 secondarySize 56 chance 0.5 @@ -468,7 +468,7 @@ flickerlight PHOENIXFLAME flickerlight PHOENIXFLAME2 { - color 0.5 0.2 0.0 + color 0.5 0.2 0.1 size 24 secondarySize 32 chance 0.5 @@ -494,7 +494,7 @@ object PhoenixFX2 // Mace ball explosion flickerlight MACEBALL_X1 { - color 0.8 0.8 0.2 + color 0.8 0.8 0.4 size 64 secondarySize 72 chance 0.3 @@ -502,7 +502,7 @@ flickerlight MACEBALL_X1 flickerlight MACEBALL_X2 { - color 0.6 0.6 0.1 + color 0.6 0.6 0.3 size 48 secondarySize 56 chance 0.3 @@ -510,7 +510,7 @@ flickerlight MACEBALL_X2 flickerlight MACEBALL_X3 { - color 0.4 0.4 0.0 + color 0.4 0.4 0.2 size 32 secondarySize 40 chance 0.3 @@ -518,7 +518,7 @@ flickerlight MACEBALL_X3 flickerlight MACEBALL_X4 { - color 0.2 0.2 0.0 + color 0.2 0.2 0.1 size 16 secondarySize 24 chance 0.3 @@ -563,13 +563,13 @@ object MaceFX4 // Heretic imp fireball pointlight HIMPBALL { - color 1.0 0.8 0.0 + color 1.0 0.8 0.4 size 32 } flickerlight HIMPBALL_X1 { - color 0.8 0.5 0.0 + color 0.8 0.5 0.33 size 48 secondarySize 56 chance 0.3 @@ -577,7 +577,7 @@ flickerlight HIMPBALL_X1 flickerlight HIMPBALL_X2 { - color 0.6 0.3 0.0 + color 0.6 0.4 0.27 size 40 secondarySize 48 chance 0.3 @@ -606,7 +606,7 @@ object HereticImpBall // Mummy flickerlight MUMMYATK { - color 1.0 1.0 0.0 + color 1.0 1.0 0.5 size 48 secondarySize 56 chance 0.4 @@ -625,7 +625,7 @@ object MummyLeaderGhost // Mummy fireball flickerlight MUMMYBALL { - color 1.0 1.0 0.0 + color 1.0 1.0 0.5 size 40 secondarySize 48 chance 0.4 @@ -633,7 +633,7 @@ flickerlight MUMMYBALL flickerlight MUMMYBALL_X1 { - color 0.7 0.7 0.0 + color 0.7 0.7 0.35 size 48 secondarySize 56 chance 0.4 @@ -641,7 +641,7 @@ flickerlight MUMMYBALL_X1 flickerlight MUMMYBALL_X2 { - color 0.4 0.4 0.0 + color 0.4 0.4 0.2 size 56 secondarySize 64 chance 0.4 @@ -649,7 +649,7 @@ flickerlight MUMMYBALL_X2 flickerlight MUMMYBALL_X3 { - color 0.2 0.2 0.0 + color 0.2 0.2 0.1 size 64 secondarySize 72 chance 0.4 @@ -669,13 +669,13 @@ object MummyFX1 // Green flying axe pointlight GREENAXE { - color 0.0 1.0 0.0 + color 0.4 1.0 0.4 size 32 } flickerlight GREENAXE_X1 { - color 0.0 0.7 0.0 + color 0.3 0.7 0.3 size 32 secondarySize 48 chance 0.3 @@ -683,7 +683,7 @@ flickerlight GREENAXE_X1 flickerlight GREENAXE_X2 { - color 0.0 0.4 0.0 + color 0.2 0.4 0.2 size 48 secondarySize 56 chance 0.3 @@ -711,13 +711,13 @@ object KnightAxe // Red flying axe pointlight REDAXE { - color 1.0 0.0 0.0 + color 1.0 0.5 0.5 size 32 } flickerlight REDAXE_X1 { - color 0.7 0.0 0.0 + color 0.7 0.3 0.3 size 32 secondarySize 48 chance 0.3 @@ -725,7 +725,7 @@ flickerlight REDAXE_X1 flickerlight REDAXE_X2 { - color 0.4 0.0 0.0 + color 0.4 0.2 0.2 size 48 secondarySize 56 chance 0.3 @@ -733,7 +733,7 @@ flickerlight REDAXE_X2 flickerlight REDAXE_X3 { - color 0.2 0.0 0.0 + color 0.2 0.1 0.1 size 56 secondarySize 64 chance 0.3 @@ -752,7 +752,7 @@ object RedAxe // Disciple fireball flickerlight DISCIPLEBALL { - color 1.0 0.0 1.0 + color 1.0 0.5 1.0 size 32 secondarySize 40 chance 0.3 @@ -760,7 +760,7 @@ flickerlight DISCIPLEBALL flickerlight DISCIPLEBALL_X1 { - color 0.7 0.0 0.7 + color 0.7 0.3 0.7 size 16 secondarySize 24 chance 0.3 @@ -768,7 +768,7 @@ flickerlight DISCIPLEBALL_X1 flickerlight DISCIPLEBALL_X2 { - color 0.3 0.0 0.3 + color 0.3 0.17 0.3 size 8 secondarySize 16 chance 0.3 @@ -852,7 +852,7 @@ pointlight FROSTBALL_X2 pointlight FROSTBALL_X3 { - color 0.0 0.0 0.4 + color 0.1 0.1 0.4 size 48 } @@ -891,7 +891,7 @@ object HeadFX2 // Ironlich fire wall flickerlight LICHFIRE { - color 1.0 0.7 0.0 + color 1.0 0.7 0.4 size 48 secondarySize 56 chance 0.5 @@ -899,7 +899,7 @@ flickerlight LICHFIRE flickerlight LICHFIRE_X1 { - color 0.9 0.4 0.0 + color 0.9 0.4 0.3 size 56 secondarySize 64 chance 0.5 @@ -907,7 +907,7 @@ flickerlight LICHFIRE_X1 flickerlight LICHFIRE_X2 { - color 0.7 0.1 0.0 + color 0.7 0.1 0.2 size 48 secondarySize 56 chance 0.5 @@ -915,7 +915,7 @@ flickerlight LICHFIRE_X2 flickerlight LICHFIRE_X3 { - color 0.4 0.0 0.0 + color 0.4 0.1 0.1 size 40 secondarySize 48 chance 0.5 @@ -1000,7 +1000,7 @@ object Beast // Weredragon fireball flickerlight BEASTBALL { - color 1.0 0.4 0.0 + color 1.0 0.5 0.3 size 48 secondarySize 56 chance 0.3 @@ -1008,7 +1008,7 @@ flickerlight BEASTBALL flickerlight BEASTBALL_X1 { - color 0.8 0.2 0.0 + color 0.8 0.4 0.24 size 48 secondarySize 56 chance 0.3 @@ -1016,7 +1016,7 @@ flickerlight BEASTBALL_X1 flickerlight BEASTBALL_X2 { - color 0.6 0.0 0.0 + color 0.6 0.3 0.2 size 40 secondarySize 48 chance 0.3 @@ -1024,7 +1024,7 @@ flickerlight BEASTBALL_X2 flickerlight BEASTBALL_X3 { - color 0.4 0.0 0.0 + color 0.4 0.2 0.1 size 32 secondarySize 40 chance 0.3 @@ -1067,7 +1067,7 @@ flickerlight SNAKESHOT1_X1 flickerlight SNAKESHOT1_X2 { - color 0.4 0.1 0.7 + color 0.4 0.2 0.7 size 24 secondarySize 26 chance 0.3 @@ -1075,7 +1075,7 @@ flickerlight SNAKESHOT1_X2 flickerlight SNAKESHOT1_X3 { - color 0.3 0.0 0.5 + color 0.3 0.1 0.5 size 28 secondarySize 30 chance 0.3 @@ -1105,13 +1105,13 @@ object SnakeProjA // Large ophidian shot pointlight SNAKESHOT2 { - color 1.0 0.6 0.0 + color 1.0 0.6 0.4 size 32 } flickerlight SNAKESHOT2_X1 { - color 1.0 0.6 0.0 + color 1.0 0.6 0.4 size 40 secondarySize 48 chance 0.3 @@ -1119,7 +1119,7 @@ flickerlight SNAKESHOT2_X1 flickerlight SNAKESHOT2_X2 { - color 0.6 0.3 0.0 + color 0.6 0.3 0.25 size 48 secondarySize 52 chance 0.3 @@ -1127,7 +1127,7 @@ flickerlight SNAKESHOT2_X2 flickerlight SNAKESHOT2_X3 { - color 0.3 0.0 0.0 + color 0.3 0.1 0.1 size 44 secondarySize 48 chance 0.3 @@ -1146,7 +1146,7 @@ object SnakeProjB // Maulotaur fireball flickerlight MAULBALL { - color 1.0 0.7 0.0 + color 1.0 0.7 0.5 size 40 secondarySize 48 chance 0.5 @@ -1154,7 +1154,7 @@ flickerlight MAULBALL flickerlight MAULBALL_X1 { - color 0.8 0.6 0.0 + color 0.8 0.6 0.4 size 56 secondarySize 64 chance 0.3 @@ -1162,7 +1162,7 @@ flickerlight MAULBALL_X1 flickerlight MAULBALL_X2 { - color 0.8 0.4 0.0 + color 0.8 0.4 0.3 size 56 secondarySize 64 chance 0.3 @@ -1170,7 +1170,7 @@ flickerlight MAULBALL_X2 flickerlight MAULBALL_X3 { - color 0.6 0.2 0.0 + color 0.6 0.3 0.2 size 40 secondarySize 48 chance 0.3 @@ -1200,7 +1200,7 @@ object MinotaurFX1 // Maulotaur ground flame pulselight MAULFLAME { - color 1.0 0.7 0.0 + color 1.0 0.7 0.5 size 1 secondarySize 64 interval 6.0 @@ -1208,7 +1208,7 @@ pulselight MAULFLAME flickerlight MAULFLAME_X1 { - color 1.0 0.7 0.0 + color 1.0 0.7 0.5 size 48 secondarySize 56 chance 0.3 @@ -1216,7 +1216,7 @@ flickerlight MAULFLAME_X1 flickerlight MAULFLAME_X2 { - color 1.0 0.7 0.0 + color 1.0 0.7 0.5 size 56 secondarySize 64 chance 0.3 @@ -1224,7 +1224,7 @@ flickerlight MAULFLAME_X2 flickerlight MAULFLAME_X3 { - color 0.7 0.4 0.0 + color 0.7 0.4 0.3 size 64 secondarySize 68 chance 0.3 @@ -1232,7 +1232,7 @@ flickerlight MAULFLAME_X3 flickerlight MAULFLAME_X4 { - color 0.5 0.1 0.0 + color 0.5 0.3 0.1 size 68 secondarySize 72 chance 0.3 @@ -1266,7 +1266,7 @@ object MinotaurFX3 // D'Sparil serpent fireball flickerlight SERPENTBALL { - color 1.0 0.95 0.0 + color 1.0 0.95 0.5 size 56 secondarySize 64 chance 0.5 @@ -1274,7 +1274,7 @@ flickerlight SERPENTBALL flickerlight SERPENTBALL_X1 { - color 1.0 0.95 0.0 + color 1.0 0.95 0.5 size 64 secondarySize 72 chance 0.5 @@ -1282,7 +1282,7 @@ flickerlight SERPENTBALL_X1 flickerlight SERPENTBALL_X2 { - color 0.8 0.8 0.0 + color 0.8 0.8 0.4 size 72 secondarySize 80 chance 0.5 @@ -1290,7 +1290,7 @@ flickerlight SERPENTBALL_X2 flickerlight SERPENTBALL_X3 { - color 0.5 0.5 0.0 + color 0.5 0.5 0.25 size 88 secondarySize 96 chance 0.5 @@ -1298,7 +1298,7 @@ flickerlight SERPENTBALL_X3 flickerlight SERPENTBALL_X4 { - color 0.2 0.2 0.0 + color 0.2 0.2 0.1 size 96 secondarySize 104 chance 0.5 @@ -1320,7 +1320,7 @@ object SorcererFX1 // D'Sparil blue bolt flickerlight DSPARILBALL { - color 0.3 0.3 1.0 + color 0.5 0.5 1.0 size 56 secondarySize 64 chance 0.5 @@ -1328,7 +1328,7 @@ flickerlight DSPARILBALL flickerlight DSPARILBALL_X1 { - color 0.3 0.3 1.0 + color 0.5 0.5 1.0 size 64 secondarySize 72 chance 0.3 @@ -1336,7 +1336,7 @@ flickerlight DSPARILBALL_X1 flickerlight DSPARILBALL_X2 { - color 0.2 0.2 0.8 + color 0.4 0.4 0.8 size 80 secondarySize 88 chance 0.3 @@ -1344,7 +1344,7 @@ flickerlight DSPARILBALL_X2 flickerlight DSPARILBALL_X3 { - color 0.1 0.1 0.6 + color 0.3 0.3 0.6 size 88 secondarySize 92 chance 0.3 @@ -1352,7 +1352,7 @@ flickerlight DSPARILBALL_X3 flickerlight DSPARILBALL_X4 { - color 0.0 0.0 0.4 + color 0.2 0.2 0.4 size 82 secondarySize 86 chance 0.3 @@ -1360,7 +1360,7 @@ flickerlight DSPARILBALL_X4 flickerlight DSPARILBALL_X5 { - color 0.0 0.0 0.2 + color 0.1 0.1 0.2 size 82 secondarySize 86 chance 0.3 @@ -1503,7 +1503,7 @@ object Pod // Big volcano fireball flickerlight VOLCANOBALL1 { - color 1.0 0.5 0.0 + color 1.0 0.7 0.5 size 56 secondarySize 64 chance 0.5 @@ -1574,7 +1574,7 @@ object KeyGizmoGreen // Time bomb explosion flickerlight TIMEBOMB_X1 { - color 1.0 0.6 0.0 + color 1.0 0.6 0.4 size 48 secondarySize 56 chance 0.3 @@ -1582,7 +1582,7 @@ flickerlight TIMEBOMB_X1 flickerlight TIMEBOMB_X1 { - color 0.8 0.4 0.0 + color 0.8 0.4 0.3 size 56 secondarySize 64 chance 0.3 @@ -1590,7 +1590,7 @@ flickerlight TIMEBOMB_X1 flickerlight TIMEBOMB_X1 { - color 0.6 0.2 0.0 + color 0.6 0.3 0.2 size 64 secondarySize 72 chance 0.3 @@ -1598,7 +1598,7 @@ flickerlight TIMEBOMB_X1 flickerlight TIMEBOMB_X1 { - color 0.4 0.0 0.0 + color 0.4 0.2 0.1 size 72 secondarySize 80 chance 0.3 @@ -1606,7 +1606,7 @@ flickerlight TIMEBOMB_X1 flickerlight TIMEBOMB_X1 { - color 0.2 0.0 0.0 + color 0.2 0.1 0.0 size 80 secondarySize 88 chance 0.3