zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
gzdoom/src/d_main.cpp

3841 lines
101 KiB
C++
Raw Normal View History

Normalize line endings
2016-03-01 15:47:10 +00:00
//-----------------------------------------------------------------------------
- removed all Doom Source license and all default Raven copyright headers and replaced them with GPLv3. Also fixed the license in a few other files. For some files that had the Doom Source license attached but saw heavy external contributions over the years I added a special note to license all original ZDoom code under BSD.
2017-04-17 11:33:19 +00:00
// Copyright 1993-1996 id Software
// Copyright 1999-2016 Randy Heit
// Copyright 2002-2016 Christoph Oelckers
Normalize line endings
2016-03-01 15:47:10 +00:00
//
- removed all Doom Source license and all default Raven copyright headers and replaced them with GPLv3. Also fixed the license in a few other files. For some files that had the Doom Source license attached but saw heavy external contributions over the years I added a special note to license all original ZDoom code under BSD.
2017-04-17 11:33:19 +00:00
// 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, either version 3 of the License, or
// (at your option) any later version.
Normalize line endings
2016-03-01 15:47:10 +00:00
//
- removed all Doom Source license and all default Raven copyright headers and replaced them with GPLv3. Also fixed the license in a few other files. For some files that had the Doom Source license attached but saw heavy external contributions over the years I added a special note to license all original ZDoom code under BSD.
2017-04-17 11:33:19 +00:00
// This program is distributed in the hope that it will be useful,
Normalize line endings
2016-03-01 15:47:10 +00:00
// but WITHOUT ANY WARRANTY; without even the implied warranty of
- removed all Doom Source license and all default Raven copyright headers and replaced them with GPLv3. Also fixed the license in a few other files. For some files that had the Doom Source license attached but saw heavy external contributions over the years I added a special note to license all original ZDoom code under BSD.
2017-04-17 11:33:19 +00:00
// 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/
Normalize line endings
2016-03-01 15:47:10 +00:00
//
//
// DESCRIPTION:
// DOOM main program (D_DoomMain) and game loop (D_DoomLoop),
// plus functions to determine game mode (shareware, registered),
// parse command line parameters, configure game parameters (turbo),
// and call the startup functions.
//
//-----------------------------------------------------------------------------
// HEADER FILES ------------------------------------------------------------
- Fixed missing include due to non conformant preprocessor in VS.
2018-06-18 11:39:23 +00:00
#ifdef _WIN32
#include <direct.h>
#endif
Normalize line endings
2016-03-01 15:47:10 +00:00
#ifdef HAVE_FPU_CONTROL
#include <fpu_control.h>
#endif
#if defined(__unix__) || defined(__APPLE__)
#include <unistd.h>
#endif
#include <math.h>
#include <assert.h>
- moved more code to 'common'. This is all low level utilities with no dependencies on game logic. Having this in a separate directory makes sharing with Raze a lot easier.
2020-04-11 10:56:55 +00:00
#include "engineerrors.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed compilation in debug mode. - moved timer definitions into their own header/source files. d_main is not the right place for this. - removed some leftover cruft from the old timer code.
2017-11-12 08:06:40 +00:00
#include "i_time.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
#include "d_gui.h"
#include "m_random.h"
#include "doomdef.h"
#include "doomstat.h"
#include "gstrings.h"
- moved file system implementation to 'common'.
2020-04-11 11:36:23 +00:00
#include "filesystem.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
#include "s_sound.h"
#include "v_video.h"
#include "intermission/intermission.h"
#include "f_wipe.h"
#include "m_argv.h"
#include "m_misc.h"
- split game dependent parts out of menudef.cpp.
2020-06-13 22:27:32 +00:00
#include "menu.h"
#include "doommenu.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
#include "c_console.h"
#include "c_dispatch.h"
#include "i_sound.h"
#include "i_video.h"
#include "g_game.h"
#include "hu_stuff.h"
#include "wi_stuff.h"
#include "st_stuff.h"
#include "am_map.h"
#include "p_setup.h"
#include "r_utility.h"
#include "r_sky.h"
#include "d_main.h"
#include "d_dehacked.h"
#include "cmdlib.h"
#include "v_text.h"
#include "gi.h"
- moved the global 'no dynamic lights' variable to FLevelLocals so that it is outside renderer specific data.
2018-05-03 19:27:45 +00:00
#include "a_dynlight.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
#include "gameconfigfile.h"
#include "sbar.h"
#include "decallib.h"
#include "version.h"
#include "st_start.h"
#include "teaminfo.h"
#include "hardware.h"
#include "sbarinfo.h"
#include "d_net.h"
#include "d_event.h"
#include "d_netinf.h"
#include "m_cheat.h"
#include "m_joy.h"
- made video base code game independent
2020-04-28 15:22:17 +00:00
#include "v_draw.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
#include "po_man.h"
#include "p_local.h"
#include "autosegs.h"
#include "fragglescript/t_fs.h"
- refactored global sides array to be more VM friendly. - moved FLevelLocals to its own header to resolve some circular include conflicts.
2017-01-08 17:45:30 +00:00
#include "g_levellocals.h"
Added: prototype event system
2017-01-22 00:33:53 +00:00
#include "events.h"
- moved the VM types into their own file and only include it where really needed.
2017-04-12 23:12:04 +00:00
#include "vm.h"
#include "types.h"
- moved the I_Error prototypes to doomerrors.h to avoid having to include the low level system header for this.
2019-01-31 18:38:04 +00:00
#include "i_system.h"
- started cleaning up the contents of the g_shared directory, starting with a_dynlight.cpp This is supposed to be come the place where all pure play code should be placed, but for that all CVARs and CCMDs and other things that do not directly handle play data should be taken out to make code reviewing easier. These now get collected in two separate files, g_cvars.cpp and g_dumpinfo.cpp respectively. The sole ZScript property in here has also been moved - to thingdef_properties.cpp.
2019-01-31 01:05:16 +00:00
#include "g_cvars.h"
- Added auto-detection scheme for r_vanillatrans It now works the following way: (0) - Force off (ZDoom defaults) (1) - Force on (Doom defaults) (2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default) (3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-04 00:00:53 +00:00
#include "r_data/r_vanillatrans.h"
- split off all music code from s_sound.cpp
2019-08-23 15:15:19 +00:00
#include "s_music.h"
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
#include "swrenderer/r_swcolormaps.h"
- moved most basic utility code without any dependencies on the rest of the engine to 'common' directory. Again the objective is easier sharing with Raze.
2020-04-11 10:59:55 +00:00
#include "findfile.h"
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
#include "md5.h"
- separated the button code from c_dispatch. Two separate features justify two separate files.
2020-04-11 16:00:10 +00:00
#include "c_buttons.h"
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
#include "d_buttons.h"
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
#include "i_interface.h"
- split animation management out of the texture manager into a separate class.
2020-04-11 16:54:54 +00:00
#include "animations.h"
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
#include "texturemanager.h"
#include "formats/multipatchtexture.h"
- took InitializeDefaults out of PClass and moved it to PClassActor. Like so many other parts, this created a hard dependency of the low level code on very invasive game content.
2020-04-11 17:25:32 +00:00
#include "scriptutil.h"
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
#include "v_palette.h"
- fixed checkForHacks placement.
2020-04-19 17:52:03 +00:00
#include "texturemanager.h"
- moved the remaining core parts of the GL renderer to 'common'.
2020-04-29 15:19:17 +00:00
#include "hw_clock.h"
- moved RenderView out of the framebuffer classes to complete the consolidation of the renderer's entry points.
2020-04-25 15:58:26 +00:00
#include "hwrenderer/scene/hw_drawinfo.h"
- moved Doom specific font init code out of the backend.
2021-05-29 13:24:05 +00:00
#include "doomfont.h"
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed compilation of Linux targets
2020-04-12 08:03:01 +00:00
#ifdef __unix__
#include "i_system.h" // for SHARE_DIR
#endif // __unix__
Normalize line endings
2016-03-01 15:47:10 +00:00
EXTERN_CVAR(Bool, hud_althud)
- disable the wipe code entirely when a stereo3D mode is active. This simply cannot work right so let's better outright disable it.
2018-06-24 07:32:46 +00:00
EXTERN_CVAR(Int, vr_mode)
- add cvar 'cl_disableinvertedcolormap' - changes the invulnerability… (#972) * - add cvar 'cl_disableinvertedcolormap' - changes the invulnerability sphere to instead be a regular desaturated colormap that transitions from deep blue to pale yellow * - add menu option for cl_disableinvertedcolormap * - added customization for invulnerability colormap * - fixed custom colormap being calculated incorrectly * - disable custom invulnerability map before the main game loop
2019-11-26 12:46:18 +00:00
EXTERN_CVAR(Bool, cl_customizeinvulmap)
- moved a few files from 'rendering' to 'common'.
2020-04-25 19:52:21 +00:00
EXTERN_CVAR(Bool, log_vgafont)
EXTERN_CVAR(Bool, dlg_vgafont)
- backend update from Raze.
2022-01-11 16:19:16 +00:00
CVAR(Int, vid_renderer, 1, 0) // for some stupid mods which threw caution out of the window...
- moved a few files from 'rendering' to 'common'.
2020-04-25 19:52:21 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
void DrawHUD();
- most stat stuff done.
2018-02-13 22:06:59 +00:00
void D_DoAnonStats();
- small fix
2019-10-01 13:24:17 +00:00
void I_DetectOS();
- palette related fixes.
2020-04-11 17:18:47 +00:00
void UpdateGenericUI(bool cvar);
- most stat stuff done.
2018-02-13 22:06:59 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
// MACROS ------------------------------------------------------------------
// TYPES -------------------------------------------------------------------
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
- added I_FriendlyWindowTitle cvar, which takes the current game/mod name and uses it as a default window title.
2017-10-31 23:47:56 +00:00
extern void I_SetWindowTitle(const char* caption);
Normalize line endings
2016-03-01 15:47:10 +00:00
extern void ReadStatistics();
extern void M_SetDefaultMode ();
extern void G_NewInit ();
extern void SetupPlayerClasses ();
- fixed: The menu descriptors were not cleared on restart, leaving some menu data behind.
2017-04-18 14:54:06 +00:00
void DeinitMenus();
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
void CloseNetwork();
void P_Shutdown();
void M_SaveDefaultsFinal();
void R_Shutdown();
void I_ShutdownInput();
- cleaned up c_console.cpp to be moved into 'common'.
2020-10-25 11:18:06 +00:00
void SetConsoleNotifyBuffer();
- add steamappid field for DRPC
2022-03-10 05:03:50 +00:00
void I_UpdateDiscordPresence(bool SendPresence, const char* curstatus, const char* appid, const char* steamappid);
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
const FIWADInfo *D_FindIWAD(TArray<FString> &wadfiles, const char *iwad, const char *basewad);
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
- refactored the exit calls out of the networking code These ones were particularly bad examples of misusing the exit handlers by temporarily installing one themselves and then calling exit to clean stuff up. Now they just return an error code to D_DoomMain to perform a regular exit.
2019-10-06 22:55:14 +00:00
bool D_CheckNetGame ();
Normalize line endings
2016-03-01 15:47:10 +00:00
void D_ProcessEvents ();
void G_BuildTiccmd (ticcmd_t* cmd);
void D_DoAdvanceDemo ();
void D_LoadWadSettings ();
- moved dynamic lights out of the GL code into the common game code. Since the true color software renderer also handles them there is no point keeping them on the GL side. This also optimized how they are stored, because we no longer need to be aware of a base engine which doesn't have them.
2017-03-12 15:56:00 +00:00
void ParseGLDefs();
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
void DrawFullscreenSubtitle(const char *text);
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
void D_Cleanup();
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
void FreeSBarInfoScript();
- update window title with current level name
2019-12-25 14:52:57 +00:00
void I_UpdateWindowTitle();
- some cleanup on music code. * change the license of the main file because there is no more id-based code here licensed under the GPL. * moved VM interface definition out of the implementation. * moved idmus CCMD out of implementation because it is dependent on Doom level definitions. * moved s_music.cpp into the music folder with the rest of the music code.
2020-04-11 16:23:15 +00:00
void S_ParseMusInfo();
- split defcvars parser into its own file
2021-09-05 12:18:40 +00:00
void D_GrabCVarDefaults();
Normalize line endings
2016-03-01 15:47:10 +00:00
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
void D_DoomLoop ();
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
EXTERN_CVAR (Float, turbo)
EXTERN_CVAR (Bool, freelook)
EXTERN_CVAR (Float, m_pitch)
EXTERN_CVAR (Float, m_yaw)
EXTERN_CVAR (Bool, invertmouse)
Add option to invert mouse x
2020-03-25 03:21:26 +00:00
EXTERN_CVAR (Bool, invertmousex)
Normalize line endings
2016-03-01 15:47:10 +00:00
EXTERN_CVAR (Bool, lookstrafe)
EXTERN_CVAR (Int, screenblocks)
EXTERN_CVAR (Bool, sv_cheats)
EXTERN_CVAR (Bool, sv_unlimited_pickup)
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
EXTERN_CVAR (Bool, r_drawplayersprites)
EXTERN_CVAR (Bool, show_messages)
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
EXTERN_CVAR(Bool, ticker)
Normalize line endings
2016-03-01 15:47:10 +00:00
extern bool setmodeneeded;
extern bool demorecording;
- moved out the Doom specific parts from menu.cpp and messagebox.cpp.
2020-06-13 20:43:35 +00:00
bool M_DemoNoPlay; // [RH] if true, then skip any demos in the loop
Normalize line endings
2016-03-01 15:47:10 +00:00
extern bool insave;
- moved all GLDEFS parsing into a dedicated source file. - split gl_postprocessshader.h in two so that the hardware independent part can be used by GLDEFS without pulling in all of OpenGL.
2018-04-02 10:28:20 +00:00
extern TDeletingArray<FLightDefaults *> LightDefaults;
- moved out the Doom specific parts from menu.cpp and messagebox.cpp.
2020-06-13 20:43:35 +00:00
extern FName MessageBoxClass;
Normalize line endings
2016-03-01 15:47:10 +00:00
- missed the index.
2021-09-23 09:41:48 +00:00
const char* iwad_folders[14] = { "flats/", "textures/", "hires/", "sprites/", "voxels/", "colormaps/", "acs/", "maps/", "voices/", "patches/", "graphics/", "sounds/", "music/", "materials/"};
Fix single top level filter folder not being read I have no idea why the missing comma broke it in this particular way...
2020-05-03 06:22:44 +00:00
const char* iwad_reserved[12] = { "mapinfo", "zmapinfo", "gameinfo", "sndinfo", "sbarinfo", "menudef", "gldefs", "animdefs", "decorate", "zscript", "iwadinfo", "maps/" };
- fixed setup of IPK3's where all content is in a subdirectory. These never received the file name list that was needed to eliminate this directory from internal paths.
2020-04-19 11:04:29 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
Make i_timescale cvar virtual Changing i_timescale in a netgame would cause its callback to recurse into itself infinitely. CVAR_VIRTUAL prevents this.
2021-03-23 20:59:40 +00:00
CUSTOM_CVAR(Float, i_timescale, 1.0f, CVAR_NOINITCALL | CVAR_VIRTUAL)
- moved high level code out of i_time.cpp.
2020-03-18 12:58:10 +00:00
{
if (netgame)
{
Printf("Time scale cannot be changed in net games.\n");
self = 1.0f;
}
else if (self >= 0.05f)
{
I_FreezeTime(true);
TimeScale = self;
I_FreezeTime(false);
}
else
{
Printf("Time scale must be at least 0.05!\n");
}
}
Normalize line endings
2016-03-01 15:47:10 +00:00
// PUBLIC DATA DEFINITIONS -------------------------------------------------
- made video base code game independent
2020-04-28 15:22:17 +00:00
CUSTOM_CVAR(Int, vid_rendermode, 4, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{
if (self < 0 || self > 4)
{
self = 4;
}
else if (self == 2 || self == 3)
{
self = self - 2; // softpoly to software
}
if (usergame)
{
// [SP] Update pitch limits to the netgame/gamesim.
players[consoleplayer].SendPitchLimits();
}
screen->SetTextureFilterMode();
// No further checks needed. All this changes now is which scene drawer the render backend calls.
}
Normalize line endings
2016-03-01 15:47:10 +00:00
CUSTOM_CVAR (Int, fraglimit, 0, CVAR_SERVERINFO)
{
// Check for the fraglimit being hit because the fraglimit is being
// lowered below somebody's current frag count.
if (deathmatch && self > 0)
{
for (int i = 0; i < MAXPLAYERS; ++i)
{
if (playeringame[i] && self <= D_GetFragCount(&players[i]))
{
Printf ("%s\n", GStrings("TXT_FRAGLIMIT"));
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
primaryLevel->ExitLevel (0, false);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
}
}
}
}
CVAR (Float, timelimit, 0.f, CVAR_SERVERINFO);
CVAR (Int, wipetype, 1, CVAR_ARCHIVE);
CVAR (Int, snd_drawoutput, 0, 0);
CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL)
{
bool res = false;
Renamed the operator() and [] methods in FTextureManager which take a name The operators cannot be easily searched for so this makes it hard to do any evaluations on the use of this method.
2018-12-07 01:43:27 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!stricmp(self, "None" ) && gameinfo.CursorPic.IsNotEmpty())
{
- deal with I_SetCursor
2020-04-15 17:49:06 +00:00
res = I_SetCursor(TexMan.GetGameTextureByName(gameinfo.CursorPic));
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else
{
- deal with I_SetCursor
2020-04-15 17:49:06 +00:00
res = I_SetCursor(TexMan.GetGameTextureByName(self));
Normalize line endings
2016-03-01 15:47:10 +00:00
}
if (!res)
{
- deal with I_SetCursor
2020-04-15 17:49:06 +00:00
I_SetCursor(TexMan.GetGameTextureByName("cursor"));
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
- 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
2016-12-21 10:11:29 +00:00
// 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)
- add widescreen loader, and a bare pk3
2020-10-26 13:56:58 +00:00
CVAR (Bool, autoloadwidescreen, true, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG)
- added 'r_debug_disable_vis_filter' cvar for debug purposes, to show all objects regardless of their actor filter fields.
2017-07-29 20:26:16 +00:00
CVAR (Bool, r_debug_disable_vis_filter, false, 0)
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
CVAR(Bool, vid_fps, false, 0)
CVAR(Int, vid_showpalette, 0, 0)
- add i_discordrpc (defaults false) to control Discord Presence
2022-03-10 19:12:19 +00:00
CUSTOM_CVAR (Bool, i_discordrpc, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{
I_UpdateWindowTitle();
}
CUSTOM_CVAR(Int, I_FriendlyWindowTitle, 1, CVAR_GLOBALCONFIG|CVAR_ARCHIVE|CVAR_NOINITCALL)
{
I_UpdateWindowTitle();
}
- Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. (cherry picked from commit 578e3270e20f6b0dc6dba7e1001c95a963acc283)
2016-12-21 04:03:06 +00:00
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
bool hud_toggled = false;
- don't show the IWAD picker upon restart. This doesn't work with fullscreen mode. Instead just pick the first IWAD from the list until a better solution can be implemented. - handle a 'restart' CCMD a bit more controlled. Instead of throwing an exception in the CCMD handler it now just flags D_DoomLoop to return. If the exception is thrown within the CCMD this can easily happen deep inside the renderer when it calls NetUpdate. But since the software renderer with its use of global variables is not equipped to be yanked out of lile this it could leave broken data behind that caused glitches or even crashes on subsequently played maps.
2016-03-08 12:07:21 +00:00
bool wantToRestart;
Normalize line endings
2016-03-01 15:47:10 +00:00
bool DrawFSHUD; // [RH] Draw fullscreen HUD?
TArray<FString> allwads;
bool devparm; // started game with -devparm
const char *D_DrawIcon; // [RH] Patch name of icon to draw on next refresh
int NoWipe; // [RH] Allow wipe? (Needs to be set each time)
bool singletics = false; // debug flag to cancel adaptiveness
FString startmap;
bool autostart;
bool advancedemo;
FILE *debugfile;
FILE *hashfile;
gamestate_t wipegamestate = GS_DEMOSCREEN; // can be -1 to force a wipe
bool PageBlank;
- eliminated all cases of calling DrawTexture with an FTexture. Everything uses FGameTexture now.
2020-04-13 23:01:29 +00:00
FGameTexture *Advisory;
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
FTextureID Page;
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
const char *Subtitle;
Normalize line endings
2016-03-01 15:47:10 +00:00
bool nospriterename;
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
FStartupInfo GameStartupInfo;
Normalize line endings
2016-03-01 15:47:10 +00:00
FString lastIWAD;
int restart = 0;
- skip rendering when application is not active Use vid_activeinbackground CVAR to override this behavior
2018-05-04 08:24:37 +00:00
bool AppActive = true;
- make the title music only play once, unless a real demo is successfully played.
2021-05-17 09:41:43 +00:00
bool playedtitlemusic;
Normalize line endings
2016-03-01 15:47:10 +00:00
cycle_t FrameCycles;
- implemented GetCaps() for OpenGL - renamed RFF_FRAGMENTSHADER to RFF_MATSHADER - D_Display now calls Renderer->GetCaps() and stores it in a global variable for later use.
2017-07-29 15:03:40 +00:00
// [SP] Store the capabilities of the renderer in a global variable, to prevent excessive per-frame processing
uint32_t r_renderercaps = 0;
Normalize line endings
2016-03-01 15:47:10 +00:00
// PRIVATE DATA DEFINITIONS ------------------------------------------------
static int demosequence;
static int pagetic;
// CODE --------------------------------------------------------------------
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
//==========================================================================
//
// D_ToggleHud
//
// Turns off 2D drawing temporarily.
//
//==========================================================================
void D_ToggleHud()
{
static int saved_screenblocks;
static bool saved_drawplayersprite, saved_showmessages;
- fixed a few compilation warnings src/d_main.cpp:280:18: warning: using the result of an assignment as a condition without parentheses [-Wparentheses] src/rendering/r_videoscale.cpp:147:22: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare] src/sound/s_reverbedit.cpp:250:18: warning: comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
2020-01-04 10:59:26 +00:00
if ((hud_toggled = !hud_toggled))
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
{
saved_screenblocks = screenblocks;
saved_drawplayersprite = r_drawplayersprites;
saved_showmessages = show_messages;
screenblocks = 12;
r_drawplayersprites = false;
show_messages = false;
C_HideConsole();
M_ClearMenus();
}
else
{
screenblocks = saved_screenblocks;
r_drawplayersprites = saved_drawplayersprite;
show_messages = saved_showmessages;
}
}
CCMD(togglehud)
{
D_ToggleHud();
}
- cleanup of mouse input code and removal of all magic factors. Sensitivity scaling of both axes is now exposed as a raw factor to the user instead of obscuring it behind an unclear 'prescale' boolean. This also consolidates the coordinate processing code to prevent such discrepancies as were present here from happening again. Migration code for old config settings is present so that this change does not affect existing configurations.
2020-09-28 19:13:34 +00:00
CVAR(Float, m_pitch, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE) // Mouse speeds
CVAR(Float, m_yaw, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
Normalize line endings
2016-03-01 15:47:10 +00:00
- moved particle storage into FLevelLocals. - moved parts of the render setup out of the separate render functions. Things like particle and polyobject linking were duplicated several times for rendering different things in different renderers. These things only need to be set up once before the renderer is started so it makes a lot more sense to consolidate them into one place outside the actual rendering code.
2019-01-29 00:09:02 +00:00
//==========================================================================
//
// Render wrapper.
// This function contains all the needed setup and cleanup for starting a render job.
//
//==========================================================================
void D_Render(std::function<void()> action, bool interpolate)
{
for (auto Level : AllLevels())
{
// Check for the presence of dynamic lights at the start of the frame once.
Fix light probes not working for maps having no dynamic lights at all
2021-11-13 04:09:25 +00:00
if ((gl_lights && vid_rendermode == 4) || (r_dynlights && vid_rendermode != 4) || Level->LightProbes.Size() > 0)
- moved particle storage into FLevelLocals. - moved parts of the render setup out of the separate render functions. Things like particle and polyobject linking were duplicated several times for rendering different things in different renderers. These things only need to be set up once before the renderer is started so it makes a lot more sense to consolidate them into one place outside the actual rendering code.
2019-01-29 00:09:02 +00:00
{
Fix light probes not working for maps having no dynamic lights at all
2021-11-13 04:09:25 +00:00
Level->HasDynamicLights = Level->lights || Level->LightProbes.Size() > 0;
- moved particle storage into FLevelLocals. - moved parts of the render setup out of the separate render functions. Things like particle and polyobject linking were duplicated several times for rendering different things in different renderers. These things only need to be set up once before the renderer is started so it makes a lot more sense to consolidate them into one place outside the actual rendering code.
2019-01-29 00:09:02 +00:00
}
else Level->HasDynamicLights = false; // lights are off so effectively we have none.
if (interpolate) Level->interpolator.DoInterpolations(I_GetTimeFrac());
P_FindParticleSubsectors(Level);
PO_LinkToSubsectors(Level);
}
action();
if (interpolate) for (auto Level : AllLevels())
{
Level->interpolator.RestoreInterpolations();
}
}
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// CVAR dmflags
//
//==========================================================================
- fixed a warning and set NOINITCALL for a few CVARs accessing the current level. These inits are done at a time when the data isn't even initialized so they will get overwritten anyway.
2019-02-24 08:57:46 +00:00
CUSTOM_CVAR (Int, dmflags, 0, CVAR_SERVERINFO | CVAR_NOINITCALL)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
// In case DF_NO_FREELOOK was changed, reinitialize the sky
// map. (If no freelook, then no need to stretch the sky.)
- moved the static sky variables into FLevelLocals and removed the redundant ones for the texture ID.
2019-01-29 03:44:44 +00:00
R_InitSkyMap ();
Normalize line endings
2016-03-01 15:47:10 +00:00
if (self & DF_NO_FREELOOK)
{
Net_WriteByte (DEM_CENTERVIEW);
}
// If nofov is set, force everybody to the arbitrator's FOV.
if ((self & DF_NO_FOV) && consoleplayer == Net_Arbitrator)
{
Fixed a wrong variable type declaration.
2017-08-31 01:53:37 +00:00
float fov;
Normalize line endings
2016-03-01 15:47:10 +00:00
Net_WriteByte (DEM_FOV);
// If the game is started with DF_NO_FOV set, the arbitrator's
// DesiredFOV will not be set when this callback is run, so
// be sure not to transmit a 0 FOV.
Send player FOV across the network as floatig point.
2017-08-31 00:20:25 +00:00
fov = players[consoleplayer].DesiredFOV;
Normalize line endings
2016-03-01 15:47:10 +00:00
if (fov == 0)
{
fov = 90;
}
Send player FOV across the network as floatig point.
2017-08-31 00:20:25 +00:00
Net_WriteFloat (fov);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
CVAR (Flag, sv_nohealth, dmflags, DF_NO_HEALTH);
CVAR (Flag, sv_noitems, dmflags, DF_NO_ITEMS);
CVAR (Flag, sv_weaponstay, dmflags, DF_WEAPONS_STAY);
CVAR (Flag, sv_falldamage, dmflags, DF_FORCE_FALLINGHX);
CVAR (Flag, sv_oldfalldamage, dmflags, DF_FORCE_FALLINGZD);
CVAR (Flag, sv_samelevel, dmflags, DF_SAME_LEVEL);
CVAR (Flag, sv_spawnfarthest, dmflags, DF_SPAWN_FARTHEST);
CVAR (Flag, sv_forcerespawn, dmflags, DF_FORCE_RESPAWN);
CVAR (Flag, sv_noarmor, dmflags, DF_NO_ARMOR);
CVAR (Flag, sv_noexit, dmflags, DF_NO_EXIT);
CVAR (Flag, sv_infiniteammo, dmflags, DF_INFINITE_AMMO);
CVAR (Flag, sv_nomonsters, dmflags, DF_NO_MONSTERS);
CVAR (Flag, sv_monsterrespawn, dmflags, DF_MONSTERS_RESPAWN);
CVAR (Flag, sv_itemrespawn, dmflags, DF_ITEMS_RESPAWN);
CVAR (Flag, sv_fastmonsters, dmflags, DF_FAST_MONSTERS);
CVAR (Flag, sv_nojump, dmflags, DF_NO_JUMP);
CVAR (Flag, sv_allowjump, dmflags, DF_YES_JUMP);
CVAR (Flag, sv_nofreelook, dmflags, DF_NO_FREELOOK);
CVAR (Flag, sv_allowfreelook, dmflags, DF_YES_FREELOOK);
CVAR (Flag, sv_nofov, dmflags, DF_NO_FOV);
CVAR (Flag, sv_noweaponspawn, dmflags, DF_NO_COOP_WEAPON_SPAWN);
CVAR (Flag, sv_nocrouch, dmflags, DF_NO_CROUCH);
CVAR (Flag, sv_allowcrouch, dmflags, DF_YES_CROUCH);
CVAR (Flag, sv_cooploseinventory, dmflags, DF_COOP_LOSE_INVENTORY);
CVAR (Flag, sv_cooplosekeys, dmflags, DF_COOP_LOSE_KEYS);
CVAR (Flag, sv_cooploseweapons, dmflags, DF_COOP_LOSE_WEAPONS);
CVAR (Flag, sv_cooplosearmor, dmflags, DF_COOP_LOSE_ARMOR);
CVAR (Flag, sv_cooplosepowerups, dmflags, DF_COOP_LOSE_POWERUPS);
CVAR (Flag, sv_cooploseammo, dmflags, DF_COOP_LOSE_AMMO);
CVAR (Flag, sv_coophalveammo, dmflags, DF_COOP_HALVE_AMMO);
- add sv_instantreaction dmflag
2021-01-13 11:59:54 +00:00
CVAR (Flag, sv_instantreaction, dmflags, DF_INSTANT_REACTION);
Normalize line endings
2016-03-01 15:47:10 +00:00
// Some (hopefully cleaner) interface to these settings.
CVAR (Mask, sv_crouch, dmflags, DF_NO_CROUCH|DF_YES_CROUCH);
CVAR (Mask, sv_jump, dmflags, DF_NO_JUMP|DF_YES_JUMP);
CVAR (Mask, sv_fallingdamage, dmflags, DF_FORCE_FALLINGHX|DF_FORCE_FALLINGZD);
CVAR (Mask, sv_freelook, dmflags, DF_NO_FREELOOK|DF_YES_FREELOOK);
//==========================================================================
//
// CVAR dmflags2
//
// [RH] From Skull Tag. Some of these were already done as separate cvars
// (such as bfgaiming), but I collected them here like Skull Tag does.
//
//==========================================================================
- fixed a warning and set NOINITCALL for a few CVARs accessing the current level. These inits are done at a time when the data isn't even initialized so they will get overwritten anyway.
2019-02-24 08:57:46 +00:00
CUSTOM_CVAR (Int, dmflags2, 0, CVAR_SERVERINFO | CVAR_NOINITCALL)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
// Stop the automap if we aren't allowed to use it.
if ((self & DF2_NO_AUTOMAP) && automapactive)
AM_Stop ();
for (int i = 0; i < MAXPLAYERS; i++)
{
player_t *p = &players[i];
if (!playeringame[i])
continue;
// Revert our view to our own eyes if spying someone else.
if (self & DF2_DISALLOW_SPYING)
{
// The player isn't looking through its own eyes, so make it.
if (p->camera != p->mo)
{
p->camera = p->mo;
S_UpdateSounds (p->camera);
- scriptified the SBARINFO wrapper. This serves no purpose in itself but it removes a native side class from the status bar class hierarchy which allows for better editing options later.
2017-03-22 16:29:13 +00:00
StatusBar->AttachToPlayer (p);
Normalize line endings
2016-03-01 15:47:10 +00:00
if (demoplayback || multiplayer)
StatusBar->ShowPlayerName ();
}
}
// Come out of chasecam mode if we're not allowed to use chasecam.
if (!(dmflags2 & DF2_CHASECAM) && CheckCheatmode(false))
{
// Take us out of chasecam mode only.
if (p->cheats & CF_CHASECAM)
cht_DoCheat (p, CHT_CHASECAM);
}
}
}
CVAR (Flag, sv_weapondrop, dmflags2, DF2_YES_WEAPONDROP);
CVAR (Flag, sv_noteamswitch, dmflags2, DF2_NO_TEAM_SWITCH);
CVAR (Flag, sv_doubleammo, dmflags2, DF2_YES_DOUBLEAMMO);
CVAR (Flag, sv_degeneration, dmflags2, DF2_YES_DEGENERATION);
CVAR (Flag, sv_nobfgaim, dmflags2, DF2_NO_FREEAIMBFG);
CVAR (Flag, sv_barrelrespawn, dmflags2, DF2_BARRELS_RESPAWN);
CVAR (Flag, sv_keepfrags, dmflags2, DF2_YES_KEEPFRAGS);
CVAR (Flag, sv_norespawn, dmflags2, DF2_NO_RESPAWN);
CVAR (Flag, sv_losefrag, dmflags2, DF2_YES_LOSEFRAG);
CVAR (Flag, sv_respawnprotect, dmflags2, DF2_YES_RESPAWN_INVUL);
CVAR (Flag, sv_samespawnspot, dmflags2, DF2_SAME_SPAWN_SPOT);
CVAR (Flag, sv_infiniteinventory, dmflags2, DF2_INFINITE_INVENTORY);
CVAR (Flag, sv_killallmonsters, dmflags2, DF2_KILL_MONSTERS);
CVAR (Flag, sv_noautomap, dmflags2, DF2_NO_AUTOMAP);
CVAR (Flag, sv_noautomapallies, dmflags2, DF2_NO_AUTOMAP_ALLIES);
CVAR (Flag, sv_disallowspying, dmflags2, DF2_DISALLOW_SPYING);
CVAR (Flag, sv_chasecam, dmflags2, DF2_CHASECAM);
CVAR (Flag, sv_disallowsuicide, dmflags2, DF2_NOSUICIDE);
CVAR (Flag, sv_noautoaim, dmflags2, DF2_NOAUTOAIM);
CVAR (Flag, sv_dontcheckammo, dmflags2, DF2_DONTCHECKAMMO);
CVAR (Flag, sv_killbossmonst, dmflags2, DF2_KILLBOSSMONST);
CVAR (Flag, sv_nocountendmonst, dmflags2, DF2_NOCOUNTENDMONST);
CVAR (Flag, sv_respawnsuper, dmflags2, DF2_RESPAWN_SUPER);
- Add the DF2_NO_COOP_THING_SPAWNDM flag to prevent spawning MP things in coop. (#1165)
2020-08-29 19:08:08 +00:00
CVAR (Flag, sv_nothingspawn, dmflags2, DF2_NO_COOP_THING_SPAWN);
- add 'sv_alwaysspawnmulti' dmflags2
2020-10-26 07:33:02 +00:00
CVAR (Flag, sv_alwaysspawnmulti, dmflags2, DF2_ALWAYS_SPAWN_MULTI);
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// CVAR compatflags
//
//==========================================================================
EXTERN_CVAR(Int, compatmode)
- fixed a warning and set NOINITCALL for a few CVARs accessing the current level. These inits are done at a time when the data isn't even initialized so they will get overwritten anyway.
2019-02-24 08:57:46 +00:00
CUSTOM_CVAR (Int, compatflags, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- moved the combined compatibility flags into FLevelLocals.
2019-01-29 18:28:22 +00:00
for (auto Level : AllLevels())
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fix the compat_pointonline flag.
2019-03-23 14:28:10 +00:00
Level->ApplyCompatibility();
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
- fixed a warning and set NOINITCALL for a few CVARs accessing the current level. These inits are done at a time when the data isn't even initialized so they will get overwritten anyway.
2019-02-24 08:57:46 +00:00
CUSTOM_CVAR (Int, compatflags2, 0, CVAR_ARCHIVE|CVAR_SERVERINFO | CVAR_NOINITCALL)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- moved the combined compatibility flags into FLevelLocals.
2019-01-29 18:28:22 +00:00
for (auto Level : AllLevels())
{
- fix the compat_pointonline flag.
2019-03-23 14:28:10 +00:00
Level->ApplyCompatibility2();
- moved the combined compatibility flags into FLevelLocals.
2019-01-29 18:28:22 +00:00
Level->SetCompatLineOnSide(true);
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
{
int v, w = 0;
switch (self)
{
default:
case 0:
v = 0;
break;
case 1: // Doom2.exe compatible with a few relaxed settings
- added A_Explode compatibility options. There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code. Both options are settable through MAPINFO. For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
2019-03-24 08:38:26 +00:00
v = COMPATF_SHORTTEX | COMPATF_STAIRINDEX | COMPATF_USEBLOCKING | COMPATF_NODOORLIGHT | COMPATF_SPRITESORT |
COMPATF_TRACE | COMPATF_MISSILECLIP | COMPATF_SOUNDTARGET | COMPATF_DEHHEALTH | COMPATF_CROSSDROPOFF |
COMPATF_LIGHT | COMPATF_MASKEDMIDTEX;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_FLOORMOVE | COMPATF2_EXPLODE1 | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 2: // same as 1 but stricter (NO_PASSMOBJ and INVISIBILITY are also set)
- added A_Explode compatibility options. There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code. Both options are settable through MAPINFO. For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
2019-03-24 08:38:26 +00:00
v = COMPATF_SHORTTEX | COMPATF_STAIRINDEX | COMPATF_USEBLOCKING | COMPATF_NODOORLIGHT | COMPATF_SPRITESORT |
COMPATF_TRACE | COMPATF_MISSILECLIP | COMPATF_SOUNDTARGET | COMPATF_NO_PASSMOBJ | COMPATF_LIMITPAIN |
COMPATF_DEHHEALTH | COMPATF_INVISIBILITY | COMPATF_CROSSDROPOFF | COMPATF_CORPSEGIBS | COMPATF_HITSCAN |
COMPATF_WALLRUN | COMPATF_NOTOSSDROPS | COMPATF_LIGHT | COMPATF_MASKEDMIDTEX;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_BADANGLES | COMPATF2_FLOORMOVE | COMPATF2_POINTONLINE | COMPATF2_EXPLODE2 | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 3: // Boom compat mode
- fixed: all non-ZDoom compatibility profiles need compat_maskedmidtex set. This was neither fixed in Boom nor MBF.
2016-06-21 08:45:17 +00:00
v = COMPATF_TRACE|COMPATF_SOUNDTARGET|COMPATF_BOOMSCROLL|COMPATF_MISSILECLIP|COMPATF_MASKEDMIDTEX;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_EXPLODE1 | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 4: // Old ZDoom compat mode
v = COMPATF_SOUNDTARGET | COMPATF_LIGHT;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_MULTIEXIT | COMPATF2_TELEPORT | COMPATF2_PUSHWINDOW | COMPATF2_CHECKSWITCHRANGE | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 5: // MBF compat mode
- added A_Explode compatibility options. There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code. Both options are settable through MAPINFO. For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
2019-03-24 08:38:26 +00:00
v = COMPATF_TRACE | COMPATF_SOUNDTARGET | COMPATF_BOOMSCROLL | COMPATF_MISSILECLIP | COMPATF_MUSHROOM |
COMPATF_MBFMONSTERMOVE | COMPATF_NOBLOCKFRIENDS | COMPATF_MASKEDMIDTEX;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_EXPLODE1 | COMPATF2_AVOID_HAZARDS | COMPATF2_STAYONLIFT | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 6: // Boom with some added settings to reenable some 'broken' behavior
- added A_Explode compatibility options. There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code. Both options are settable through MAPINFO. For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
2019-03-24 08:38:26 +00:00
v = COMPATF_TRACE | COMPATF_SOUNDTARGET | COMPATF_BOOMSCROLL | COMPATF_MISSILECLIP | COMPATF_NO_PASSMOBJ |
COMPATF_INVISIBILITY | COMPATF_CORPSEGIBS | COMPATF_HITSCAN | COMPATF_WALLRUN | COMPATF_NOTOSSDROPS | COMPATF_MASKEDMIDTEX;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_POINTONLINE | COMPATF2_EXPLODE2 | COMPATF2_NOMBF21;
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
Added $OPTVAL_MBFSTRICT to menudef.txt, and added corresponding case 7 to the compatmode cvar in d_main.cpp
2020-04-08 14:20:13 +00:00
case 7: // Stricter MBF compatibility
v = COMPATF_CORPSEGIBS | COMPATF_NOBLOCKFRIENDS | COMPATF_MBFMONSTERMOVE | COMPATF_INVISIBILITY |
COMPATF_NOTOSSDROPS | COMPATF_MUSHROOM | COMPATF_NO_PASSMOBJ | COMPATF_BOOMSCROLL | COMPATF_WALLRUN |
COMPATF_TRACE | COMPATF_HITSCAN | COMPATF_MISSILECLIP | COMPATF_MASKEDMIDTEX | COMPATF_SOUNDTARGET;
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
w = COMPATF2_POINTONLINE | COMPATF2_EXPLODE1 | COMPATF2_EXPLODE2 | COMPATF2_AVOID_HAZARDS | COMPATF2_STAYONLIFT | COMPATF2_NOMBF21;
Added $OPTVAL_MBFSTRICT to menudef.txt, and added corresponding case 7 to the compatmode cvar in d_main.cpp
2020-04-08 14:20:13 +00:00
break;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
compatflags = v;
compatflags2 = w;
}
CVAR (Flag, compat_shortTex, compatflags, COMPATF_SHORTTEX);
CVAR (Flag, compat_stairs, compatflags, COMPATF_STAIRINDEX);
CVAR (Flag, compat_limitpain, compatflags, COMPATF_LIMITPAIN);
CVAR (Flag, compat_silentpickup, compatflags, COMPATF_SILENTPICKUP);
CVAR (Flag, compat_nopassover, compatflags, COMPATF_NO_PASSMOBJ);
CVAR (Flag, compat_soundslots, compatflags, COMPATF_MAGICSILENCE);
CVAR (Flag, compat_wallrun, compatflags, COMPATF_WALLRUN);
CVAR (Flag, compat_notossdrops, compatflags, COMPATF_NOTOSSDROPS);
CVAR (Flag, compat_useblocking, compatflags, COMPATF_USEBLOCKING);
CVAR (Flag, compat_nodoorlight, compatflags, COMPATF_NODOORLIGHT);
CVAR (Flag, compat_ravenscroll, compatflags, COMPATF_RAVENSCROLL);
CVAR (Flag, compat_soundtarget, compatflags, COMPATF_SOUNDTARGET);
CVAR (Flag, compat_dehhealth, compatflags, COMPATF_DEHHEALTH);
CVAR (Flag, compat_trace, compatflags, COMPATF_TRACE);
CVAR (Flag, compat_dropoff, compatflags, COMPATF_DROPOFF);
CVAR (Flag, compat_boomscroll, compatflags, COMPATF_BOOMSCROLL);
CVAR (Flag, compat_invisibility, compatflags, COMPATF_INVISIBILITY);
CVAR (Flag, compat_silentinstantfloors, compatflags, COMPATF_SILENT_INSTANT_FLOORS);
CVAR (Flag, compat_sectorsounds, compatflags, COMPATF_SECTORSOUNDS);
CVAR (Flag, compat_missileclip, compatflags, COMPATF_MISSILECLIP);
CVAR (Flag, compat_crossdropoff, compatflags, COMPATF_CROSSDROPOFF);
CVAR (Flag, compat_anybossdeath, compatflags, COMPATF_ANYBOSSDEATH);
CVAR (Flag, compat_minotaur, compatflags, COMPATF_MINOTAUR);
CVAR (Flag, compat_mushroom, compatflags, COMPATF_MUSHROOM);
CVAR (Flag, compat_mbfmonstermove, compatflags, COMPATF_MBFMONSTERMOVE);
CVAR (Flag, compat_corpsegibs, compatflags, COMPATF_CORPSEGIBS);
CVAR (Flag, compat_noblockfriends, compatflags, COMPATF_NOBLOCKFRIENDS);
CVAR (Flag, compat_spritesort, compatflags, COMPATF_SPRITESORT);
CVAR (Flag, compat_hitscan, compatflags, COMPATF_HITSCAN);
CVAR (Flag, compat_light, compatflags, COMPATF_LIGHT);
CVAR (Flag, compat_polyobj, compatflags, COMPATF_POLYOBJ);
CVAR (Flag, compat_maskedmidtex, compatflags, COMPATF_MASKEDMIDTEX);
CVAR (Flag, compat_badangles, compatflags2, COMPATF2_BADANGLES);
CVAR (Flag, compat_floormove, compatflags2, COMPATF2_FLOORMOVE);
CVAR (Flag, compat_soundcutoff, compatflags2, COMPATF2_SOUNDCUTOFF);
CVAR (Flag, compat_pointonline, compatflags2, COMPATF2_POINTONLINE);
CVAR (Flag, compat_multiexit, compatflags2, COMPATF2_MULTIEXIT);
- compatibility optioned triggering sector actions by indirectly initiated teleports There's several old maps depending on this not happening. - Set the option for Hell's Twisted Influence Part 1.
2016-08-07 20:03:36 +00:00
CVAR (Flag, compat_teleport, compatflags2, COMPATF2_TELEPORT);
- made disabling the push window check a real compatibility option. No idea why this was a hidden one, this one definitely needs to be in the menu. - set some required compatibility options for Super Sonic Doom.
2016-08-09 18:15:13 +00:00
CVAR (Flag, compat_pushwindow, compatflags2, COMPATF2_PUSHWINDOW);
- added compatibility flag for buggy CheckSwitchRange behavior https://forum.zdoom.org/viewtopic.php?t=63008 https://forum.zdoom.org/viewtopic.php?t=63650
2019-02-11 14:26:11 +00:00
CVAR (Flag, compat_checkswitchrange, compatflags2, COMPATF2_CHECKSWITCHRANGE);
- added A_Explode compatibility options. There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code. Both options are settable through MAPINFO. For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
2019-03-24 08:38:26 +00:00
CVAR (Flag, compat_explode1, compatflags2, COMPATF2_EXPLODE1);
CVAR (Flag, compat_explode2, compatflags2, COMPATF2_EXPLODE2);
- added missing compat flag CVAR for Strife railing https://forum.zdoom.org/viewtopic.php?t=64627
2019-05-09 08:20:47 +00:00
CVAR (Flag, compat_railing, compatflags2, COMPATF2_RAILING);
- added a modified version of MBF's stay-on-lift feature. The reason this was never added was the hard dependency on the line trigger types. This implements some modified logic that does not try to find all potential lifts in the map. Also moving the MBF flags to compatflags so that they are easier to control by the user as these must be part of compatibility presets.
2021-08-24 09:47:15 +00:00
CVAR (Flag, compat_avoidhazard, compatflags2, COMPATF2_AVOID_HAZARDS);
CVAR (Flag, compat_stayonlift, compatflags2, COMPATF2_STAYONLIFT);
- added a 'no MBF21' compatibility flag. Turns out that there's a few old maps that have the extended line flags set but not the guard bit that forces their clearance. Astrostein 1's first map is an example for this.
2022-02-14 19:00:06 +00:00
CVAR (Flag, compat_nombf21, compatflags2, COMPATF2_NOMBF21);
Normalize line endings
2016-03-01 15:47:10 +00:00
- skip rendering when application is not active Use vid_activeinbackground CVAR to override this behavior
2018-05-04 08:24:37 +00:00
CVAR(Bool, vid_activeinbackground, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
- did a bit of cleanup on DFrameBuffer, most notably taking GetCaps out of it. With the old softpoly renderer and OpenGL 2.x being gone there is no more need for such complex handling, it is now a single function in d_main.cpp.
2020-04-27 20:24:41 +00:00
EXTERN_CVAR(Bool, r_drawvoxels)
EXTERN_CVAR(Int, gl_tonemap)
static uint32_t GetCaps()
{
ActorRenderFeatureFlags FlagSet;
if (!V_IsHardwareRenderer())
{
FlagSet = RFF_UNCLIPPEDTEX;
if (V_IsTrueColor())
FlagSet |= RFF_TRUECOLOR;
else
FlagSet |= RFF_COLORMAP;
}
else
{
// describe our basic feature set
FlagSet = RFF_FLATSPRITES | RFF_MODELS | RFF_SLOPE3DFLOORS |
RFF_TILTPITCH | RFF_ROLLSPRITES | RFF_POLYGONAL | RFF_MATSHADER | RFF_POSTSHADER | RFF_BRIGHTMAP;
if (gl_tonemap != 5) // not running palette tonemap shader
FlagSet |= RFF_TRUECOLOR;
}
if (r_drawvoxels)
FlagSet |= RFF_VOXELS;
return (uint32_t)FlagSet;
}
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
//==========================================================================
//
//
//
//==========================================================================
static void DrawPaletteTester(int paletteno)
{
int blocksize = screen->GetHeight() / 50;
int t = paletteno;
int k = 0;
for (int i = 0; i < 16; ++i)
{
for (int j = 0; j < 16; ++j)
{
PalEntry pe;
if (t > 1)
{
auto palette = GPalette.GetTranslation(TRANSLATION_Standard, t - 2)->Palette;
pe = palette[k];
}
else GPalette.BaseColors[k];
k++;
Dim(twod, pe, 1.f, j * blocksize, i * blocksize, blocksize, blocksize);
}
}
}
//==========================================================================
//
// DFrameBuffer :: DrawRateStuff
//
// Draws the fps counter, dot ticker, and palette debug.
//
//==========================================================================
uint64_t LastCount;
static void DrawRateStuff()
{
static uint64_t LastMS = 0, LastSec = 0, FrameCount = 0, LastTic = 0;
// Draws frame time and cumulative fps
if (vid_fps)
{
uint64_t ms = screen->FrameTime;
uint64_t howlong = ms - LastMS;
if ((signed)howlong >= 0)
{
char fpsbuff[40];
int chars;
int rate_x;
int textScale = active_con_scale(twod);
chars = mysnprintf(fpsbuff, countof(fpsbuff), "%2llu ms (%3llu fps)", (unsigned long long)howlong, (unsigned long long)LastCount);
rate_x = screen->GetWidth() / textScale - NewConsoleFont->StringWidth(&fpsbuff[0]);
ClearRect(twod, rate_x * textScale, 0, screen->GetWidth(), NewConsoleFont->GetHeight() * textScale, GPalette.BlackIndex, 0);
DrawText(twod, NewConsoleFont, CR_WHITE, rate_x, 0, (char*)&fpsbuff[0],
DTA_VirtualWidth, screen->GetWidth() / textScale,
DTA_VirtualHeight, screen->GetHeight() / textScale,
DTA_KeepRatio, true, TAG_DONE);
uint32_t thisSec = (uint32_t)(ms / 1000);
if (LastSec < thisSec)
{
LastCount = FrameCount / (thisSec - LastSec);
LastSec = thisSec;
FrameCount = 0;
}
FrameCount++;
}
LastMS = ms;
}
int Height = screen->GetHeight();
// draws little dots on the bottom of the screen
if (ticker)
{
int64_t t = I_GetTime();
int64_t tics = t - LastTic;
LastTic = t;
if (tics > 20) tics = 20;
int i;
for (i = 0; i < tics * 2; i += 2) ClearRect(twod, i, Height - 1, i + 1, Height, 255, 0);
for (; i < 20 * 2; i += 2) ClearRect(twod, i, Height - 1, i + 1, Height, 0, 0);
}
// draws the palette for debugging
if (vid_showpalette)
{
DrawPaletteTester(vid_showpalette);
}
}
static void End2DAndUpdate()
{
DrawRateStuff();
twod->End();
- made video base code game independent
2020-04-28 15:22:17 +00:00
CheckBench();
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
screen->Update();
- extended 2D buffer lifetime to the end of the frame
2021-08-11 08:11:01 +00:00
twod->OnFrameDone();
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
}
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// D_Display
//
// Draw current display, possibly wiping it from the previous
//
//==========================================================================
void D_Display ()
{
- removed the conversion helper code and fixed a few places where FMaterial was only used to access the hardware textures in the FTexture class.
2020-04-15 22:21:13 +00:00
FGameTexture *wipe = nullptr;
- Untested wipe refactor # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/system/gl_wipe.cpp # src/hwrenderer/scene/hw_attributebuffer.cpp
2018-08-28 13:11:35 +00:00
int wipe_type;
- moved the screen blending code out of the renderer. This is better be made part of the 2D interface. That would have been done long ago if it hadn't been for the totally incompatible way this was handled by the purely paletted software renderer. Now with that out of the way there is no point keeping this code this deeply embedded in the renderer.
2018-05-05 09:20:37 +00:00
sector_t *viewsec;
Normalize line endings
2016-03-01 15:47:10 +00:00
if (nodrawers || screen == NULL)
return; // for comparative timing / profiling
- skip rendering when application is not active Use vid_activeinbackground CVAR to override this behavior
2018-05-04 08:24:37 +00:00
if (!AppActive && (screen->IsFullscreen() || !vid_activeinbackground))
{
return;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
cycle_t cycles;
cycles.Reset();
cycles.Clock();
- r_vanillatrans: Cache the cache! Transform the function into a global variable and recheck at the start of D_Display
2017-06-04 10:05:40 +00:00
r_UseVanillaTransparency = UseVanillaTransparency(); // [SP] Cache UseVanillaTransparency() call
- did a bit of cleanup on DFrameBuffer, most notably taking GetCaps out of it. With the old softpoly renderer and OpenGL 2.x being gone there is no more need for such complex handling, it is now a single function in d_main.cpp.
2020-04-27 20:24:41 +00:00
r_renderercaps = GetCaps(); // [SP] Get the current capabilities of the renderer
- r_vanillatrans: Cache the cache! Transform the function into a global variable and recheck at the start of D_Display
2017-06-04 10:05:40 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
if (players[consoleplayer].camera == NULL)
{
players[consoleplayer].camera = players[consoleplayer].mo;
}
- removed some references to r_viewpoint in game code Mainly to reduce number of search results.
2018-06-19 09:20:36 +00:00
auto &vp = r_viewpoint;
Normalize line endings
2016-03-01 15:47:10 +00:00
if (viewactive)
{
Use a fallback FOV for the R_SetFOV call.
2017-08-28 11:17:42 +00:00
DAngle fov = 90.f;
Cleaned up and shorted the code for R_SetFOV.
2017-08-28 16:39:03 +00:00
AActor *cam = players[consoleplayer].camera;
if (cam)
Use a fallback FOV for the R_SetFOV call.
2017-08-28 11:17:42 +00:00
{
Cleaned up and shorted the code for R_SetFOV.
2017-08-28 16:39:03 +00:00
if (cam->player)
fov = cam->player->FOV;
else fov = cam->CameraFOV;
Use a fallback FOV for the R_SetFOV call.
2017-08-28 11:17:42 +00:00
}
- removed some references to r_viewpoint in game code Mainly to reduce number of search results.
2018-06-19 09:20:36 +00:00
R_SetFOV(vp, fov);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- removed the hard screen resolution switch that still was present on Windows and cleaned up the entire video backend code from the remaining support code for this. Like Linux and macOS this will only support borderless fullscreen in the active desktop resolution now, which is what modern systems need. The list of discrete resolutions has been removed as it makes no sense anymore with a fixed video mode - all the other scaling options remain active, though.
2018-06-17 14:19:14 +00:00
// fullscreen toggle has been requested
Normalize line endings
2016-03-01 15:47:10 +00:00
if (setmodeneeded)
{
- added vid_setsize CCMD and fixed some issues with window restoration when switching from fullscreen. Windows apparently cannot both undo borderless fullscreen and resize the window at the same time, so this must delay the resizing one frame.
2018-07-21 19:32:02 +00:00
setmodeneeded = false;
- renamed fullscreen CVar internally to vid_fullscreen to make searching for it easier. The word 'fullscreen' appears a bit too frequently in the source.
2020-04-11 11:05:58 +00:00
screen->ToggleFullscreen(vid_fullscreen);
- implemented fullscreen toggle for Windows and fixed the window position saver so that it can save and restore the window size as well. This code was written when the window wasn't resizable and didn't actually manage to restore it before. With today's changes this design flaw caused totally incorrect results.
2018-06-17 21:33:22 +00:00
V_OutputResized(screen->GetWidth(), screen->GetHeight());
- added vid_setsize CCMD and fixed some issues with window restoration when switching from fullscreen. Windows apparently cannot both undo borderless fullscreen and resize the window at the same time, so this must delay the resizing one frame.
2018-07-21 19:32:02 +00:00
}
Normalize line endings
2016-03-01 15:47:10 +00:00
// change the view size if needed
- initialized view width and height explicitly It was just a black screen and no menu on startup otherwise
2018-06-17 13:08:41 +00:00
if (setsizeneeded)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- initialized view width and height explicitly It was just a black screen and no menu on startup otherwise
2018-06-17 13:08:41 +00:00
if (StatusBar == nullptr)
{
viewwidth = SCREENWIDTH;
viewheight = SCREENHEIGHT;
setsizeneeded = false;
}
else
{
Merge remote-tracking branch 'remotes/origin/master' into modern # Conflicts: # src/d_main.cpp # src/hwrenderer/scene/hw_weapon.cpp
2018-06-19 17:40:52 +00:00
R_ExecuteSetViewSize (vp, r_viewwindow);
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
// [RH] Allow temporarily disabling wipes
if (NoWipe)
{
NoWipe--;
- Untested wipe refactor # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/system/gl_wipe.cpp # src/hwrenderer/scene/hw_attributebuffer.cpp
2018-08-28 13:11:35 +00:00
wipe = nullptr;
Normalize line endings
2016-03-01 15:47:10 +00:00
wipegamestate = gamestate;
}
- moved the Stereo3D EyePose to their own file in hwrenderer/.
2018-06-24 08:47:42 +00:00
// No wipes when in a stereo3D VR mode
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE && gamestate != GS_TITLELEVEL)
{
if (vr_mode == 0 || vid_rendermode != 4)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
// save the current screen if about to wipe
- moved the texture name to FGameTexture.
2020-04-17 23:00:38 +00:00
wipe = MakeGameTexture(screen->WipeStartScreen(), nullptr, ETextureType::SWCanvas);
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
switch (wipegamestate)
{
default:
wipe_type = wipetype;
break;
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
case GS_FORCEWIPEFADE:
wipe_type = wipe_Fade;
break;
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
case GS_FORCEWIPEBURN:
wipe_type = wipe_Burn;
break;
case GS_FORCEWIPEMELT:
wipe_type = wipe_Melt;
break;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- fixed inconsistent wipe state with stereo 3D mode enabled https://forum.zdoom.org/viewtopic.php?t=65181
2019-06-26 19:26:14 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
wipegamestate = gamestate;
}
else
{
- Untested wipe refactor # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/system/gl_wipe.cpp # src/hwrenderer/scene/hw_attributebuffer.cpp
2018-08-28 13:11:35 +00:00
wipe = nullptr;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
screen->FrameTime = I_msTimeFS();
- split animation management out of the texture manager into a separate class.
2020-04-11 16:54:54 +00:00
TexAnim.UpdateAnimations(screen->FrameTime);
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
R_UpdateSky(screen->FrameTime);
screen->BeginFrame();
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
twod->ClearClipRect();
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
if ((gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL) && gametic != 0)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
// [ZZ] execute event hook that we just started the frame
//E_RenderFrame();
//
- moved particle storage into FLevelLocals. - moved parts of the render setup out of the separate render functions. Things like particle and polyobject linking were duplicated several times for rendering different things in different renderers. These things only need to be set up once before the renderer is started so it makes a lot more sense to consolidate them into one place outside the actual rendering code.
2019-01-29 00:09:02 +00:00
D_Render([&]()
- moved the interpolator into FLevelLocals and refactored its use to happen outside the renderers. There is no need to do this deep inside the renderer where it required code duplication and made it problematic to execute on multiple levels. This is now being done before and after the top level call into the renderer in d_main.cpp. This also serializes the interpolator itself to avoid problems with the Serialize functions adding the interpolations into the list which can only work with a single global instance.
2019-01-28 17:26:14 +00:00
{
- moved RenderView out of the framebuffer classes to complete the consolidation of the renderer's entry points.
2020-04-25 15:58:26 +00:00
viewsec = RenderView(&players[consoleplayer]);
- moved particle storage into FLevelLocals. - moved parts of the render setup out of the separate render functions. Things like particle and polyobject linking were duplicated several times for rendering different things in different renderers. These things only need to be set up once before the renderer is started so it makes a lot more sense to consolidate them into one place outside the actual rendering code.
2019-01-29 00:09:02 +00:00
}, true);
- moved the interpolator into FLevelLocals and refactored its use to happen outside the renderers. There is no need to do this deep inside the renderer where it required code duplication and made it problematic to execute on multiple levels. This is now being done before and after the top level call into the renderer in d_main.cpp. This also serializes the interpolator itself to avoid problems with the Serialize functions adding the interpolations into the list which can only work with a single global instance.
2019-01-28 17:26:14 +00:00
- made video base code game independent
2020-04-28 15:22:17 +00:00
twod->Begin(screen->GetWidth(), screen->GetHeight());
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (!hud_toggled)
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
{
- cleanup of 2D code.
2020-04-11 17:49:09 +00:00
V_DrawBlend(viewsec);
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (automapactive)
{
primaryLevel->automap->Drawer ((hud_althud && viewheight == SCREENHEIGHT) ? viewheight : StatusBar->GetTopOfStatusbar());
}
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
// for timing the statusbar code.
//cycle_t stb;
//stb.Reset();
//stb.Clock();
if (!automapactive || viewactive)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
StatusBar->RefreshViewBorder ();
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (hud_althud && viewheight == SCREENHEIGHT && screenblocks > 10)
{
StatusBar->DrawBottomStuff (HUD_AltHud);
if (DrawFSHUD || automapactive) StatusBar->DrawAltHUD();
if (players[consoleplayer].camera && players[consoleplayer].camera->player && !automapactive)
{
StatusBar->DrawCrosshair();
}
StatusBar->CallDraw (HUD_AltHud, vp.TicFrac);
StatusBar->DrawTopStuff (HUD_AltHud);
}
else if (viewheight == SCREENHEIGHT && viewactive && screenblocks > 10)
{
EHudState state = DrawFSHUD ? HUD_Fullscreen : HUD_None;
StatusBar->DrawBottomStuff (state);
StatusBar->CallDraw (state, vp.TicFrac);
StatusBar->DrawTopStuff (state);
}
else
{
StatusBar->DrawBottomStuff (HUD_StatusBar);
StatusBar->CallDraw (HUD_StatusBar, vp.TicFrac);
StatusBar->DrawTopStuff (HUD_StatusBar);
}
//stb.Unclock();
//Printf("Stbar = %f\n", stb.TimeMS());
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
}
}
else
{
- made video base code game independent
2020-04-28 15:22:17 +00:00
twod->Begin(screen->GetWidth(), screen->GetHeight());
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
switch (gamestate)
{
case GS_FULLCONSOLE:
- some fixes for the console. * it is now possible to switch back to the main intro loop from the fullscreen console. * do not distort the background of the fullscreen console. Always draw the console on top of what the main loop currently displays with a translucent black overlay. * do not use the CONPIC for the fullscreen console as it tends to be more of a distraction than an asset when filling the entire screen. * cleaned up c_console.cpp and moved several pieces of code unrelated to actual console management out of it.
2020-10-25 08:16:37 +00:00
D_PageDrawer();
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
C_DrawConsole ();
M_Drawer ();
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
End2DAndUpdate ();
Sanitized the Being/End2D interface so that it can be used to keep the attribute buffer mapped while processing 2D commands. For this to work the 2D mode has to be properly set and unset at the right places so that no double mapping occurs and no render operation can happen while in 2D mode. # Conflicts: # src/d_main.cpp # src/v_video.h
2018-08-28 10:58:57 +00:00
return;
case GS_INTERMISSION:
WI_Drawer ();
break;
case GS_FINALE:
F_Drawer ();
break;
case GS_DEMOSCREEN:
D_PageDrawer ();
break;
default:
break;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (!hud_toggled)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
CT_Drawer ();
// draw pause pic
if ((paused || pauseext) && menuactive == MENU_Off)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
Allow customization of pause screen.
2021-10-16 08:29:45 +00:00
// [MK] optionally let the status bar handle this
bool skip = false;
IFVIRTUALPTR(StatusBar, DBaseStatusBar, DrawPaused)
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
{
Allow customization of pause screen.
2021-10-16 08:29:45 +00:00
VMValue params[] { (DObject*)StatusBar, paused-1 };
int rv;
VMReturn ret(&rv);
VMCall(func, params, countof(params), &ret, 1);
skip = !!rv;
}
if ( !skip )
{
auto tex = TexMan.GetGameTextureByName(gameinfo.PauseSign, true);
double x = (SCREENWIDTH - tex->GetDisplayWidth() * CleanXfac)/2 +
tex->GetDisplayLeftOffset() * CleanXfac;
DrawTexture(twod, tex, x, 4, DTA_CleanNoMove, true, TAG_DONE);
if (paused && multiplayer)
{
FFont *font = generic_ui? NewSmallFont : SmallFont;
FString pstring = GStrings("TXT_BY");
pstring.Substitute("%s", players[paused - 1].userinfo.GetName());
DrawText(twod, font, CR_RED,
(twod->GetWidth() - font->StringWidth(pstring)*CleanXfac) / 2,
(tex->GetDisplayHeight() * CleanYfac) + 4, pstring, DTA_CleanNoMove, true, TAG_DONE);
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
// [RH] Draw icon, if any
if (D_DrawIcon)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
FTextureID picnum = TexMan.CheckForTexture (D_DrawIcon, ETextureType::MiscPatch);
D_DrawIcon = NULL;
if (picnum.isValid())
{
- eliminated all cases of calling DrawTexture with an FTexture. Everything uses FGameTexture now.
2020-04-13 23:01:29 +00:00
auto tex = TexMan.GetGameTexture(picnum);
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
DrawTexture(twod, tex, 160 - tex->GetDisplayWidth()/2, 100 - tex->GetDisplayHeight()/2,
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
DTA_320x200, true, TAG_DONE);
}
NoWipe = 10;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (snd_drawoutput)
{
GSnd->DrawWaveDebug(snd_drawoutput);
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (!wipe || NoWipe < 0 || wipe_type == wipe_None || hud_toggled)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed memory leak with wipes set to pff. In this case the start screen's texture wasn't destroyed.
2018-09-02 19:13:36 +00:00
if (wipe != nullptr) delete wipe;
wipe = nullptr;
Normalize line endings
2016-03-01 15:47:10 +00:00
NetUpdate (); // send out any new accumulation
// normal update
Implemented RenderOverlay hook that executes directly after level and statusbar
2017-02-03 11:29:17 +00:00
// draw ZScript UI stuff
- Changed frame buffer locking mechanism so that the only place where a lock is needed is when the software renderer wants to access the render buffer, which is precisely for the duration of the RenderView function. No more locking insanity! :) There are no locking counters or other saveguards here that would complicate the implementation because there's precisely two places where this buffer must be locked - the RenderView functions of the regular and poly SW renderer which cannot be called recursively.
2018-03-27 18:02:44 +00:00
C_DrawConsole (); // draw console
Normalize line endings
2016-03-01 15:47:10 +00:00
M_Drawer (); // menu is drawn even on top of everything
- implement ccmd 'togglehud' for taking screenshots - it disables most 2D drawing in order to favor a fullscreen output view for screenshot taking - enabling the console or any menu should cancel it - it does use several CVARs but their state should be restored when this mode is canceled
2019-11-03 08:51:22 +00:00
if (!hud_toggled)
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
FStat::PrintStat (twod);
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
End2DAndUpdate ();
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else
{
// wipe update
- update more millisecond-storing data structures to u/int64_t to fix possible rollover bugs
2017-11-16 01:33:08 +00:00
uint64_t wipestart, nowtime, diff;
Normalize line endings
2016-03-01 15:47:10 +00:00
bool done;
GSnd->SetSfxPaused(true, 1);
I_FreezeTime(true);
- made video base code game independent
2020-04-28 15:22:17 +00:00
twod->End();
- moved the texture name to FGameTexture.
2020-04-17 23:00:38 +00:00
auto wipend = MakeGameTexture(screen->WipeEndScreen(), nullptr, ETextureType::SWCanvas);
- temporarily disabled wipe code and removed old function stubs. This still needs work. # Conflicts: # src/gl/data/gl_attributebuffer.cpp
2018-08-28 18:25:07 +00:00
auto wiper = Wiper::Create(wipe_type);
- removed the conversion helper code and fixed a few places where FMaterial was only used to access the hardware textures in the FTexture class.
2020-04-15 22:21:13 +00:00
wiper->SetTextures(wipe, wipend);
Normalize line endings
2016-03-01 15:47:10 +00:00
- rename I_FPSTime function. - now that the frame buffer stores its render time, the 'ms' return from I_GetTimeFrac is not needed anymore, we may just as well use the globally stored value instead. The only feature this value was ever used for was texture warping.
2017-11-12 23:54:32 +00:00
wipestart = I_msTime();
Normalize line endings
2016-03-01 15:47:10 +00:00
NetUpdate(); // send out any new accumulation
do
{
do
{
I_WaitVBL(2);
- rename I_FPSTime function. - now that the frame buffer stores its render time, the 'ms' return from I_GetTimeFrac is not needed anymore, we may just as well use the globally stored value instead. The only feature this value was ever used for was texture warping.
2017-11-12 23:54:32 +00:00
nowtime = I_msTime();
Normalize line endings
2016-03-01 15:47:10 +00:00
diff = (nowtime - wipestart) * 40 / 1000; // Using 35 here feels too slow.
} while (diff < 1);
wipestart = nowtime;
- made video base code game independent
2020-04-28 15:22:17 +00:00
twod->Begin(screen->GetWidth(), screen->GetHeight());
- crossfade wipe is working again. The other two types still need work.
2018-08-28 20:58:21 +00:00
done = wiper->Run(1);
- Changed frame buffer locking mechanism so that the only place where a lock is needed is when the software renderer wants to access the render buffer, which is precisely for the duration of the RenderView function. No more locking insanity! :) There are no locking counters or other saveguards here that would complicate the implementation because there's precisely two places where this buffer must be locked - the RenderView functions of the regular and poly SW renderer which cannot be called recursively.
2018-03-27 18:02:44 +00:00
C_DrawConsole (); // console and
Normalize line endings
2016-03-01 15:47:10 +00:00
M_Drawer (); // menu are drawn even on top of wipes
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
End2DAndUpdate ();
Normalize line endings
2016-03-01 15:47:10 +00:00
NetUpdate (); // [RH] not sure this is needed anymore
} while (!done);
- temporarily disabled wipe code and removed old function stubs. This still needs work. # Conflicts: # src/gl/data/gl_attributebuffer.cpp
2018-08-28 18:25:07 +00:00
delete wiper;
Normalize line endings
2016-03-01 15:47:10 +00:00
I_FreezeTime(false);
GSnd->SetSfxPaused(false, 1);
}
cycles.Unclock();
FrameCycles = cycles;
}
//==========================================================================
//
// D_ErrorCleanup ()
//
// Cleanup after a recoverable error or a restart
//==========================================================================
void D_ErrorCleanup ()
{
savegamerestore = false;
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
primaryLevel->BotInfo.RemoveAllBots (primaryLevel, true);
Normalize line endings
2016-03-01 15:47:10 +00:00
D_QuitNetGame ();
if (demorecording || demoplayback)
G_CheckDemoStatus ();
Net_ClearBuffers ();
G_NewInit ();
Properly handle VM abort exception when occurred in menu https://forum.zdoom.org/viewtopic.php?t=57677
2017-08-25 12:36:06 +00:00
M_ClearMenus ();
Normalize line endings
2016-03-01 15:47:10 +00:00
singletics = false;
playeringame[0] = 1;
players[0].playerstate = PST_LIVE;
gameaction = ga_fullconsole;
if (gamestate == GS_DEMOSCREEN)
{
menuactive = MENU_Off;
}
- switched over to the scripted intermission screens.
2017-03-18 20:19:32 +00:00
if (gamestate == GS_INTERMISSION) gamestate = GS_DEMOSCREEN;
Normalize line endings
2016-03-01 15:47:10 +00:00
insave = false;
- added explicit clearing of global VM stask When exception is thrown from JITed code, VM stask isn't cleared during unwinding It needs to be clear explicitly to avoid memory leaks and references to destructed objects on shutdown https://forum.zdoom.org/viewtopic.php?t=66172
2019-10-21 12:54:13 +00:00
ClearGlobalVMStack();
Normalize line endings
2016-03-01 15:47:10 +00:00
}
//==========================================================================
//
// D_DoomLoop
//
// Manages timing and IO, calls all ?_Responder, ?_Ticker, and ?_Drawer,
// calls I_GetTime, I_StartFrame, and I_StartTic
//
//==========================================================================
void D_DoomLoop ()
{
int lasttic = 0;
// Clamp the timer to TICRATE until the playloop has been entered.
r_NoInterpolate = true;
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
Page.SetInvalid();
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
Subtitle = nullptr;
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
Advisory = nullptr;
Normalize line endings
2016-03-01 15:47:10 +00:00
vid_cursor.Callback();
for (;;)
{
try
{
// frame syncronous IO operations
if (gametic > lasttic)
{
lasttic = gametic;
I_StartFrame ();
}
- fixed: The frame timer for interpolating the renderer should always take its time from the actual beginning of the frame instead of checking the system timer in real time when rendering starts. This fixes two issues: * timer related texture animations are not being recreated multiple times if a scene renders multiple viewpoints (e.g. camera textures or portals.) * interpolation is smoother when maps have a high think time of multiple milliseconds. A good map to see the difference would be ZDCMP2 which has a think time of 4-5 milliseconds. With the timer taken in real time after the thinkers have run and VSync on this resulted in alternating time slices of 11 and 21 ms between frame interpolations instead of an even 16 as should be done for smooth 60 fps because roughly every second frame was offset by those 5 ms.
2017-07-20 12:20:50 +00:00
I_SetFrameTime();
Normalize line endings
2016-03-01 15:47:10 +00:00
// process one or more tics
if (singletics)
{
I_StartTic ();
D_ProcessEvents ();
G_BuildTiccmd (&netcmds[consoleplayer][maketic%BACKUPTICS]);
if (advancedemo)
D_DoAdvanceDemo ();
C_Ticker ();
M_Ticker ();
G_Ticker ();
// [RH] Use the consoleplayer's camera to update sounds
S_UpdateSounds (players[consoleplayer].camera); // move positional sounds
gametic++;
maketic++;
GC::CheckGC ();
Net_NewMakeTic ();
}
else
{
TryRunTics (); // will run at least one tic
}
// Update display, next frame, with current state.
- fixed: Reverted an accident in a previous commit where I_StartTic() was moved inappropriately. The new location fixed a mouse stutter, however, it causes net desyncs so it cannot be used here.
2017-11-16 03:20:55 +00:00
I_StartTic ();
Normalize line endings
2016-03-01 15:47:10 +00:00
D_Display ();
- split off all music code from s_sound.cpp
2019-08-23 15:15:19 +00:00
S_UpdateMusic();
- don't show the IWAD picker upon restart. This doesn't work with fullscreen mode. Instead just pick the first IWAD from the list until a better solution can be implemented. - handle a 'restart' CCMD a bit more controlled. Instead of throwing an exception in the CCMD handler it now just flags D_DoomLoop to return. If the exception is thrown within the CCMD this can easily happen deep inside the renderer when it calls NetUpdate. But since the software renderer with its use of global variables is not equipped to be yanked out of lile this it could leave broken data behind that caused glitches or even crashes on subsequently played maps.
2016-03-08 12:07:21 +00:00
if (wantToRestart)
{
wantToRestart = false;
return;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
catch (CRecoverableError &error)
{
if (error.GetMessage ())
{
Printf (PRINT_BOLD, "\n%s\n", error.GetMessage());
}
D_ErrorCleanup ();
}
redid the exception mechanism for script-side access violations to be of more use for diagnosing problems. The original implementation just printed a mostly information-free message and then went on as if nothing has happened, making it ridiculously easy to write broken code and release it. Changed it to: * Any VMAbortException will now terminate the game session and go back to the console. * It will also print a VM stack trace with all open functions, including source file and line numbers pointing to the problem spots. For this the relevant information had to be added to the VMScriptFunction class. An interesting effect here was that just throwing the exception object increased the VM's Exec function's stack size from 900 bytes to 70kb, because the compiler allocates a separate local buffer for every single instance of the exception object. The obvious solution was to put this part into a subfunction so that it won't pollute the Exec function's own stack frame. Interesting side effect of this: Exec's stack requirement went down from 900 bytes to 600 bytes. This is still on the high side but already a lot better.
2016-12-03 11:23:13 +00:00
catch (CVMAbortException &error)
{
error.MaybePrintMessage();
- Fixed GCC/Clang warning/error.
2016-12-07 10:28:40 +00:00
Printf("%s", error.stacktrace.GetChars());
redid the exception mechanism for script-side access violations to be of more use for diagnosing problems. The original implementation just printed a mostly information-free message and then went on as if nothing has happened, making it ridiculously easy to write broken code and release it. Changed it to: * Any VMAbortException will now terminate the game session and go back to the console. * It will also print a VM stack trace with all open functions, including source file and line numbers pointing to the problem spots. For this the relevant information had to be added to the VMScriptFunction class. An interesting effect here was that just throwing the exception object increased the VM's Exec function's stack size from 900 bytes to 70kb, because the compiler allocates a separate local buffer for every single instance of the exception object. The obvious solution was to put this part into a subfunction so that it won't pollute the Exec function's own stack frame. Interesting side effect of this: Exec's stack requirement went down from 900 bytes to 600 bytes. This is still on the high side but already a lot better.
2016-12-03 11:23:13 +00:00
D_ErrorCleanup();
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
//==========================================================================
//
// D_PageTicker
//
//==========================================================================
void D_PageTicker (void)
{
if (--pagetic < 0)
D_AdvanceDemo ();
}
//==========================================================================
//
// D_PageDrawer
//
//==========================================================================
void D_PageDrawer (void)
{
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
ClearRect(twod, 0, 0, SCREENWIDTH, SCREENHEIGHT, 0, 0);
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
if (Page.Exists())
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- eliminated all cases of calling DrawTexture with an FTexture. Everything uses FGameTexture now.
2020-04-13 23:01:29 +00:00
DrawTexture(twod, TexMan.GetGameTexture(Page, true), 0, 0,
Normalize line endings
2016-03-01 15:47:10 +00:00
DTA_Fullscreen, true,
DTA_Masked, false,
DTA_BilinearFilter, true,
TAG_DONE);
}
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
if (Subtitle != nullptr)
{
DrawFullscreenSubtitle(GStrings[Subtitle]);
}
if (Advisory != nullptr)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
DrawTexture(twod, Advisory, 4, 160, DTA_320x200, true, TAG_DONE);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
//==========================================================================
//
// D_AdvanceDemo
//
// Called after each demo or intro demosequence finishes
//
//==========================================================================
void D_AdvanceDemo (void)
{
advancedemo = true;
}
//==========================================================================
//
// D_DoStrifeAdvanceDemo
//
//==========================================================================
void D_DoStrifeAdvanceDemo ()
{
static const char *const fullVoices[6] =
{
"svox/pro1", "svox/pro2", "svox/pro3", "svox/pro4", "svox/pro5", "svox/pro6"
};
static const char *const teaserVoices[6] =
{
"svox/voc91", "svox/voc92", "svox/voc93", "svox/voc94", "svox/voc95", "svox/voc96"
};
const char *const *voices = gameinfo.flags & GI_SHAREWARE ? teaserVoices : fullVoices;
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
const char *pagename = nullptr;
const char *subtitle = nullptr;
Normalize line endings
2016-03-01 15:47:10 +00:00
gamestate = GS_DEMOSCREEN;
PageBlank = false;
switch (demosequence)
{
default:
case 0:
pagetic = 6 * TICRATE;
pagename = "TITLEPIC";
- renamed the file system related classes to actually use the term "FileSystem".
2020-04-11 11:24:34 +00:00
if (fileSystem.CheckNumForName ("d_logo", ns_music) < 0)
Normalize line endings
2016-03-01 15:47:10 +00:00
{ // strife0.wad does not have d_logo
S_StartMusic ("");
}
else
{
S_StartMusic ("d_logo");
}
C_HideConsole ();
break;
case 1:
// [RH] Strife fades to black and then to the Rogue logo, but
// I think it looks better if it doesn't fade.
pagetic = 10 * TICRATE/35;
pagename = ""; // PANEL0, but strife0.wad doesn't have it, so don't use it.
PageBlank = true;
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, "bishop/active", 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 2:
pagetic = 4 * TICRATE;
pagename = "RGELOGO";
break;
case 3:
pagetic = 7 * TICRATE;
pagename = "PANEL1";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO1";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[0], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
// The new Strife teaser has D_FMINTR.
// The full retail Strife has D_INTRO.
// And the old Strife teaser has both. (I do not know which one it actually uses, nor do I care.)
S_StartMusic (gameinfo.flags & GI_TEASER2 ? "d_fmintr" : "d_intro");
break;
case 4:
pagetic = 9 * TICRATE;
pagename = "PANEL2";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO2";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[1], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 5:
pagetic = 12 * TICRATE;
pagename = "PANEL3";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO3";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[2], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 6:
pagetic = 11 * TICRATE;
pagename = "PANEL4";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO4";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[3], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 7:
pagetic = 10 * TICRATE;
pagename = "PANEL5";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO5";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[4], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 8:
pagetic = 16 * TICRATE;
pagename = "PANEL6";
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
subtitle = "TXT_SUB_INTRO6";
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_VOICE, CHANF_UI, voices[5], 1, ATTN_NORM);
Normalize line endings
2016-03-01 15:47:10 +00:00
break;
case 9:
pagetic = 6 * TICRATE;
pagename = "vellogo";
wipegamestate = GS_FORCEWIPEFADE;
break;
case 10:
pagetic = 12 * TICRATE;
pagename = "CREDIT";
wipegamestate = GS_FORCEWIPEFADE;
break;
}
if (demosequence++ > 10)
demosequence = 0;
if (demosequence == 9 && !(gameinfo.flags & GI_SHAREWARE))
demosequence = 10;
- implemented subtitles for intermission slideshows.
2019-05-19 08:28:07 +00:00
if (pagename != nullptr)
{
Page = TexMan.CheckForTexture(pagename, ETextureType::MiscPatch);
Subtitle = subtitle;
}
else
{
Subtitle = nullptr;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
//==========================================================================
//
// D_DoAdvanceDemo
//
//==========================================================================
void D_DoAdvanceDemo (void)
{
static char demoname[8] = "DEMO1";
static int democount = 0;
static int pagecount;
FString pagename;
advancedemo = false;
if (gameaction != ga_nothing)
{
return;
}
players[consoleplayer].playerstate = PST_LIVE; // not reborn
usergame = false; // no save / end game here
paused = 0;
// [RH] If you want something more dynamic for your title, create a map
// and name it TITLEMAP. That map will be loaded and used as the title.
if (P_CheckMapData("TITLEMAP"))
{
G_InitNew ("TITLEMAP", true);
return;
}
if (gameinfo.gametype == GAME_Strife)
{
D_DoStrifeAdvanceDemo ();
return;
}
switch (demosequence)
{
case 3:
if (gameinfo.advisoryTime)
{
- eliminated all cases of calling DrawTexture with an FTexture. Everything uses FGameTexture now.
2020-04-13 23:01:29 +00:00
Advisory = TexMan.GetGameTextureByName("ADVISOR");
Normalize line endings
2016-03-01 15:47:10 +00:00
demosequence = 1;
pagetic = (int)(gameinfo.advisoryTime * TICRATE);
break;
}
// fall through to case 1 if no advisory notice
- fixed most of implicit fallthrough compilation warnings src/common/console/c_console.cpp:1032:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/console/c_console.cpp:958:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/backend/codegen.cpp:2969:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:2656:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:521:5: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/jit/jit_math.cpp:966:19: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1538:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1549:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:3820:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gameconfigfile.cpp:544:25: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:193:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:200:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:210:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/g_game.cpp:1145:20: warning: this statement may fall through [-Wimplicit-fallthrough=] src/maploader/maploader.cpp:2142:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/menu/doommenu.cpp:159:28: warning: this statement may fall through [-Wimplicit-fallthrough=] src/m_cheat.cpp:109:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_ceiling.cpp:254:24: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:322:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:330:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:344:10: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:129:47: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:284:8: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:6302:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:8111:16: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_spec.cpp:344:6: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/decorate/thingdef_parse.cpp:1343:9: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/zscript/zcc_compile_doom.cpp:298:12: warning: this statement may fall through [-Wimplicit-fallthrough=] src/wi_stuff.cpp:463:14: warning: this statement may fall through [-Wimplicit-fallthrough=]
2020-10-31 11:22:13 +00:00
[[fallthrough]];
Normalize line endings
2016-03-01 15:47:10 +00:00
case 1:
Advisory = NULL;
if (!M_DemoNoPlay)
{
democount++;
mysnprintf (demoname + 4, countof(demoname) - 4, "%d", democount);
- renamed the file system related classes to actually use the term "FileSystem".
2020-04-11 11:24:34 +00:00
if (fileSystem.CheckNumForName (demoname) < 0)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
demosequence = 0;
democount = 0;
// falls through to case 0 below
}
else
{
- disabled the error message spam from the demo loop These messages are useful for the playdemo CCMD, but since the demo loop is mostly non-functional anyway they better be disabled there.
2019-03-14 23:16:08 +00:00
singledemo = false;
Normalize line endings
2016-03-01 15:47:10 +00:00
G_DeferedPlayDemo (demoname);
demosequence = 2;
break;
}
}
- fixed most of implicit fallthrough compilation warnings src/common/console/c_console.cpp:1032:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/console/c_console.cpp:958:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/backend/codegen.cpp:2969:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:2656:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:521:5: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/jit/jit_math.cpp:966:19: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1538:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1549:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:3820:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gameconfigfile.cpp:544:25: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:193:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:200:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:210:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/g_game.cpp:1145:20: warning: this statement may fall through [-Wimplicit-fallthrough=] src/maploader/maploader.cpp:2142:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/menu/doommenu.cpp:159:28: warning: this statement may fall through [-Wimplicit-fallthrough=] src/m_cheat.cpp:109:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_ceiling.cpp:254:24: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:322:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:330:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:344:10: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:129:47: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:284:8: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:6302:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:8111:16: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_spec.cpp:344:6: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/decorate/thingdef_parse.cpp:1343:9: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/zscript/zcc_compile_doom.cpp:298:12: warning: this statement may fall through [-Wimplicit-fallthrough=] src/wi_stuff.cpp:463:14: warning: this statement may fall through [-Wimplicit-fallthrough=]
2020-10-31 11:22:13 +00:00
[[fallthrough]];
Normalize line endings
2016-03-01 15:47:10 +00:00
default:
case 0:
gamestate = GS_DEMOSCREEN;
pagename = gameinfo.TitlePage;
pagetic = (int)(gameinfo.titleTime * TICRATE);
- make the title music only play once, unless a real demo is successfully played.
2021-05-17 09:41:43 +00:00
if (!playedtitlemusic) S_ChangeMusic (gameinfo.titleMusic, gameinfo.titleOrder, false);
playedtitlemusic = true;
Normalize line endings
2016-03-01 15:47:10 +00:00
demosequence = 3;
pagecount = 0;
C_HideConsole ();
break;
case 2:
pagetic = (int)(gameinfo.pageTime * TICRATE);
gamestate = GS_DEMOSCREEN;
if (gameinfo.creditPages.Size() > 0)
{
- removed the implicit conversion operators from FName. These were creating dangerous interdependencies. It is better to do explicit conversions when needed. As an added plus, this means that zstring.h no longer depends on name.h which was very annoying.
2020-04-11 10:58:38 +00:00
pagename = gameinfo.creditPages[pagecount].GetChars();
Normalize line endings
2016-03-01 15:47:10 +00:00
pagecount = (pagecount+1) % gameinfo.creditPages.Size();
}
demosequence = 1;
break;
}
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
if (pagename.IsNotEmpty())
{
- fixed titlepic animation. It needed more than using the animated accessor. The code here nearly went out of its way to circumvent the texture manager's built in logic.
2018-07-15 20:51:25 +00:00
Page = TexMan.CheckForTexture(pagename, ETextureType::MiscPatch);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
//==========================================================================
//
// D_StartTitle
//
//==========================================================================
void D_StartTitle (void)
{
- reset the 'playedtitlemusic' flag in D_StartTitle. When returning to the title loop the music should play once again.
2021-05-19 14:42:30 +00:00
playedtitlemusic = false;
Normalize line endings
2016-03-01 15:47:10 +00:00
gameaction = ga_nothing;
demosequence = -1;
D_AdvanceDemo ();
}
//==========================================================================
//
// Cmd_Endgame
//
// [RH] Quit the current game and go to fullscreen console
//
//==========================================================================
CCMD (endgame)
{
if (!netgame)
{
gameaction = ga_fullconsole;
demosequence = -1;
G_CheckDemoStatus();
}
}
//==========================================================================
//
// ParseCVarInfo
//
//==========================================================================
void ParseCVarInfo()
{
int lump, lastlump = 0;
bool addedcvars = false;
- renamed the file system related classes to actually use the term "FileSystem".
2020-04-11 11:24:34 +00:00
while ((lump = fileSystem.FindLump("CVARINFO", &lastlump)) != -1)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
FScanner sc(lump);
sc.SetCMode(true);
while (sc.GetToken())
{
FString cvarname;
char *cvardefault = NULL;
ECVarType cvartype = CVAR_Dummy;
int cvarflags = CVAR_MOD|CVAR_ARCHIVE;
FBaseCVar *cvar;
// Check for flag tokens.
while (sc.TokenType == TK_Identifier)
{
if (stricmp(sc.String, "server") == 0)
{
cvarflags |= CVAR_SERVERINFO;
}
else if (stricmp(sc.String, "user") == 0)
{
cvarflags |= CVAR_USERINFO;
}
else if (stricmp(sc.String, "noarchive") == 0)
{
cvarflags &= ~CVAR_ARCHIVE;
}
Added cheat flag for console variables CVAR with this flag can be set in console or from command line when sv_cheats is enabled There is no such restriction for changing its value from ACS, via SetCVar() and related functions 'cheat' modifier can be used in CVARINFO lump to create variable of this kind
2017-01-31 09:05:29 +00:00
else if (stricmp(sc.String, "cheat") == 0)
{
cvarflags |= CVAR_CHEAT;
}
- added latching CVARs to CVARINFO
2017-11-11 14:37:41 +00:00
else if (stricmp(sc.String, "latch") == 0)
{
cvarflags |= CVAR_LATCH;
}
add "nosave" cvar token It makes a cvar value not be saved in a save file.
2020-01-05 16:27:50 +00:00
else if (stricmp(sc.String, "nosave") == 0)
{
make nosave standalone CVar flag, alongside server and user
2020-01-16 15:48:18 +00:00
cvarflags |= CVAR_CONFIG_ONLY;
add "nosave" cvar token It makes a cvar value not be saved in a save file.
2020-01-05 16:27:50 +00:00
}
Normalize line endings
2016-03-01 15:47:10 +00:00
else
{
sc.ScriptError("Unknown cvar attribute '%s'", sc.String);
}
sc.MustGetAnyToken();
}
make nosave standalone CVar flag, alongside server and user
2020-01-16 15:48:18 +00:00
// Possibility of defining a cvar as 'server nosave' or 'user nosave' is kept for
// compatibility reasons.
if (cvarflags & CVAR_CONFIG_ONLY)
{
cvarflags &= ~CVAR_SERVERINFO;
cvarflags &= ~CVAR_USERINFO;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
// Do some sanity checks.
make nosave standalone CVar flag, alongside server and user
2020-01-16 15:48:18 +00:00
// No need to check server-nosave and user-nosave combinations because they
// are made impossible right above.
if ((cvarflags & (CVAR_SERVERINFO|CVAR_USERINFO|CVAR_CONFIG_ONLY)) == 0 ||
Normalize line endings
2016-03-01 15:47:10 +00:00
(cvarflags & (CVAR_SERVERINFO|CVAR_USERINFO)) == (CVAR_SERVERINFO|CVAR_USERINFO))
{
make nosave standalone CVar flag, alongside server and user
2020-01-16 15:48:18 +00:00
sc.ScriptError("One of 'server', 'user', or 'nosave' must be specified");
Normalize line endings
2016-03-01 15:47:10 +00:00
}
// The next token must be the cvar type.
if (sc.TokenType == TK_Bool)
{
cvartype = CVAR_Bool;
}
else if (sc.TokenType == TK_Int)
{
cvartype = CVAR_Int;
}
else if (sc.TokenType == TK_Float)
{
cvartype = CVAR_Float;
}
else if (sc.TokenType == TK_Color)
{
cvartype = CVAR_Color;
}
else if (sc.TokenType == TK_String)
{
cvartype = CVAR_String;
}
else
{
sc.ScriptError("Bad cvar type '%s'", sc.String);
}
// The next token must be the cvar name.
sc.MustGetToken(TK_Identifier);
if (FindCVar(sc.String, NULL) != NULL)
{
sc.ScriptError("cvar '%s' already exists", sc.String);
}
cvarname = sc.String;
// A default value is optional and signalled by a '=' token.
if (sc.CheckToken('='))
{
switch (cvartype)
{
case CVAR_Bool:
if (!sc.CheckToken(TK_True) && !sc.CheckToken(TK_False))
{
sc.ScriptError("Expected true or false");
}
cvardefault = sc.String;
break;
case CVAR_Int:
sc.MustGetNumber();
cvardefault = sc.String;
break;
case CVAR_Float:
sc.MustGetFloat();
cvardefault = sc.String;
break;
default:
sc.MustGetString();
cvardefault = sc.String;
break;
}
}
// Now create the cvar.
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
if (cvardefault != NULL)
{
UCVarValue val;
val.String = cvardefault;
cvar->SetGenericRepDefault(val, CVAR_String);
}
// To be like C and ACS, require a semicolon after everything.
sc.MustGetToken(';');
addedcvars = true;
}
}
// Only load mod cvars from the config if we defined some, so we don't
// clutter up the cvar space when not playing mods with custom cvars.
if (addedcvars)
{
GameConfig->DoModSetup (gameinfo.ConfigName);
}
- Start of soundfont refactoring. This does not compile yet!
2018-02-22 06:21:19 +00:00
}
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// ConsiderPatches
//
// Tries to add any deh/bex patches from the command line.
//
//==========================================================================
bool ConsiderPatches (const char *arg)
{
int i, argc;
FString *args;
const char *f;
argc = Args->CheckParmList(arg, &args);
for (i = 0; i < argc; ++i)
{
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
if ( (f = BaseFileSearch(args[i], ".deh", false, GameConfig)) ||
(f = BaseFileSearch(args[i], ".bex", false, GameConfig)) )
Normalize line endings
2016-03-01 15:47:10 +00:00
{
D_LoadDehFile(f);
}
}
return argc > 0;
}
//==========================================================================
//
// D_MultiExec
//
//==========================================================================
- block direct use of 'new' for DObjects. This is to ensure that the Class pointer can be set right on creation. ZDoom had always depended on handling this lazily which poses some problems for the VM. So now there is a variadic Create<classtype> function taking care of that, but to ensure that it gets used, direct access to the new operator has been blocked. This also neccessitated making DArgs a regular object because they get created before the type system is up. Since the few uses of DArgs are easily controllable this wasn't a big issue. - did a bit of optimization on the bots' decision making whether to pick up a health item or not.
2017-04-14 11:31:58 +00:00
FExecList *D_MultiExec (FArgs *list, FExecList *exec)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
for (int i = 0; i < list->NumArgs(); ++i)
{
exec = C_ParseExecFile(list->GetArg(i), exec);
}
return exec;
}
static void GetCmdLineFiles(TArray<FString> &wadfiles)
{
FString *args;
int i, argc;
argc = Args->CheckParmList("-file", &args);
for (i = 0; i < argc; ++i)
{
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddWildFile(wadfiles, args[i], ".wad", GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
static void CopyFiles(TArray<FString> &to, TArray<FString> &from)
{
unsigned int ndx = to.Reserve(from.Size());
for(unsigned i=0;i<from.Size(); i++)
{
to[ndx+i] = from[i];
}
}
static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char *data, int size)
{
FScanner sc;
FString iwad;
int pos = 0;
const char *lastSlash = strrchr (fn, '/');
sc.OpenMem("GAMEINFO", data, size);
while(sc.GetToken())
{
sc.TokenMustBe(TK_Identifier);
FString nextKey = sc.String;
sc.MustGetToken('=');
if (!nextKey.CompareNoCase("IWAD"))
{
sc.MustGetString();
iwad = sc.String;
}
else if (!nextKey.CompareNoCase("LOAD"))
{
do
{
sc.MustGetString();
// Try looking for the wad in the same directory as the .wad
// before looking for it in the current directory.
FString checkpath;
if (lastSlash != NULL)
{
checkpath = FString(fn, (lastSlash - fn) + 1);
checkpath += sc.String;
}
else
{
checkpath = sc.String;
}
if (!FileExists(checkpath))
{
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
pos += D_AddFile(pwads, sc.String, true, pos, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else
{
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
pos += D_AddFile(pwads, checkpath, true, pos, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
while (sc.CheckToken(','));
}
else if (!nextKey.CompareNoCase("NOSPRITERENAME"))
{
sc.MustGetString();
nospriterename = sc.Compare("true");
}
else if (!nextKey.CompareNoCase("STARTUPTITLE"))
{
sc.MustGetString();
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Name = sc.String;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else if (!nextKey.CompareNoCase("STARTUPCOLORS"))
{
sc.MustGetString();
- removed the unused palette parameter from the V_GetColor family of functions.
2021-08-14 07:56:27 +00:00
GameStartupInfo.FgColor = V_GetColor(sc);
Normalize line endings
2016-03-01 15:47:10 +00:00
sc.MustGetStringName(",");
sc.MustGetString();
- removed the unused palette parameter from the V_GetColor family of functions.
2021-08-14 07:56:27 +00:00
GameStartupInfo.BkColor = V_GetColor(sc);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else if (!nextKey.CompareNoCase("STARTUPTYPE"))
{
sc.MustGetString();
FString sttype = sc.String;
if (!sttype.CompareNoCase("DOOM"))
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Type = FStartupInfo::DoomStartup;
Normalize line endings
2016-03-01 15:47:10 +00:00
else if (!sttype.CompareNoCase("HERETIC"))
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Type = FStartupInfo::HereticStartup;
Normalize line endings
2016-03-01 15:47:10 +00:00
else if (!sttype.CompareNoCase("HEXEN"))
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Type = FStartupInfo::HexenStartup;
Normalize line endings
2016-03-01 15:47:10 +00:00
else if (!sttype.CompareNoCase("STRIFE"))
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Type = FStartupInfo::StrifeStartup;
else GameStartupInfo.Type = FStartupInfo::DefaultStartup;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
else if (!nextKey.CompareNoCase("STARTUPSONG"))
{
sc.MustGetString();
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.Song = sc.String;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- added an option to GAMEINFO to either force or disable loading of the default lights and brightmaps. The mod which prompted me to add this is "The Chosen" which is a Dehacked-based TC and repurposes many original actors for something entirely different. The stock lights are not usable for this and would make it impossible to add a GAMEINFO lump to it because then there is no way to disable loading of lights in the startup screen.
2018-12-19 00:37:48 +00:00
else if (!nextKey.CompareNoCase("LOADLIGHTS"))
{
sc.MustGetNumber();
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.LoadLights = !!sc.Number;
- added an option to GAMEINFO to either force or disable loading of the default lights and brightmaps. The mod which prompted me to add this is "The Chosen" which is a Dehacked-based TC and repurposes many original actors for something entirely different. The stock lights are not usable for this and would make it impossible to add a GAMEINFO lump to it because then there is no way to disable loading of lights in the startup screen.
2018-12-19 00:37:48 +00:00
}
else if (!nextKey.CompareNoCase("LOADBRIGHTMAPS"))
{
sc.MustGetNumber();
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
GameStartupInfo.LoadBrightmaps = !!sc.Number;
- added an option to GAMEINFO to either force or disable loading of the default lights and brightmaps. The mod which prompted me to add this is "The Chosen" which is a Dehacked-based TC and repurposes many original actors for something entirely different. The stock lights are not usable for this and would make it impossible to add a GAMEINFO lump to it because then there is no way to disable loading of lights in the startup screen.
2018-12-19 00:37:48 +00:00
}
- add 'loadwidescreen' to gameinfo, works exactly like 'loadbrightmaps' or 'loadlights'
2020-10-26 14:08:34 +00:00
else if (!nextKey.CompareNoCase("LOADWIDESCREEN"))
{
sc.MustGetNumber();
GameStartupInfo.LoadWidescreen = !!sc.Number;
}
- Discord RPC presence. Adds new IWADINFO and GAMEINFO keys: DiscordAppId - this should point to your AppId for your game. It will use a default GZDoom one if not found.
2022-03-10 03:45:31 +00:00
else if (!nextKey.CompareNoCase("DISCORDAPPID"))
{
sc.MustGetString();
GameStartupInfo.DiscordAppId = !!sc.String;
}
- add steamappid field for DRPC
2022-03-10 05:03:50 +00:00
else if (!nextKey.CompareNoCase("STEAMAPPID"))
{
sc.MustGetString();
GameStartupInfo.SteamAppId = !!sc.String;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
else
{
// Silently ignore unknown properties
do
{
sc.MustGetAnyToken();
}
while(sc.CheckToken(','));
}
}
return iwad;
}
static FString CheckGameInfo(TArray<FString> & pwads)
{
- renamed the file system related classes to actually use the term "FileSystem".
2020-04-11 11:24:34 +00:00
FileSystem check;
Normalize line endings
2016-03-01 15:47:10 +00:00
- fixed setup of IPK3's where all content is in a subdirectory. These never received the file name list that was needed to eliminate this directory from internal paths.
2020-04-19 11:04:29 +00:00
LumpFilterInfo lfi;
for (auto p : iwad_folders) lfi.reservedFolders.Push(p);
for (auto p : iwad_reserved) lfi.requiredPrefixes.Push(p);
- moved the file name management out of the single resource lumps. This is now being managed by the main file system class. The single lumps should only concern themselves with the actual data they manage, not with how the file system presents them to the outside. The IWAD detection code was also switched to use a file system wrapper instead of looking at the single files directly.
2020-04-11 11:14:52 +00:00
// Open the entire list as a temporary file system and look for a GAMEINFO lump. The last one will automatically win.
- fixed setup of IPK3's where all content is in a subdirectory. These never received the file name list that was needed to eliminate this directory from internal paths.
2020-04-19 11:04:29 +00:00
check.InitMultipleFiles(pwads, true, &lfi);
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
if (check.GetNumEntries() > 0)
- moved the file name management out of the single resource lumps. This is now being managed by the main file system class. The single lumps should only concern themselves with the actual data they manage, not with how the file system presents them to the outside. The IWAD detection code was also switched to use a file system wrapper instead of looking at the single files directly.
2020-04-11 11:14:52 +00:00
{
int num = check.CheckNumForName("GAMEINFO");
if (num >= 0)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- moved the file name management out of the single resource lumps. This is now being managed by the main file system class. The single lumps should only concern themselves with the actual data they manage, not with how the file system presents them to the outside. The IWAD detection code was also switched to use a file system wrapper instead of looking at the single files directly.
2020-04-11 11:14:52 +00:00
// Found one!
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
auto data = check.GetFileData(num);
auto wadname = check.GetResourceFileName(check.GetFileContainer(num));
- moved the file name management out of the single resource lumps. This is now being managed by the main file system class. The single lumps should only concern themselves with the actual data they manage, not with how the file system presents them to the outside. The IWAD detection code was also switched to use a file system wrapper instead of looking at the single files directly.
2020-04-11 11:14:52 +00:00
return ParseGameInfo(pwads, wadname, (const char*)data.Data(), data.Size());
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
return "";
}
//==========================================================================
//
// Checks the IWAD for MAP01 and if found sets GI_MAPxx
//
//==========================================================================
static void SetMapxxFlag()
{
- renamed the file system related classes to actually use the term "FileSystem".
2020-04-11 11:24:34 +00:00
int lump_name = fileSystem.CheckNumForName("MAP01", ns_global, fileSystem.GetIwadNum());
int lump_wad = fileSystem.CheckNumForFullName("maps/map01.wad", fileSystem.GetIwadNum());
int lump_map = fileSystem.CheckNumForFullName("maps/map01.map", fileSystem.GetIwadNum());
Normalize line endings
2016-03-01 15:47:10 +00:00
if (lump_name >= 0 || lump_wad >= 0 || lump_map >= 0) gameinfo.flags |= GI_MAPxx;
}
//==========================================================================
//
// Initialize
//
//==========================================================================
static void D_DoomInit()
{
// Set the FPU precision to 53 significant bits. This is the default
// for Visual C++, but not for GCC, so some slight math variances
// might crop up if we leave it alone.
Don't use _FPU_GETCW if it won't do what we want - _FPU_GETCW is defined for more than just x87. Don't use it if the control word for the target architecture doesn't support _FPU_EXTENDED or _FPU_DOUBLE defined, e.g. pretty much anything but x87. If I had been using glibc on PowerPC instead of Apple's libc, I probably would have noticed this sooner, since _FPU_GETCW is part of glibc.
2016-03-09 04:00:16 +00:00
#if defined(_FPU_GETCW) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
int cw;
_FPU_GETCW(cw);
cw = (cw & ~_FPU_EXTENDED) | _FPU_DOUBLE;
_FPU_SETCW(cw);
}
#elif defined(_PC_53)
// On the x64 architecture, changing the floating point precision is not supported.
#ifndef _WIN64
int cfp = _control87(_PC_53, _MCW_PC);
#endif
#endif
// Check response files before coalescing file parameters.
M_FindResponseFile ();
// Combine different file parameters with their pre-switch bits.
Args->CollectFiles("-deh", ".deh");
Args->CollectFiles("-bex", ".bex");
Args->CollectFiles("-exec", ".cfg");
Args->CollectFiles("-playdemo", ".lmp");
Args->CollectFiles("-file", NULL); // anything left goes after -file
gamestate = GS_STARTUP;
const char *v = Args->CheckValue("-rngseed");
if (v)
{
rngseed = staticrngseed = atoi(v);
use_staticrng = true;
if (!batchrun) Printf("D_DoomInit: Static RNGseed %d set.\n", rngseed);
}
else
{
rngseed = I_MakeRNGSeed();
use_staticrng = false;
}
- Added an 'srand' call to the RBG initialization. This is needed because 'rand' gets used by parts of the sound code (e.g. playlists.)
2017-07-15 07:34:07 +00:00
srand(rngseed);
Normalize line endings
2016-03-01 15:47:10 +00:00
FRandom::StaticClearRandom ();
if (!batchrun) Printf ("M_LoadDefaults: Load system defaults.\n");
M_LoadDefaults (); // load before initing other systems
}
//==========================================================================
//
// AddAutoloadFiles
//
//==========================================================================
static void AddAutoloadFiles(const char *autoname)
{
LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string
- 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
2016-12-21 10:11:29 +00:00
// [SP] Dialog reaction - load lights.pk3 and brightmaps.pk3 based on user choices
if (!(gameinfo.flags & GI_SHAREWARE))
{
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
if (GameStartupInfo.LoadLights == 1 || (GameStartupInfo.LoadLights != 0 && autoloadlights))
- 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
2016-12-21 10:11:29 +00:00
{
- change all optional game support archive loaders to scan the program folder
2020-11-25 12:03:30 +00:00
const char *lightswad = BaseFileSearch ("lights.pk3", NULL, true, GameConfig);
- 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
2016-12-21 10:11:29 +00:00
if (lightswad)
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddFile (allwads, lightswad, true, -1, GameConfig);
- 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
2016-12-21 10:11:29 +00:00
}
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
if (GameStartupInfo.LoadBrightmaps == 1 || (GameStartupInfo.LoadBrightmaps != 0 && autoloadbrightmaps))
- 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
2016-12-21 10:11:29 +00:00
{
- change all optional game support archive loaders to scan the program folder
2020-11-25 12:03:30 +00:00
const char *bmwad = BaseFileSearch ("brightmaps.pk3", NULL, true, GameConfig);
- 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
2016-12-21 10:11:29 +00:00
if (bmwad)
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddFile (allwads, bmwad, true, -1, GameConfig);
- 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
2016-12-21 10:11:29 +00:00
}
- add 'loadwidescreen' to gameinfo, works exactly like 'loadbrightmaps' or 'loadlights'
2020-10-26 14:08:34 +00:00
if (GameStartupInfo.LoadWidescreen == 1 || (GameStartupInfo.LoadWidescreen != 0 && autoloadwidescreen))
- add widescreen loader, and a bare pk3
2020-10-26 13:56:58 +00:00
{
- change all optional game support archive loaders to scan the program folder
2020-11-25 12:03:30 +00:00
const char *wswad = BaseFileSearch ("game_widescreen_gfx.pk3", NULL, true, GameConfig);
- add widescreen loader, and a bare pk3
2020-10-26 13:56:58 +00:00
if (wswad)
D_AddFile (allwads, wswad, true, -1, GameConfig);
}
- 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
2016-12-21 10:11:29 +00:00
}
- Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box. (cherry picked from commit 578e3270e20f6b0dc6dba7e1001c95a963acc283)
2016-12-21 04:03:06 +00:00
if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
FString file;
// [RH] zvox.wad - A wad I had intended to be automatically generated
// from Q2's pak0.pak so the female and cyborg player could have
// voices. I never got around to writing the utility to do it, though.
// And I probably never will now. But I know at least one person uses
// it for something else, so this gets to stay here.
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
const char *wad = BaseFileSearch ("zvox.wad", NULL, false, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
if (wad)
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddFile (allwads, wad, true, -1, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
// [RH] Add any .wad files in the skins directory
#ifdef __unix__
file = SHARE_DIR;
#else
file = progdir;
#endif
file += "skins";
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddDirectory (allwads, file, "*.wad", GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
#ifdef __unix__
Fix failure to write under ~/ in confinement When running in a confined environment (such as a snap) it may not be possible to write to directories such as ~/.config. By using the $HOME variable instead of the '~' shortcut, the confined environment can pass an alternative 'home' directory with write privelges. I have only changed this for posix/unix and haven't touched code for MacOS, as I don't know if that behaves differently
2017-12-10 16:27:36 +00:00
file = NicePath("$HOME/" GAME_DIR "/skins");
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddDirectory (allwads, file, "*.wad", GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
#endif
// Add common (global) wads
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddConfigFiles(allwads, "Global.Autoload", "*.wad", GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
- changed FString API to use ptrdiff_t instead of long for signed size arguments.
2021-08-11 22:45:59 +00:00
ptrdiff_t len;
ptrdiff_t lastpos = -1;
Normalize line endings
2016-03-01 15:47:10 +00:00
while ((len = LumpFilterIWAD.IndexOf('.', lastpos+1)) > 0)
{
file = LumpFilterIWAD.Left(len) + ".Autoload";
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
D_AddConfigFiles(allwads, file, "*.wad", GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
lastpos = len;
}
}
}
//==========================================================================
//
// CheckCmdLine
//
//==========================================================================
static void CheckCmdLine()
{
int flags = dmflags;
int p;
const char *v;
if (!batchrun) Printf ("Checking cmd-line parameters...\n");
if (Args->CheckParm ("-nomonsters")) flags |= DF_NO_MONSTERS;
if (Args->CheckParm ("-respawn")) flags |= DF_MONSTERS_RESPAWN;
if (Args->CheckParm ("-fast")) flags |= DF_FAST_MONSTERS;
devparm = !!Args->CheckParm ("-devparm");
if (Args->CheckParm ("-altdeath"))
{
deathmatch = 1;
flags |= DF_ITEMS_RESPAWN;
}
else if (Args->CheckParm ("-deathmatch"))
{
deathmatch = 1;
flags |= DF_WEAPONS_STAY | DF_ITEMS_RESPAWN;
}
dmflags = flags;
// get skill / episode / map from parms
if (gameinfo.gametype != GAME_Hexen)
{
startmap = (gameinfo.flags & GI_MAPxx) ? "MAP01" : "E1M1";
}
else
{
startmap = "&wt@01";
}
autostart = StoredWarp.IsNotEmpty();
const char *val = Args->CheckValue ("-skill");
if (val)
{
gameskill = val[0] - '1';
autostart = true;
}
p = Args->CheckParm ("-warp");
if (p && p < Args->NumArgs() - 1)
{
int ep, map;
if (gameinfo.flags & GI_MAPxx)
{
ep = 1;
map = atoi (Args->GetArg(p+1));
}
else
{
ep = atoi (Args->GetArg(p+1));
map = p < Args->NumArgs() - 2 ? atoi (Args->GetArg(p+2)) : 10;
if (map < 1 || map > 9)
{
map = ep;
ep = 1;
}
}
startmap = CalcMapName (ep, map);
autostart = true;
}
// [RH] Hack to handle +map. The standard console command line handler
// won't be able to handle it, so we take it out of the command line and set
// it up like -warp.
FString mapvalue = Args->TakeValue("+map");
if (mapvalue.IsNotEmpty())
{
if (!P_CheckMapData(mapvalue))
{
Printf ("Can't find map %s\n", mapvalue.GetChars());
}
else
{
startmap = mapvalue;
autostart = true;
}
}
if (devparm)
{
Printf ("%s", GStrings("D_DEVSTR"));
}
// turbo option // [RH] (now a cvar)
v = Args->CheckValue("-turbo");
if (v != NULL)
{
double amt = atof(v);
Printf ("turbo scale: %.0f%%\n", amt);
turbo = (float)amt;
}
v = Args->CheckValue ("-timer");
if (v)
{
double time = strtod (v, NULL);
Printf ("Levels will end after %g minute%s.\n", time, time > 1 ? "s" : "");
timelimit = (float)time;
}
v = Args->CheckValue ("-avg");
if (v)
{
Printf ("Austin Virtual Gaming: Levels will end after 20 minutes\n");
timelimit = 20.f;
}
//
// Build status bar line!
//
if (deathmatch)
StartScreen->AppendStatusLine("DeathMatch...");
if (dmflags & DF_NO_MONSTERS)
StartScreen->AppendStatusLine("No Monsters...");
if (dmflags & DF_MONSTERS_RESPAWN)
StartScreen->AppendStatusLine("Respawning...");
if (autostart)
{
FString temp;
temp.Format ("Warp to map %s, Skill %d ", startmap.GetChars(), gameskill + 1);
StartScreen->AppendStatusLine(temp);
}
}
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
static void NewFailure ()
{
I_FatalError ("Failed to allocate memory from system heap");
}
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
//==========================================================================
//
// RenameSprites
//
// Renames sprites in IWADs so that unique actors can have unique sprites,
// making it possible to import any actor from any game into any other
// game without jumping through hoops to resolve duplicate sprite names.
// You just need to know what the sprite's new name is.
//
//==========================================================================
static void RenameSprites(FileSystem &fileSystem, const TArray<FString>& deletelumps)
{
bool renameAll;
bool MNTRZfound = false;
const char* altbigfont = gameinfo.gametype == GAME_Strife ? "SBIGFONT" : (gameinfo.gametype & GAME_Raven) ? "HBIGFONT" : "DBIGFONT";
static const uint32_t HereticRenames[] =
{ MAKE_ID('H','E','A','D'), MAKE_ID('L','I','C','H'), // Ironlich
};
static const uint32_t HexenRenames[] =
{ MAKE_ID('B','A','R','L'), MAKE_ID('Z','B','A','R'), // ZBarrel
MAKE_ID('A','R','M','1'), MAKE_ID('A','R','_','1'), // MeshArmor
MAKE_ID('A','R','M','2'), MAKE_ID('A','R','_','2'), // FalconShield
MAKE_ID('A','R','M','3'), MAKE_ID('A','R','_','3'), // PlatinumHelm
MAKE_ID('A','R','M','4'), MAKE_ID('A','R','_','4'), // AmuletOfWarding
MAKE_ID('S','U','I','T'), MAKE_ID('Z','S','U','I'), // ZSuitOfArmor and ZArmorChunk
MAKE_ID('T','R','E','1'), MAKE_ID('Z','T','R','E'), // ZTree and ZTreeDead
MAKE_ID('T','R','E','2'), MAKE_ID('T','R','E','S'), // ZTreeSwamp150
MAKE_ID('C','A','N','D'), MAKE_ID('B','C','A','N'), // ZBlueCandle
MAKE_ID('R','O','C','K'), MAKE_ID('R','O','K','K'), // rocks and dirt in a_debris.cpp
MAKE_ID('W','A','T','R'), MAKE_ID('H','W','A','T'), // Strife also has WATR
MAKE_ID('G','I','B','S'), MAKE_ID('P','O','L','5'), // RealGibs
MAKE_ID('E','G','G','M'), MAKE_ID('P','R','K','M'), // PorkFX
MAKE_ID('I','N','V','U'), MAKE_ID('D','E','F','N'), // Icon of the Defender
};
static const uint32_t StrifeRenames[] =
{ MAKE_ID('M','I','S','L'), MAKE_ID('S','M','I','S'), // lots of places
MAKE_ID('A','R','M','1'), MAKE_ID('A','R','M','3'), // MetalArmor
MAKE_ID('A','R','M','2'), MAKE_ID('A','R','M','4'), // LeatherArmor
MAKE_ID('P','M','A','P'), MAKE_ID('S','M','A','P'), // StrifeMap
MAKE_ID('T','L','M','P'), MAKE_ID('T','E','C','H'), // TechLampSilver and TechLampBrass
MAKE_ID('T','R','E','1'), MAKE_ID('T','R','E','T'), // TreeStub
MAKE_ID('B','A','R','1'), MAKE_ID('B','A','R','C'), // BarricadeColumn
MAKE_ID('S','H','T','2'), MAKE_ID('M','P','U','F'), // MaulerPuff
MAKE_ID('B','A','R','L'), MAKE_ID('B','B','A','R'), // StrifeBurningBarrel
MAKE_ID('T','R','C','H'), MAKE_ID('T','R','H','L'), // SmallTorchLit
MAKE_ID('S','H','R','D'), MAKE_ID('S','H','A','R'), // glass shards
MAKE_ID('B','L','S','T'), MAKE_ID('M','A','U','L'), // Mauler
MAKE_ID('L','O','G','G'), MAKE_ID('L','O','G','W'), // StickInWater
MAKE_ID('V','A','S','E'), MAKE_ID('V','A','Z','E'), // Pot and Pitcher
MAKE_ID('C','N','D','L'), MAKE_ID('K','N','D','L'), // Candle
MAKE_ID('P','O','T','1'), MAKE_ID('M','P','O','T'), // MetalPot
MAKE_ID('S','P','I','D'), MAKE_ID('S','T','L','K'), // Stalker
};
const uint32_t* renames;
int numrenames;
switch (gameinfo.gametype)
{
case GAME_Doom:
default:
// Doom's sprites don't get renamed.
renames = nullptr;
numrenames = 0;
break;
case GAME_Heretic:
renames = HereticRenames;
numrenames = sizeof(HereticRenames) / 8;
break;
case GAME_Hexen:
renames = HexenRenames;
numrenames = sizeof(HexenRenames) / 8;
break;
case GAME_Strife:
renames = StrifeRenames;
numrenames = sizeof(StrifeRenames) / 8;
break;
}
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
unsigned NumFiles = fileSystem.GetNumEntries();
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
for (uint32_t i = 0; i < NumFiles; i++)
{
// check for full Minotaur animations. If this is not found
// some frames need to be renamed.
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
if (fileSystem.GetFileNamespace(i) == ns_sprites)
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
auto& shortName = fileSystem.GetShortName(i);
if (shortName.dword == MAKE_ID('M', 'N', 'T', 'R') && shortName.String[4] == 'Z')
{
MNTRZfound = true;
break;
}
}
}
renameAll = !!Args->CheckParm("-oldsprites") || nospriterename;
for (uint32_t i = 0; i < NumFiles; i++)
{
auto& shortName = fileSystem.GetShortName(i);
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
if (fileSystem.GetFileNamespace(i) == ns_sprites)
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
// Only sprites in the IWAD normally get renamed
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
if (renameAll || fileSystem.GetFileContainer(i) == fileSystem.GetIwadNum())
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
for (int j = 0; j < numrenames; ++j)
{
if (shortName.dword == renames[j * 2])
{
shortName.dword = renames[j * 2 + 1];
}
}
if (gameinfo.gametype == GAME_Hexen)
{
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
if (fileSystem.CheckFileName(i, "ARTIINVU"))
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
shortName.String[4] = 'D'; shortName.String[5] = 'E';
shortName.String[6] = 'F'; shortName.String[7] = 'N';
}
}
}
if (!MNTRZfound)
{
if (shortName.dword == MAKE_ID('M', 'N', 'T', 'R'))
{
for (size_t fi : {4, 6})
{
if (shortName.String[fi] >= 'F' && shortName.String[fi] <= 'K')
{
shortName.String[fi] += 'U' - 'F';
}
}
}
}
// When not playing Doom rename all BLOD sprites to BLUD so that
// the same blood states can be used everywhere
if (!(gameinfo.gametype & GAME_DoomChex))
{
if (shortName.dword == MAKE_ID('B', 'L', 'O', 'D'))
{
shortName.dword = MAKE_ID('B', 'L', 'U', 'D');
}
}
}
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
else if (fileSystem.GetFileNamespace(i) == ns_global)
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
int fn = fileSystem.GetFileContainer(i);
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
if (fn >= fileSystem.GetIwadNum() && fn <= fileSystem.GetMaxIwadNum() && deletelumps.Find(shortName.String) < deletelumps.Size())
{
shortName.String[0] = 0; // Lump must be deleted from directory.
}
// Rename the game specific big font lumps so that the font manager does not have to do problematic special checks for them.
else if (!strcmp(shortName.String, altbigfont))
{
strcpy(shortName.String, "BIGFONT");
}
}
}
}
//==========================================================================
//
// RenameNerve
//
// Renames map headers and map name pictures in nerve.wad so as to load it
// alongside Doom II and offer both episodes without causing conflicts.
// MD5 checksum for NERVE.WAD: 967d5ae23daf45196212ae1b605da3b0 (3,819,855)
// MD5 checksum for Unity version of NERVE.WAD: 4214c47651b63ee2257b1c2490a518c9 (3,821,966)
//
//==========================================================================
void RenameNerve(FileSystem& fileSystem)
{
if (gameinfo.gametype != GAME_Doom)
return;
- add new detection hashes for newer versions of nerve.wad - partially fixes issue #1263
2021-01-06 12:05:34 +00:00
const int numnerveversions = 4;
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
bool found = false;
uint8_t cksum[16];
static const uint8_t nerve[numnerveversions][16] = {
{ 0x96, 0x7d, 0x5a, 0xe2, 0x3d, 0xaf, 0x45, 0x19,
0x62, 0x12, 0xae, 0x1b, 0x60, 0x5d, 0xa3, 0xb0 },
{ 0x42, 0x14, 0xc4, 0x76, 0x51, 0xb6, 0x3e, 0xe2,
- add new detection hashes for newer versions of nerve.wad - partially fixes issue #1263
2021-01-06 12:05:34 +00:00
0x25, 0x7b, 0x1c, 0x24, 0x90, 0xa5, 0x18, 0xc9 },
{ 0x35, 0x44, 0xe1, 0x90, 0x30, 0x91, 0xc5, 0x0b,
0xa5, 0x00, 0x49, 0xdb, 0x74, 0xcd, 0x7d, 0x25 },
{ 0x91, 0x43, 0xb3, 0x92, 0x39, 0x2a, 0x7a, 0xc8,
0x70, 0xc2, 0xca, 0x36, 0xac, 0x65, 0xaf, 0x45 }
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
};
- add new detection hashes for newer versions of nerve.wad - partially fixes issue #1263
2021-01-06 12:05:34 +00:00
size_t nervesize[numnerveversions] = { 3819855, 3821966, 3821885, 4003409 }; // NERVE.WAD's file size
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
int w = fileSystem.GetIwadNum();
while (++w < fileSystem.GetNumWads())
{
auto fr = fileSystem.GetFileReader(w);
int isizecheck = -1;
if (fr == NULL)
{
continue;
}
for (int icheck = 0; icheck < numnerveversions; icheck++)
if (fr->GetLength() == (long)nervesize[icheck])
isizecheck = icheck;
if (isizecheck == -1)
{
// Skip MD5 computation when there is a
// cheaper way to know this is not the file
continue;
}
fr->Seek(0, FileReader::SeekSet);
MD5Context md5;
md5Update(*fr, md5, (unsigned)fr->GetLength());
md5.Final(cksum);
if (memcmp(nerve[isizecheck], cksum, 16) == 0)
{
found = true;
break;
}
}
if (!found)
return;
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
for (int i = fileSystem.GetFirstEntry(w); i <= fileSystem.GetLastEntry(w); i++)
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
{
auto& shortName = fileSystem.GetShortName(i);
// Only rename the maps from NERVE.WAD
if (shortName.dword == MAKE_ID('C', 'W', 'I', 'L'))
{
shortName.String[0] = 'N';
}
else if (shortName.dword == MAKE_ID('M', 'A', 'P', '0'))
{
shortName.String[6] = shortName.String[4];
shortName.String[5] = '0';
shortName.String[4] = 'L';
shortName.dword = MAKE_ID('L', 'E', 'V', 'E');
}
}
}
//==========================================================================
//
// FixMacHexen
//
// Discard all extra lumps in Mac version of Hexen IWAD (demo or full)
// to avoid any issues caused by names of these lumps, including:
// * Wrong height of small font
// * Broken life bar of mage class
//
//==========================================================================
void FixMacHexen(FileSystem& fileSystem)
{
if (GAME_Hexen != gameinfo.gametype)
{
return;
}
FileReader* reader = fileSystem.GetFileReader(fileSystem.GetIwadNum());
auto iwadSize = reader->GetLength();
static const long DEMO_SIZE = 13596228;
static const long BETA_SIZE = 13749984;
static const long FULL_SIZE = 21078584;
if (DEMO_SIZE != iwadSize
&& BETA_SIZE != iwadSize
&& FULL_SIZE != iwadSize)
{
return;
}
reader->Seek(0, FileReader::SeekSet);
uint8_t checksum[16];
MD5Context md5;
md5Update(*reader, md5, (unsigned)iwadSize);
md5.Final(checksum);
static const uint8_t HEXEN_DEMO_MD5[16] =
{
0x92, 0x5f, 0x9f, 0x50, 0x00, 0xe1, 0x7d, 0xc8,
0x4b, 0x0a, 0x6a, 0x3b, 0xed, 0x3a, 0x6f, 0x31
};
static const uint8_t HEXEN_BETA_MD5[16] =
{
0x2a, 0xf1, 0xb2, 0x7c, 0xd1, 0x1f, 0xb1, 0x59,
0xe6, 0x08, 0x47, 0x2a, 0x1b, 0x53, 0xe4, 0x0e
};
static const uint8_t HEXEN_FULL_MD5[16] =
{
0xb6, 0x81, 0x40, 0xa7, 0x96, 0xf6, 0xfd, 0x7f,
0x3a, 0x5d, 0x32, 0x26, 0xa3, 0x2b, 0x93, 0xbe
};
const bool isBeta = 0 == memcmp(HEXEN_BETA_MD5, checksum, sizeof checksum);
if (!isBeta
&& 0 != memcmp(HEXEN_DEMO_MD5, checksum, sizeof checksum)
&& 0 != memcmp(HEXEN_FULL_MD5, checksum, sizeof checksum))
{
return;
}
static const int EXTRA_LUMPS = 299;
// Hexen Beta is very similar to Demo but it has MAP41: Maze at the end of the WAD
// So keep this map if it's present but discard all extra lumps
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
const int lastLump = fileSystem.GetLastEntry(fileSystem.GetIwadNum()) - (isBeta ? 12 : 0);
assert(fileSystem.GetFirstEntry(fileSystem.GetIwadNum()) + 299 < lastLump);
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
for (int i = lastLump - EXTRA_LUMPS + 1; i <= lastLump; ++i)
{
auto& shortName = fileSystem.GetShortName(i);
shortName.String[0] = '\0';
}
}
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
static void FindStrifeTeaserVoices(FileSystem& fileSystem)
{
if (gameinfo.gametype == GAME_Strife && gameinfo.flags & GI_SHAREWARE)
{
unsigned NumFiles = fileSystem.GetNumEntries();
for (uint32_t i = 0; i < NumFiles; i++)
{
auto& shortName = fileSystem.GetShortName(i);
if (fileSystem.GetFileNamespace(i) == ns_global)
{
// Only sprites in the IWAD normally get renamed
if (fileSystem.GetFileContainer(i) == fileSystem.GetIwadNum())
{
if (shortName.String[0] == 'V' &&
shortName.String[1] == 'O' &&
shortName.String[2] == 'C')
{
int j;
for (j = 3; j < 8; ++j)
{
if (shortName.String[j] != 0 && !isdigit(shortName.String[j]))
break;
}
if (j == 8)
{
fileSystem.SetFileNamespace(i, ns_strifevoices);
}
}
}
}
}
}
}
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
static const char *DoomButtons[] =
{
"am_panleft",
"user2" ,
"jump" ,
"right" ,
"zoom" ,
"back" ,
"am_zoomin",
"reload" ,
"lookdown" ,
"am_zoomout",
"user4" ,
"attack" ,
"user1" ,
"klook" ,
"forward" ,
"movedown" ,
"altattack" ,
"moveleft" ,
"moveright" ,
"am_panright",
"am_panup" ,
"mlook" ,
"crouch" ,
"left" ,
"lookup" ,
"user3" ,
"strafe" ,
"am_pandown",
"showscores" ,
"speed" ,
"use" ,
"moveup" };
CVAR(Bool, lookspring, true, CVAR_ARCHIVE); // Generate centerview when -mlook encountered?
- decoupled the string table from game implementation details. Using callbacks now to query needed game state.
2020-04-11 16:12:28 +00:00
EXTERN_CVAR(String, language)
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
{
if (self < 0)
{
self = 0;
}
else if (self > 2)
{
self = 2;
}
}
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
void Mlook_ReleaseHandler()
{
if (lookspring)
{
Net_WriteByte(DEM_CENTERVIEW);
}
}
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
- decoupled the string table from game implementation details. Using callbacks now to query needed game state.
2020-04-11 16:12:28 +00:00
int StrTable_GetGender()
{
return players[consoleplayer].userinfo.GetGender();
}
bool StrTable_ValidFilter(const char* str)
{
if (gameinfo.gametype == GAME_Strife && (gameinfo.flags & GI_SHAREWARE) && !stricmp(str, "strifeteaser")) return true;
return stricmp(str, GameNames[gameinfo.gametype]) == 0;
}
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
bool System_WantGuiCapture()
{
bool wantCapt;
if (menuactive == MENU_Off)
{
wantCapt = ConsoleState == c_down || ConsoleState == c_falling || chatmodeon;
}
else
{
wantCapt = (menuactive == MENU_On || menuactive == MENU_OnNoPause);
}
// [ZZ] check active event handlers that want the UI processing
if (!wantCapt && primaryLevel->localEventManager->CheckUiProcessors())
wantCapt = true;
return wantCapt;
}
bool System_WantLeftButton()
{
return (gamestate == GS_DEMOSCREEN || gamestate == GS_TITLELEVEL);
}
- cleanup of mouse input code and removal of all magic factors. Sensitivity scaling of both axes is now exposed as a raw factor to the user instead of obscuring it behind an unclear 'prescale' boolean. This also consolidates the coordinate processing code to prevent such discrepancies as were present here from happening again. Migration code for old config settings is present so that this change does not affect existing configurations.
2020-09-28 19:13:34 +00:00
static bool System_DispatchEvent(event_t* ev)
{
if (ev->type == EV_Mouse && menuactive == MENU_Off && ConsoleState != c_down && ConsoleState != c_falling && !primaryLevel->localEventManager->Responder(ev) && !paused)
{
if (buttonMap.ButtonDown(Button_Mlook) || freelook)
{
int look = int(ev->y * m_pitch * 16.0);
if (invertmouse) look = -look;
G_AddViewPitch(look, true);
ev->y = 0;
}
if (!buttonMap.ButtonDown(Button_Strafe) && !lookstrafe)
{
int turn = int(ev->x * m_yaw * 8.0);
if (invertmousex)
turn = -turn;
G_AddViewAngle(turn, true);
ev->x = 0;
}
- keep mouse coordinates as floats for as long as possible.
2020-09-28 20:12:44 +00:00
if (ev->x == 0 && ev->y == 0)
- cleanup of mouse input code and removal of all magic factors. Sensitivity scaling of both axes is now exposed as a raw factor to the user instead of obscuring it behind an unclear 'prescale' boolean. This also consolidates the coordinate processing code to prevent such discrepancies as were present here from happening again. Migration code for old config settings is present so that this change does not affect existing configurations.
2020-09-28 19:13:34 +00:00
{
return true;
}
}
return false;
}
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
bool System_NetGame()
{
return netgame;
}
bool System_WantNativeMouse()
{
return primaryLevel->localEventManager->CheckRequireMouse();
}
static bool System_CaptureModeInGame()
{
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
if (demoplayback || paused) return false;
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
switch (mouse_capturemode)
{
default:
case 0:
return gamestate == GS_LEVEL;
case 1:
return gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_FINALE;
case 2:
return true;
}
}
- redirect ST_Sound to a callback because the sound code is game specific
2020-04-23 20:33:43 +00:00
static void System_PlayStartupSound(const char* sndname)
{
S_Sound(CHAN_BODY, 0, sndname, 1, ATTN_NONE);
}
- moved a few files from 'rendering' to 'common'.
2020-04-25 19:52:21 +00:00
static bool System_IsSpecialUI()
{
return (generic_ui || !!log_vgafont || !!dlg_vgafont || ConsoleState != c_up || multiplayer ||
(menuactive == MENU_On && CurrentMenu && !CurrentMenu->IsKindOf("ConversationMenu")));
}
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
static bool System_DisableTextureFilter()
{
return !V_IsHardwareRenderer();
}
- made video base code game independent
2020-04-28 15:22:17 +00:00
static void System_OnScreenSizeChanged()
{
if (StatusBar != NULL)
{
StatusBar->CallScreenSizeChanged();
}
// Reload crosshair if transitioned to a different size
ST_LoadCrosshair(true);
if (primaryLevel && primaryLevel->automap)
primaryLevel->automap->NewResolution();
}
IntRect System_GetSceneRect()
{
IntRect mSceneViewport;
// Special handling so the view with a visible status bar displays properly
int height, width;
if (screenblocks >= 10)
{
height = screen->GetHeight();
width = screen->GetWidth();
}
else
{
height = (screenblocks * screen->GetHeight() / 10) & ~7;
width = (screenblocks * screen->GetWidth() / 10);
}
mSceneViewport.left = viewwindowx;
mSceneViewport.top = screen->GetHeight() - (height + viewwindowy - ((height - viewheight) / 2));
mSceneViewport.width = viewwidth;
mSceneViewport.height = height;
return mSceneViewport;
}
- moved the remaining core parts of the GL renderer to 'common'.
2020-04-29 15:19:17 +00:00
FString System_GetLocationDescription()
{
auto& vp = r_viewpoint;
auto Level = vp.ViewLevel;
- fixed crash on getting location description without a level Run `bench` CCMD in fullscreen console, i.e. with no level loaded, wait five seconds, open menu https://forum.zdoom.org/viewtopic.php?t=73109&start=15#p1198234
2021-08-24 08:15:16 +00:00
return Level == nullptr ? FString() : FStringf("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n%llu fps\n\n",
- moved benchmark fps output to the custom part of it because it depends on game data.
2020-04-29 15:44:43 +00:00
Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees, (unsigned long long)LastCount);
- moved the remaining core parts of the GL renderer to 'common'.
2020-04-29 15:19:17 +00:00
}
- moved i_net into 'common' to bring it in line with Raze.
2020-09-27 10:23:22 +00:00
FString System_GetPlayerName(int node)
{
return players[node].userinfo.GetName();
}
- some fixes for the console. * it is now possible to switch back to the main intro loop from the fullscreen console. * do not distort the background of the fullscreen console. Always draw the console on top of what the main loop currently displays with a translucent black overlay. * do not use the CONPIC for the fullscreen console as it tends to be more of a distraction than an asset when filling the entire screen. * cleaned up c_console.cpp and moved several pieces of code unrelated to actual console management out of it.
2020-10-25 08:16:37 +00:00
void System_ConsoleToggled(int state)
{
if (state == c_falling && hud_toggled)
D_ToggleHud();
}
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
//==========================================================================
//
// DoomSpecificInfo
//
// Called by the crash logger to get application-specific information.
//
//==========================================================================
void System_CrashInfo(char* buffer, size_t bufflen, const char *lfstr)
{
const char* arg;
char* const buffend = buffer + bufflen - 2; // -2 for CRLF at end
int i;
buffer += mysnprintf(buffer, buffend - buffer, GAMENAME " version %s (%s)", GetVersionString(), GetGitHash());
buffer += snprintf(buffer, buffend - buffer, "%sCommand line:", lfstr);
for (i = 0; i < Args->NumArgs(); ++i)
{
buffer += snprintf(buffer, buffend - buffer, " %s", Args->GetArg(i));
}
for (i = 0; (arg = fileSystem.GetResourceFileName(i)) != NULL; ++i)
{
buffer += mysnprintf(buffer, buffend - buffer, "%sWad %d: %s", lfstr, i, arg);
}
if (gamestate != GS_LEVEL && gamestate != GS_TITLELEVEL)
{
buffer += mysnprintf(buffer, buffend - buffer, "%s%sNot in a level.", lfstr, lfstr);
}
else
{
buffer += mysnprintf(buffer, buffend - buffer, "%s%sCurrent map: %s", lfstr, lfstr, primaryLevel->MapName.GetChars());
if (!viewactive)
{
buffer += mysnprintf(buffer, buffend - buffer, "%s%sView not active.", lfstr, lfstr);
}
else
{
auto& vp = r_viewpoint;
buffer += mysnprintf(buffer, buffend - buffer, "%s%sviewx = %f", lfstr, lfstr, vp.Pos.X);
buffer += mysnprintf(buffer, buffend - buffer, "%sviewy = %f", lfstr, vp.Pos.Y);
buffer += mysnprintf(buffer, buffend - buffer, "%sviewz = %f", lfstr, vp.Pos.Z);
- fixed compile errors in POSIX platform code.
2020-04-22 18:42:13 +00:00
buffer += mysnprintf(buffer, buffend - buffer, "%sviewangle = %f", lfstr, vp.Angles.Yaw.Degrees);
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
}
}
buffer += mysnprintf(buffer, buffend - buffer, "%s", lfstr);
*buffer = 0;
}
- moved out the Doom specific parts from menu.cpp and messagebox.cpp.
2020-06-13 20:43:35 +00:00
void System_M_Dim();
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
static void PatchTextures()
{
// The Hexen scripts use BLANK as a blank texture, even though it's really not.
// I guess the Doom renderer must have clipped away the line at the bottom of
// the texture so it wasn't visible. Change its use type to a blank null texture to really make it blank.
if (gameinfo.gametype == GAME_Hexen)
{
FTextureID tex = TexMan.CheckForTexture("BLANK", ETextureType::Wall, false);
if (tex.Exists())
{
- reworking some lower level texture code.
2020-04-14 18:45:26 +00:00
auto texture = TexMan.GetGameTexture(tex, false);
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
texture->SetUseType(ETextureType::Null);
}
}
}
//==========================================================================
//
// this gets called during texture creation to fix known problems
//
//==========================================================================
static void CheckForHacks(BuildInfo& buildinfo)
{
if (buildinfo.Parts.Size() == 0)
{
return;
}
// Heretic sky textures are marked as only 128 pixels tall,
// even though they are really 200 pixels tall.
if (gameinfo.gametype == GAME_Heretic &&
buildinfo.Name.Len() == 4 &&
buildinfo.Name[0] == 'S' &&
buildinfo.Name[1] == 'K' &&
buildinfo.Name[2] == 'Y' &&
buildinfo.Name[3] >= '1' &&
buildinfo.Name[3] <= '3' &&
- moved most of the texture size maintenance to the FGameTexture class.
2020-04-17 19:32:09 +00:00
buildinfo.Height == 128 &&
buildinfo.Parts.Size() == 1)
{
// This must alter the size of both the texture image and the game texture.
- fixed checkForHacks placement.
2020-04-19 17:52:03 +00:00
buildinfo.Height = buildinfo.Parts[0].TexImage->GetImage()->GetHeight();
- fixed height fudging for Heretic's sky textures.
2020-09-26 19:13:00 +00:00
buildinfo.texture->SetSize(buildinfo.Width, buildinfo.Height);
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
return;
}
// The Doom E1 sky has its patch's y offset at -8 instead of 0.
if (gameinfo.gametype == GAME_Doom &&
!(gameinfo.flags & GI_MAPxx) &&
buildinfo.Name.Len() == 4 &&
buildinfo.Parts.Size() == 1 &&
buildinfo.Height == 128 &&
buildinfo.Parts[0].OriginY == -8 &&
buildinfo.Name[0] == 'S' &&
buildinfo.Name[1] == 'K' &&
buildinfo.Name[2] == 'Y' &&
buildinfo.Name[3] == '1')
{
buildinfo.Parts[0].OriginY = 0;
return;
}
// BIGDOOR7 in Doom also has patches at y offset -4 instead of 0.
if (gameinfo.gametype == GAME_Doom &&
!(gameinfo.flags & GI_MAPxx) &&
buildinfo.Name.CompareNoCase("BIGDOOR7") == 0 &&
buildinfo.Parts.Size() == 2 &&
buildinfo.Height == 128 &&
buildinfo.Parts[0].OriginY == -4 &&
buildinfo.Parts[1].OriginY == -4)
{
buildinfo.Parts[0].OriginY = 0;
buildinfo.Parts[1].OriginY = 0;
return;
}
}
- made status bar offset fixing unconditional. I think it is inevitable that such status bars will appear in mods sooner or later and with the old code it is virtually impossible to create a wide status bar that displays properly but gets subjected to this code.
2020-10-24 14:59:57 +00:00
static void FixWideStatusBar()
- add support for the (as of now) newest version of the Unity re-releases
2020-09-04 03:36:19 +00:00
{
- made status bar offset fixing unconditional. I think it is inevitable that such status bars will appear in mods sooner or later and with the old code it is virtually impossible to create a wide status bar that displays properly but gets subjected to this code.
2020-10-24 14:59:57 +00:00
FGameTexture* sbartex = TexMan.FindGameTexture("stbar", ETextureType::MiscPatch);
- do unity data status bar correction only if stbar is in an iwad
2020-09-05 10:18:41 +00:00
- refinement of the statusbar offset fix to only affect unscaled textures.
2020-10-24 15:11:44 +00:00
// only adjust offsets if none already exist and if the texture is not scaled. For scaled textures a proper offset is needed.
if (sbartex && sbartex->GetTexelWidth() > 320 && sbartex->GetScaleX() == 1 &&
- made status bar offset fixing unconditional. I think it is inevitable that such status bars will appear in mods sooner or later and with the old code it is virtually impossible to create a wide status bar that displays properly but gets subjected to this code.
2020-10-24 14:59:57 +00:00
!sbartex->GetTexelLeftOffset(0) && !sbartex->GetTexelTopOffset(0))
{
sbartex->SetOffsets(0, (sbartex->GetTexelWidth() - 320) / 2, 0);
sbartex->SetOffsets(1, (sbartex->GetTexelWidth() - 320) / 2, 0);
- add support for the (as of now) newest version of the Unity re-releases
2020-09-04 03:36:19 +00:00
}
}
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
//==========================================================================
//
- transitioned the 2D drawer to FGameTexture.
2020-04-13 23:23:37 +00:00
//
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
//
//==========================================================================
- moved DObject and core parts of the VM to 'common'. # Conflicts: # src/common/objects/dobject.h
2020-04-11 17:21:41 +00:00
static void Doom_CastSpriteIDToString(FString* a, unsigned int b)
{
*a = (b >= sprites.Size()) ? "TNT1" : sprites[b].name;
}
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
- moved most of the root marking out of the garbage collector, replacing it with callbacks. Yet another place where low level code was tied too tightly to the game instead of providing a proper interface.
2020-04-11 17:24:28 +00:00
extern DThinker* NextToThink;
static void GC_MarkGameRoots()
{
GC::Mark(DIntermissionController::CurrentIntermission);
GC::Mark(staticEventManager.FirstEventHandler);
GC::Mark(staticEventManager.LastEventHandler);
for (auto Level : AllLevels())
Level->Mark();
// Mark players.
for (int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
players[i].PropagateMark();
}
// NextToThink must not be freed while thinkers are ticking.
GC::Mark(NextToThink);
}
- added two more system callbacks for menu customization.
2020-10-08 15:42:46 +00:00
- updated common code from screenjob branch. That is, all parts not related to cutscenes.
2021-08-03 10:30:44 +00:00
static void System_ToggleFullConsole()
{
gameaction = ga_fullconsole;
}
- added two more system callbacks for menu customization.
2020-10-08 15:42:46 +00:00
bool CheckSkipGameOptionBlock(const char* str);
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// D_DoomMain
//
//==========================================================================
- refactored the exit calls out of the networking code These ones were particularly bad examples of misusing the exit handlers by temporarily installing one themselves and then calling exit to clean stuff up. Now they just return an error code to D_DoomMain to perform a regular exit.
2019-10-06 22:55:14 +00:00
static int D_DoomMain_Internal (void)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
int p;
const char *v;
const char *wad;
TArray<FString> pwads;
FString *args;
int argcount;
FIWadManager *iwad_man;
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
- moved most of the root marking out of the garbage collector, replacing it with callbacks. Yet another place where low level code was tied too tightly to the game instead of providing a proper interface.
2020-04-11 17:24:28 +00:00
GC::AddMarkerFunc(GC_MarkGameRoots);
- moved DObject and core parts of the VM to 'common'. # Conflicts: # src/common/objects/dobject.h
2020-04-11 17:21:41 +00:00
VM_CastSpriteIDToString = Doom_CastSpriteIDToString;
- use an array to store the buttons. This puts a lot less knowledge about the game's features into the low level code.
2020-04-11 16:09:51 +00:00
// Set up the button list. Mlook and Klook need a bit of extra treatment.
buttonMap.SetButtons(DoomButtons, countof(DoomButtons));
buttonMap.GetButton(Button_Mlook)->ReleaseHandler = Mlook_ReleaseHandler;
buttonMap.GetButton(Button_Mlook)->bReleaseLock = true;
buttonMap.GetButton(Button_Klook)->bReleaseLock = true;
- made sysCallbacks a value variable instead of a pointer to simplify the checks for it.
2020-10-03 14:47:47 +00:00
sysCallbacks = {
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
System_WantGuiCapture,
System_WantLeftButton,
System_NetGame,
System_WantNativeMouse,
System_CaptureModeInGame,
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
System_CrashInfo,
- moved a few files from 'rendering' to 'common'.
2020-04-25 19:52:21 +00:00
System_PlayStartupSound,
System_IsSpecialUI,
- moved the frame rate drawer out of DFrameBuffer. Too much of this is not shareable and all it consists of are drawing operations on the 2D drawer.
2020-04-27 21:53:26 +00:00
System_DisableTextureFilter,
- made video base code game independent
2020-04-28 15:22:17 +00:00
System_OnScreenSizeChanged,
System_GetSceneRect,
- moved the remaining core parts of the GL renderer to 'common'.
2020-04-29 15:19:17 +00:00
System_GetLocationDescription,
- moved out the Doom specific parts from menu.cpp and messagebox.cpp.
2020-06-13 20:43:35 +00:00
System_M_Dim,
- moved i_net into 'common' to bring it in line with Raze.
2020-09-27 10:23:22 +00:00
System_GetPlayerName,
- cleanup of mouse input code and removal of all magic factors. Sensitivity scaling of both axes is now exposed as a raw factor to the user instead of obscuring it behind an unclear 'prescale' boolean. This also consolidates the coordinate processing code to prevent such discrepancies as were present here from happening again. Migration code for old config settings is present so that this change does not affect existing configurations.
2020-09-28 19:13:34 +00:00
System_DispatchEvent,
- merged string table callbacks with system callbacks.
2020-10-04 19:12:47 +00:00
StrTable_ValidFilter,
- added two more system callbacks for menu customization.
2020-10-08 15:42:46 +00:00
StrTable_GetGender,
nullptr,
CheckSkipGameOptionBlock,
- some fixes for the console. * it is now possible to switch back to the main intro loop from the fullscreen console. * do not distort the background of the fullscreen console. Always draw the console on top of what the main loop currently displays with a translucent black overlay. * do not use the CONPIC for the fullscreen console as it tends to be more of a distraction than an asset when filling the entire screen. * cleaned up c_console.cpp and moved several pieces of code unrelated to actual console management out of it.
2020-10-25 08:16:37 +00:00
System_ConsoleToggled,
- updated common code from screenjob branch. That is, all parts not related to cutscenes.
2021-08-03 10:30:44 +00:00
nullptr,
nullptr,
System_ToggleFullConsole,
nullptr,
- reduce backend's dependency on game state by using callbacks.
2020-04-11 16:22:21 +00:00
};
- made sysCallbacks a value variable instead of a pointer to simplify the checks for it.
2020-10-03 14:47:47 +00:00
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
std::set_new_handler(NewFailure);
Normalize line endings
2016-03-01 15:47:10 +00:00
const char *batchout = Args->CheckValue("-errorlog");
- moved the initial C_InitConsole call into D_DoomMain The only difference here were the size values on Windows but for this initial call they have been useless for a long time. When this code was written the console buffer still had a fixed width that needed to be set before adding any text.
2019-09-30 23:00:37 +00:00
C_InitConsole(80*8, 25*8, false);
- moced I_DetectOS call into D_DoomMain This requires the console and was the reason for this strange setup.
2019-09-30 23:02:49 +00:00
I_DetectOS();
Normalize line endings
2016-03-01 15:47:10 +00:00
// +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here.
FString logfile = Args->TakeValue("+logfile");
if (logfile.IsNotEmpty())
{
execLogfile(logfile);
}
else if (batchout != NULL && *batchout != 0)
{
batchrun = true;
- minor sound code cleanup # Conflicts: # src/sound/backend/oalsound.cpp
2020-04-11 16:26:58 +00:00
nosound = true;
Normalize line endings
2016-03-01 15:47:10 +00:00
execLogfile(batchout, true);
Printf("Command line: ");
for (int i = 0; i < Args->NumArgs(); i++)
{
Printf("%s ", Args->GetArg(i));
}
Printf("\n");
}
if (Args->CheckParm("-hashfiles"))
{
const char *filename = "fileinfo.txt";
Printf("Hashing loaded content to: %s\n", filename);
hashfile = fopen(filename, "w");
if (hashfile)
{
fprintf(hashfile, "%s version %s (%s)\n", GAMENAME, GetVersionString(), GetGitHash());
#ifdef __VERSION__
fprintf(hashfile, "Compiler version: %s\n", __VERSION__);
#endif
fprintf(hashfile, "Command line:");
for (int i = 0; i < Args->NumArgs(); ++i)
{
fprintf(hashfile, " %s", Args->GetArg(i));
}
fprintf(hashfile, "\n");
}
}
- print the version at the start of the log.
2017-08-19 18:13:12 +00:00
if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString());
Normalize line endings
2016-03-01 15:47:10 +00:00
D_DoomInit();
Added native UI dialog to confirm stats collection Implemented only for Windows so far Need good message to explain purpose of this feature
2018-03-14 08:20:46 +00:00
extern void D_ConfirmSendStats();
D_ConfirmSendStats();
Normalize line endings
2016-03-01 15:47:10 +00:00
// [RH] Make sure zdoom.pk3 is always loaded,
// as it contains magic stuff we need.
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
wad = BaseFileSearch (BASEWAD, NULL, true, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
if (wad == NULL)
{
I_FatalError ("Cannot find " BASEWAD);
}
FString basewad = wad;
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
FString optionalwad = BaseFileSearch(OPTIONALWAD, NULL, true, GameConfig);
- don't call BaseFileSearch inside of d_iwad.cpp since it is supposed to be treated as a private function.
2017-09-09 10:36:20 +00:00
- moved iwadinfo.txt to zd_extra.pk3. This was done for two reasons: 1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error. 2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
2019-07-16 18:22:15 +00:00
iwad_man = new FIWadManager(basewad, optionalwad);
Normalize line endings
2016-03-01 15:47:10 +00:00
// Now that we have the IWADINFO, initialize the autoload ini sections.
GameConfig->DoAutoloadSetup(iwad_man);
Don't let the game start if the saved game passed to -loadgame is invalid. Often times, especially during a multiplayer game, a player can accidentally pass an invalid save file to load at the command line, which results in the netgame starting anyway before immediately desyncing. This aims to address that.
2021-03-25 09:53:36 +00:00
// Prevent the game from starting if the savegame passed to -loadgame is invalid
v = Args->CheckValue("-loadgame");
if (v)
{
FString file(v);
FixPathSeperator(file);
DefaultExtension(file, "." SAVEGAME_EXT);
if (!FileExists(file))
{
I_FatalError("Cannot find savegame %s", file.GetChars());
}
}
Normalize line endings
2016-03-01 15:47:10 +00:00
// reinit from here
do
{
PClass::StaticInit();
PType::StaticInit();
if (restart)
{
C_InitConsole(SCREENWIDTH, SCREENHEIGHT, false);
}
nospriterename = false;
// Load zdoom.pk3 alone so that we can get access to the internal gameinfos before
// the IWAD is known.
GetCmdLineFiles(pwads);
FString iwad = CheckGameInfo(pwads);
// The IWAD selection dialogue does not show in fullscreen so if the
// restart is initiated without a defined IWAD assume for now that it's not going to change.
if (iwad.IsEmpty()) iwad = lastIWAD;
if (iwad_man == NULL)
{
- moved iwadinfo.txt to zd_extra.pk3. This was done for two reasons: 1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error. 2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
2019-07-16 18:22:15 +00:00
iwad_man = new FIWadManager(basewad, optionalwad);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- don't call BaseFileSearch inside of d_iwad.cpp since it is supposed to be treated as a private function.
2017-09-09 10:36:20 +00:00
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad, optionalwad);
replaced all 'exit's with an ExitEvent exception The main exits are initiated from code that cannot filter this back to D_DoomMain easily so the exception is the only way to get there. The 3 main points of exit are: * quit/exit CCMD * quitting the menu through ST_Endoom * receiving a quit message on the main window.
2019-10-06 23:24:51 +00:00
if (!iwad_info) return 0; // user exited the selection popup via cancel button.
Normalize line endings
2016-03-01 15:47:10 +00:00
gameinfo.gametype = iwad_info->gametype;
gameinfo.flags = iwad_info->flags;
Added 'NoKeyboardCheats' option to IWADINFO This is useful for IWADs that do not want to use the hardcoded engine cheats. This can still be overriden with the 'allcheats' CVAR
2019-11-13 11:58:27 +00:00
gameinfo.nokeyboardcheats = iwad_info->nokeyboardcheats;
Normalize line endings
2016-03-01 15:47:10 +00:00
gameinfo.ConfigName = iwad_info->Configname;
lastIWAD = iwad;
- moved game state connections of the startup screen out of the backend code.
2020-04-22 22:02:34 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
if ((gameinfo.flags & GI_SHAREWARE) && pwads.Size() > 0)
{
I_FatalError ("You cannot -file with the shareware version. Register!");
}
FBaseCVar::DisableCallbacks();
GameConfig->DoGameSetup (gameinfo.ConfigName);
AddAutoloadFiles(iwad_info->Autoname);
// Process automatically executed files
FExecList *exec;
- block direct use of 'new' for DObjects. This is to ensure that the Class pointer can be set right on creation. ZDoom had always depended on handling this lazily which poses some problems for the VM. So now there is a variadic Create<classtype> function taking care of that, but to ensure that it gets used, direct access to the new operator has been blocked. This also neccessitated making DArgs a regular object because they get created before the type system is up. Since the few uses of DArgs are easily controllable this wasn't a big issue. - did a bit of optimization on the bots' decision making whether to pick up a health item or not.
2017-04-14 11:31:58 +00:00
FArgs *execFiles = new FArgs;
- add `-noautoexec` command line parameter to disable the execution of autoexec.cfg files
2021-02-14 15:47:00 +00:00
if (!(Args->CheckParm("-noautoexec")))
GameConfig->AddAutoexec(execFiles, gameinfo.ConfigName);
Normalize line endings
2016-03-01 15:47:10 +00:00
exec = D_MultiExec(execFiles, NULL);
- block direct use of 'new' for DObjects. This is to ensure that the Class pointer can be set right on creation. ZDoom had always depended on handling this lazily which poses some problems for the VM. So now there is a variadic Create<classtype> function taking care of that, but to ensure that it gets used, direct access to the new operator has been blocked. This also neccessitated making DArgs a regular object because they get created before the type system is up. Since the few uses of DArgs are easily controllable this wasn't a big issue. - did a bit of optimization on the bots' decision making whether to pick up a health item or not.
2017-04-14 11:31:58 +00:00
delete execFiles;
Normalize line endings
2016-03-01 15:47:10 +00:00
// Process .cfg files at the start of the command line.
execFiles = Args->GatherFiles ("-exec");
exec = D_MultiExec(execFiles, exec);
- block direct use of 'new' for DObjects. This is to ensure that the Class pointer can be set right on creation. ZDoom had always depended on handling this lazily which poses some problems for the VM. So now there is a variadic Create<classtype> function taking care of that, but to ensure that it gets used, direct access to the new operator has been blocked. This also neccessitated making DArgs a regular object because they get created before the type system is up. Since the few uses of DArgs are easily controllable this wasn't a big issue. - did a bit of optimization on the bots' decision making whether to pick up a health item or not.
2017-04-14 11:31:58 +00:00
delete execFiles;
Normalize line endings
2016-03-01 15:47:10 +00:00
// [RH] process all + commands on the command line
exec = C_ParseCmdLineParams(exec);
CopyFiles(allwads, pwads);
if (exec != NULL)
{
- moved the file lookup functions to utilities. # Conflicts: # src/common/utility/findfile.cpp
2020-04-11 16:08:20 +00:00
exec->AddPullins(allwads, GameConfig);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
// Since this function will never leave we must delete this array here manually.
pwads.Clear();
pwads.ShrinkToFit();
if (hashfile)
{
Printf("Notice: File hashing is incredibly verbose. Expect loading files to take much longer than usual.\n");
}
if (!batchrun) Printf ("W_Init: Init WADfiles.\n");
- pass lump filters as parameter when initializing the file system to reduce dependencies on high level state in the low level code.
2020-04-11 11:21:18 +00:00
LumpFilterInfo lfi;
lfi.dotFilter = LumpFilterIWAD;
static const struct { int match; const char* name; } blanket[] =
{
{ GAME_Raven, "game-Raven" },
{ GAME_DoomStrifeChex, "game-DoomStrifeChex" },
{ GAME_DoomChex, "game-DoomChex" },
{ GAME_Any, NULL }
};
for (auto& inf : blanket)
{
if (gameinfo.gametype & inf.match) lfi.gameTypeFilter.Push(inf.name);
}
lfi.gameTypeFilter.Push(FStringf("game-%s", GameTypeName()));
- fixed setup of IPK3's where all content is in a subdirectory. These never received the file name list that was needed to eliminate this directory from internal paths.
2020-04-19 11:04:29 +00:00
for (auto p : iwad_folders) lfi.reservedFolders.Push(p);
for (auto p : iwad_reserved) lfi.requiredPrefixes.Push(p);
- moved the file names used for deciding to remove the root directory of zips out of the resource file management. Yet again too much dependencies on game specifics in low level code.
2020-04-11 11:22:28 +00:00
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
lfi.postprocessFunc = [&]()
{
RenameNerve(fileSystem);
RenameSprites(fileSystem, iwad_info->DeleteLumps);
FixMacHexen(fileSystem);
- renamed more stuff and also moved the Strife teaser voice handling out of the file system.
2020-04-11 11:27:19 +00:00
FindStrifeTeaserVoices(fileSystem);
- more file system refactoring. * moved the sprite renaming out of the file system entirely into a caller-provided callback. * renamed several functions to closer match the terms of a file system. * moved the VM interface out of the implementation.
2020-04-11 11:26:42 +00:00
};
fileSystem.InitMultipleFiles (allwads, false, &lfi);
Normalize line endings
2016-03-01 15:47:10 +00:00
allwads.Clear();
allwads.ShrinkToFit();
SetMapxxFlag();
- CVAR cleanup, in particular decoupling from game internals, which now get handled via callbacks.
2020-04-11 11:48:55 +00:00
D_GrabCVarDefaults(); //parse DEFCVARS
- implement 'defcvars' # Conflicts: # src/d_main.cpp
2019-11-27 23:27:59 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
GameConfig->DoKeySetup(gameinfo.ConfigName);
// Now that wads are loaded, define mod-specific cvars.
ParseCVarInfo();
// Actually exec command line commands and exec files.
if (exec != NULL)
{
exec->ExecCommands();
delete exec;
exec = NULL;
}
// [RH] Initialize localizable strings.
- decoupled the string table from game implementation details. Using callbacks now to query needed game state.
2020-04-11 16:12:28 +00:00
GStrings.LoadStrings (language);
Normalize line endings
2016-03-01 15:47:10 +00:00
V_InitFontColors ();
// [RH] Moved these up here so that we can do most of our
// startup output in a fullscreen console.
CT_Init ();
if (!restart)
{
if (!batchrun) Printf ("I_Init: Setting up machine state.\n");
- make DumpCPUInfo return a string instead of letting it print the info itself. Also consolidated I_Init, because both existing versions were identical.
2020-04-11 11:05:12 +00:00
CheckCPUID(&CPU);
CalculateCPUSpeed();
auto ci = DumpCPUInfo(&CPU);
Printf("%s", ci.GetChars());
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- reordered a few things in the startup procedure Mainly done to isolate the calls that actually manipulate the global frame buffer. V_Init alsoi initialized some palette data, which was moved to V_InitPalette and did something entirely different when running a restart as opposed to an initial start.
2019-09-30 22:21:51 +00:00
// [RH] Initialize palette management
InitPalette ();
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!batchrun) Printf ("V_Init: allocate screen.\n");
- reordered a few things in the startup procedure Mainly done to isolate the calls that actually manipulate the global frame buffer. V_Init alsoi initialized some palette data, which was moved to V_InitPalette and did something entirely different when running a restart as opposed to an initial start.
2019-09-30 22:21:51 +00:00
if (!restart)
{
V_InitScreenSize();
}
if (!restart)
{
// This allocates a dummy framebuffer as a stand-in until V_Init2 is called.
V_InitScreen ();
}
if (restart)
{
// Update screen palette when restarting
screen->UpdatePalette();
}
Normalize line endings
2016-03-01 15:47:10 +00:00
// Base systems have been inited; enable cvar callbacks
FBaseCVar::EnableCallbacks ();
if (!batchrun) Printf ("S_Init: Setting up sound.\n");
S_Init ();
if (!batchrun) Printf ("ST_Init: Init startup screen.\n");
if (!restart)
{
- moved game state connections of the startup screen out of the backend code.
2020-04-22 22:02:34 +00:00
if (GameStartupInfo.Type == FStartupInfo::DefaultStartup)
{
switch (gameinfo.gametype)
{
case GAME_Hexen:
GameStartupInfo.Type = FStartupInfo::HexenStartup;
break;
case GAME_Heretic:
GameStartupInfo.Type = FStartupInfo::HereticStartup;
break;
case GAME_Strife:
GameStartupInfo.Type = FStartupInfo::StrifeStartup;
break;
default:
break;
}
}
Normalize line endings
2016-03-01 15:47:10 +00:00
StartScreen = FStartupScreen::CreateInstance (TexMan.GuesstimateNumTextures() + 5);
}
else
{
StartScreen = new FStartupScreen(0);
}
CheckCmdLine();
// [RH] Load sound environments
S_ParseReverbDef ();
// [RH] Parse any SNDINFO lumps
if (!batchrun) Printf ("S_InitData: Load sound definitions.\n");
S_InitData ();
// [RH] Parse through all loaded mapinfo lumps
if (!batchrun) Printf ("G_ParseMapInfo: Load map definitions.\n");
G_ParseMapInfo (iwad_info->MapInfo);
- moved out the Doom specific parts from menu.cpp and messagebox.cpp.
2020-06-13 20:43:35 +00:00
MessageBoxClass = gameinfo.MessageBoxClass;
- assigned endoom lump name after mapinfo is parsed https://forum.zdoom.org/viewtopic.php?t=69032
2020-06-19 07:53:28 +00:00
endoomName = gameinfo.Endoom;
- exposed menu blur amount to engine interface https://forum.zdoom.org/viewtopic.php?t=69056
2020-06-20 09:06:49 +00:00
menuBlurAmount = gameinfo.bluramount;
Normalize line endings
2016-03-01 15:47:10 +00:00
ReadStatistics();
// MUSINFO must be parsed after MAPINFO
S_ParseMusInfo();
if (!batchrun) Printf ("Texman.Init: Init texture manager.\n");
- optimization of texture scaling checks. The texture dimension checks can be performed up front when the texture is inserted into the texture manager.
2020-04-16 22:37:05 +00:00
UpdateUpscaleMask();
- major dependency reduction of the texture system.
2020-04-11 17:00:07 +00:00
SpriteFrames.Clear();
TexMan.Init([]() { StartScreen->Progress(); }, CheckForHacks);
PatchTextures();
- split animation management out of the texture manager into a separate class.
2020-04-11 16:54:54 +00:00
TexAnim.Init();
- some minor adjustments to the console init interface.
2020-10-25 14:40:58 +00:00
C_InitConback(TexMan.CheckForTexture(gameinfo.BorderFlat, ETextureType::Flat), true, 0.25);
Normalize line endings
2016-03-01 15:47:10 +00:00
- made status bar offset fixing unconditional. I think it is inevitable that such status bars will appear in mods sooner or later and with the old code it is virtually impossible to create a wide status bar that displays properly but gets subjected to this code.
2020-10-24 14:59:57 +00:00
FixWideStatusBar();
- add support for the (as of now) newest version of the Unity re-releases
2020-09-04 03:36:19 +00:00
- streamlined font handling for scripts a bit. - moved the two 'you raised the alarm' messages for Strife to the string table
2017-02-05 12:14:22 +00:00
StartScreen->Progress();
V_InitFonts();
- moved Doom specific font init code out of the backend.
2021-05-29 13:24:05 +00:00
InitDoomFonts();
- fixed startup and font init crashes.
2020-05-04 18:06:54 +00:00
V_LoadTranslations();
- palette related fixes.
2020-04-11 17:18:47 +00:00
UpdateGenericUI(false);
- streamlined font handling for scripts a bit. - moved the two 'you raised the alarm' messages for Strife to the string table
2017-02-05 12:14:22 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
// [CW] Parse any TEAMINFO lumps.
if (!batchrun) Printf ("ParseTeamInfo: Load team definitions.\n");
TeamLibrary.ParseTeamInfo ();
- added TRNSLATE lump for defining global translations which are accessible by name. This is only the definition part, manipulation functions for ACS and DECORATE still to do.
2016-10-02 11:35:25 +00:00
R_ParseTrnslate();
Normalize line endings
2016-03-01 15:47:10 +00:00
PClassActor::StaticInit ();
// [GRB] Initialize player class list
SetupPlayerClasses ();
// [RH] Load custom key and weapon settings from WADs
D_LoadWadSettings ();
// [GRB] Check if someone used clearplayerclasses but not addplayerclass
if (PlayerClasses.Size () == 0)
{
I_FatalError ("No player classes defined");
}
StartScreen->Progress ();
- moved dynamic lights out of the GL code into the common game code. Since the true color software renderer also handles them there is no point keeping them on the GL side. This also optimized how they are stored, because we no longer need to be aware of a base engine which doesn't have them.
2017-03-12 15:56:00 +00:00
ParseGLDefs();
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!batchrun) Printf ("R_Init: Init %s refresh subsystem.\n", gameinfo.ConfigName.GetChars());
StartScreen->LoadingStatus ("Loading graphics", 0x3f);
R_Init ();
if (!batchrun) Printf ("DecalLibrary: Load decals.\n");
DecalLibrary.ReadAllDecals ();
DEHACKED lumps from IWAD now have precedence over embedded lumps and separate files See https://forum.drdteam.org/viewtopic.php?t=7588 Processing order is now the same as in Chocolate Doom prBoom+ loads separate files after all WAD lumps though This makes sense but would change loading sequence existed in ZDoom for years
2017-04-04 09:20:12 +00:00
// Load embedded Dehacked patches
D_LoadDehLumps(FromIWAD);
Normalize line endings
2016-03-01 15:47:10 +00:00
// [RH] Add any .deh and .bex files on the command line.
// If there are none, try adding any in the config file.
// Note that the command line overrides defaults from the config.
if ((ConsiderPatches("-deh") | ConsiderPatches("-bex")) == 0 &&
gameinfo.gametype == GAME_Doom && GameConfig->SetSection ("Doom.DefaultDehacked"))
{
const char *key;
const char *value;
while (GameConfig->NextInSection (key, value))
{
if (stricmp (key, "Path") == 0 && FileExists (value))
{
if (!batchrun) Printf ("Applying patch %s\n", value);
D_LoadDehFile(value);
}
}
}
// Load embedded Dehacked patches
DEHACKED lumps from IWAD now have precedence over embedded lumps and separate files See https://forum.drdteam.org/viewtopic.php?t=7588 Processing order is now the same as in Chocolate Doom prBoom+ loads separate files after all WAD lumps though This makes sense but would change loading sequence existed in ZDoom for years
2017-04-04 09:20:12 +00:00
D_LoadDehLumps(FromPWADs);
Normalize line endings
2016-03-01 15:47:10 +00:00
// Create replacements for dehacked pickups
FinishDehPatch();
- removed native option menu controls. Note that this commit will not compile!
2017-02-11 20:28:48 +00:00
if (!batchrun) Printf("M_Init: Init menus.\n");
- moved most of the menu code into the backend.
2020-10-04 20:12:56 +00:00
SetDefaultMenuColors();
- removed native option menu controls. Note that this commit will not compile!
2017-02-11 20:28:48 +00:00
M_Init();
- split game dependent parts out of menudef.cpp.
2020-06-13 22:27:32 +00:00
M_CreateGameMenus();
- removed native option menu controls. Note that this commit will not compile!
2017-02-11 20:28:48 +00:00
- delete all compile-time symbols for scripting after finishing compiling data. Even the bare-bones gzdoom.pk3 gets rid of over 2000 symbols this way that otherwise would need to be tracked by the garbage collector.
2017-01-24 10:57:42 +00:00
// clean up the compiler symbols which are not needed any longer.
RemoveUnusedSymbols();
Normalize line endings
2016-03-01 15:47:10 +00:00
InitActorNumsFromMapinfo();
InitSpawnablesFromMapinfo();
PClassActor::StaticSetActorNums();
//Added by MC:
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
primaryLevel->BotInfo.getspawned.Clear();
Normalize line endings
2016-03-01 15:47:10 +00:00
argcount = Args->CheckParmList("-bots", &args);
for (p = 0; p < argcount; ++p)
{
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
primaryLevel->BotInfo.getspawned.Push(args[p]);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
primaryLevel->BotInfo.spawn_tries = 0;
primaryLevel->BotInfo.wanted_botnum = primaryLevel->BotInfo.getspawned.Size();
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!batchrun) Printf ("P_Init: Init Playloop state.\n");
StartScreen->LoadingStatus ("Init game engine", 0x3f);
AM_StaticInit();
P_Init ();
P_SetupWeapons_ntohton();
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
//SBarInfo support. Note that the first SBARINFO lump contains the mugshot definition so it even needs to be read when a regular status bar is being used.
SBarInfo::Load();
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!batchrun)
{
// [RH] User-configurable startup strings. Because BOOM does.
static const char *startupString[5] = {
"STARTUP1", "STARTUP2", "STARTUP3", "STARTUP4", "STARTUP5"
};
for (p = 0; p < 5; ++p)
{
- implemented string table macros.
2019-03-02 11:06:24 +00:00
// At this point we cannot use the player's gender info yet so force 'male' here.
const char *str = GStrings.GetString(startupString[p], nullptr, 0);
Normalize line endings
2016-03-01 15:47:10 +00:00
if (str != NULL && str[0] != '\0')
{
Printf("%s\n", str);
}
}
}
if (!restart)
{
if (!batchrun) Printf ("D_CheckNetGame: Checking network game status.\n");
StartScreen->LoadingStatus ("Checking network game status.", 0x3f);
- refactored the exit calls out of the networking code These ones were particularly bad examples of misusing the exit handlers by temporarily installing one themselves and then calling exit to clean stuff up. Now they just return an error code to D_DoomMain to perform a regular exit.
2019-10-06 22:55:14 +00:00
if (!D_CheckNetGame ())
{
return 0;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- Added auto-detection scheme for r_vanillatrans It now works the following way: (0) - Force off (ZDoom defaults) (1) - Force on (Doom defaults) (2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default) (3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-04 00:00:53 +00:00
// [SP] Force vanilla transparency auto-detection to re-detect our game lumps now
UpdateVanillaTransparency();
Normalize line endings
2016-03-01 15:47:10 +00:00
// [RH] Lock any cvars that should be locked now that we're
// about to begin the game.
FBaseCVar::EnableNoSet ();
delete iwad_man; // now we won't need this anymore
iwad_man = NULL;
// [RH] Run any saved commands from the command line or autoexec.cfg now.
gamestate = GS_FULLCONSOLE;
Net_NewMakeTic ();
- took the delayed console command execution out of the thinker management. Doing this intermingled with the thinkers is highly unsafe because there are absolutely no guarantees about order of execution. Effectively it ran these commands right in the middle of the playsim which could cause all sorts of synchronization issues, because CCMDs are part of the UI, not the playsim. - pass a const string to AddCommandString. This function manipulated the input buffer, leading to all sorts of code contortions to make sure that the passed parameter is clean for that. This function will now create a copy of the passed parameter which it can manipulate without complicating its calling code. # Conflicts: # src/c_dispatch.cpp
2019-01-27 09:23:47 +00:00
C_RunDelayedCommands();
Normalize line endings
2016-03-01 15:47:10 +00:00
gamestate = GS_STARTUP;
- add cvar 'cl_disableinvertedcolormap' - changes the invulnerability… (#972) * - add cvar 'cl_disableinvertedcolormap' - changes the invulnerability sphere to instead be a regular desaturated colormap that transitions from deep blue to pale yellow * - add menu option for cl_disableinvertedcolormap * - added customization for invulnerability colormap * - fixed custom colormap being calculated incorrectly * - disable custom invulnerability map before the main game loop
2019-11-26 12:46:18 +00:00
// enable custom invulnerability map here
if (cl_customizeinvulmap)
- customized invulnerability colormap does not interfere with Powerup.ColorMap https://forum.zdoom.org/viewtopic.php?t=66955
2020-01-18 15:44:58 +00:00
R_UpdateInvulnerabilityColormap();
- add cvar 'cl_disableinvertedcolormap' - changes the invulnerability… (#972) * - add cvar 'cl_disableinvertedcolormap' - changes the invulnerability sphere to instead be a regular desaturated colormap that transitions from deep blue to pale yellow * - add menu option for cl_disableinvertedcolormap * - added customization for invulnerability colormap * - fixed custom colormap being calculated incorrectly * - disable custom invulnerability map before the main game loop
2019-11-26 12:46:18 +00:00
Normalize line endings
2016-03-01 15:47:10 +00:00
if (!restart)
{
// start the apropriate game based on parms
v = Args->CheckValue ("-record");
if (v)
{
G_RecordDemo (v);
autostart = true;
}
delete StartScreen;
StartScreen = NULL;
- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated. - added Marisa Kirisame's CHAN_OVERLAP flag. - exported S_IsActorPlayingSomething to ZScript. The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 22:52:39 +00:00
S_Sound (CHAN_BODY, 0, "misc/startupdone", 1, ATTN_NONE);
Normalize line endings
2016-03-01 15:47:10 +00:00
if (Args->CheckParm("-norun") || batchrun)
{
- refactored the exit calls out of the networking code These ones were particularly bad examples of misusing the exit handlers by temporarily installing one themselves and then calling exit to clean stuff up. Now they just return an error code to D_DoomMain to perform a regular exit.
2019-10-06 22:55:14 +00:00
return 1337; // special exit
Normalize line endings
2016-03-01 15:47:10 +00:00
}
V_Init2();
- 2D drawer cleanup.
2020-04-11 17:46:57 +00:00
twod->fullscreenautoaspect = gameinfo.fullscreenautoaspect;
- fixed startup and font init crashes.
2020-05-04 18:06:54 +00:00
// Initialize the size of the 2D drawer so that an attempt to access it outside the draw code won't crash.
twod->Begin(screen->GetWidth(), screen->GetHeight());
twod->End();
Normalize line endings
2016-03-01 15:47:10 +00:00
UpdateJoystickMenu(NULL);
Remove Quad-buffered from list of VR-modes if we know it won't work.
2019-03-01 05:19:09 +00:00
UpdateVRModes();
Normalize line endings
2016-03-01 15:47:10 +00:00
v = Args->CheckValue ("-loadgame");
if (v)
{
FString file(v);
FixPathSeperator (file);
- implemented saving of new format savegames as zips. The code for that was adapted from zipdir.c.
2016-09-21 15:37:56 +00:00
DefaultExtension (file, "." SAVEGAME_EXT);
Normalize line endings
2016-03-01 15:47:10 +00:00
G_LoadGame (file);
}
v = Args->CheckValue("-playdemo");
if (v != NULL)
{
singledemo = true; // quit after one demo
G_DeferedPlayDemo (v);
D_DoomLoop (); // never returns
}
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
else
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
v = Args->CheckValue("-timedemo");
if (v)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
G_TimeDemo(v);
D_DoomLoop(); // never returns
}
else
{
if (gameaction != ga_loadgame && gameaction != ga_loadgamehidecon)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
if (autostart || netgame)
{
// Do not do any screenwipes when autostarting a game.
if (!Args->CheckParm("-warpwipe"))
{
NoWipe = TICRATE;
}
CheckWarpTransMap(startmap, true);
if (demorecording)
G_BeginRecording(startmap);
G_InitNew(startmap, false);
if (StoredWarp.IsNotEmpty())
{
- took the delayed console command execution out of the thinker management. Doing this intermingled with the thinkers is highly unsafe because there are absolutely no guarantees about order of execution. Effectively it ran these commands right in the middle of the playsim which could cause all sorts of synchronization issues, because CCMDs are part of the UI, not the playsim. - pass a const string to AddCommandString. This function manipulated the input buffer, leading to all sorts of code contortions to make sure that the passed parameter is clean for that. This function will now create a copy of the passed parameter which it can manipulate without complicating its calling code. # Conflicts: # src/c_dispatch.cpp
2019-01-27 09:23:47 +00:00
AddCommandString(StoredWarp);
- switched the Windows backend to use the Windows Unicode API. With localization for non-Latin languages on the support list the multibyte API doesn't cut it anymore. It neither can handle system text output outside the local code page nor can an ANSI window receive text input outside its own code page. Similar problems exist for file names. With the multibyte API it is impossible to handle any file containing characters outside the active local code page. So as of now, everything that may pass along some Unicode text will use the Unicode API with some text conversion functions. The only places where calls to the multibyte API were left are those where known string literals are passed or where the information is not used for anything but comparing it to other return values from the same API.
2019-02-14 21:22:15 +00:00
StoredWarp = "";
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
}
}
else
{
D_StartTitle(); // start up intro loop
}
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
else if (demorecording)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
- fixed: Custom automap colors were not invalidated on restart. - fixed: D_DoomMain has 3 calls to D_DoomLoop but only the main call of these was capable of a clean restart.
2016-12-03 14:44:46 +00:00
G_BeginRecording(NULL);
Normalize line endings
2016-03-01 15:47:10 +00:00
}
}
}
}
else
{
// These calls from inside V_Init2 are still necessary
C_NewModeAdjust();
D_StartTitle (); // start up intro loop
setmodeneeded = false; // This may be set to true here, but isn't needed for a restart
}
- implemented anonymous stats collector
2018-03-05 04:49:01 +00:00
D_DoAnonStats();
- update window title with current level name
2019-12-25 14:52:57 +00:00
I_UpdateWindowTitle();
- added I_FriendlyWindowTitle cvar, which takes the current game/mod name and uses it as a default window title.
2017-10-31 23:47:56 +00:00
- don't show the IWAD picker upon restart. This doesn't work with fullscreen mode. Instead just pick the first IWAD from the list until a better solution can be implemented. - handle a 'restart' CCMD a bit more controlled. Instead of throwing an exception in the CCMD handler it now just flags D_DoomLoop to return. If the exception is thrown within the CCMD this can easily happen deep inside the renderer when it calls NetUpdate. But since the software renderer with its use of global variables is not equipped to be yanked out of lile this it could leave broken data behind that caused glitches or even crashes on subsequently played maps.
2016-03-08 12:07:21 +00:00
D_DoomLoop (); // this only returns if a 'restart' CCMD is given.
//
// Clean up after a restart
//
Normalize line endings
2016-03-01 15:47:10 +00:00
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
D_Cleanup();
- restore startup game state on restart At least values of custom server CVARs were not restored because of this https://forum.zdoom.org/viewtopic.php?t=60711
2018-05-27 13:15:05 +00:00
gamestate = GS_STARTUP;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
while (1);
}
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
int GameMain()
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
{
int ret = 0;
- moved high level code out of i_time.cpp.
2020-03-18 12:58:10 +00:00
GameTicRate = TICRATE;
- setup console handlers earlier to make them available during exit cleanup https://forum.zdoom.org/viewtopic.php?t=70093
2020-10-10 14:28:09 +00:00
ConsoleCallbacks cb = {
D_UserInfoChanged,
D_SendServerInfoChange,
D_SendServerFlagChange,
G_GetUserCVar,
[]() { return gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP; }
};
C_InstallHandlers(&cb);
- cleaned up c_console.cpp to be moved into 'common'.
2020-10-25 11:18:06 +00:00
SetConsoleNotifyBuffer();
- setup console handlers earlier to make them available during exit cleanup https://forum.zdoom.org/viewtopic.php?t=70093
2020-10-10 14:28:09 +00:00
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
try
{
- refactored the exit calls out of the networking code These ones were particularly bad examples of misusing the exit handlers by temporarily installing one themselves and then calling exit to clean stuff up. Now they just return an error code to D_DoomMain to perform a regular exit.
2019-10-06 22:55:14 +00:00
ret = D_DoomMain_Internal();
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
}
replaced all 'exit's with an ExitEvent exception The main exits are initiated from code that cannot filter this back to D_DoomMain easily so the exception is the only way to get there. The 3 main points of exit are: * quit/exit CCMD * quitting the menu through ST_Endoom * receiving a quit message on the main window.
2019-10-06 23:24:51 +00:00
catch (const CExitEvent &exit) // This is a regular exit initiated from deeply nested code.
{
ret = exit.Reason();
}
catch (const std::exception &error)
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
{
I_ShowFatalError(error.what());
ret = -1;
}
// Unless something really bad happened, the game should only exit through this single point in the code.
// No more 'exit', please.
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
D_Cleanup();
CloseNetwork();
GC::FinalGC = true;
GC::FullGC();
GC::DelSoftRootHead(); // the soft root head will not be collected by a GC so we have to do it explicitly
C_DeinitConsole();
R_DeinitColormaps();
R_Shutdown();
I_ShutdownGraphics();
I_ShutdownInput();
M_SaveDefaultsFinal();
DeleteStartupScreen();
delete Args;
Args = nullptr;
- moved all exception handling out of the backends The main catch is now in D_DoomMain, only calling platform specific functions to handle the output for the error. As a nice side effect, -norun can now be done without an exception, just by exiting D_DoomMain with a special exit code.
2019-10-06 22:37:56 +00:00
return ret;
}
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
//==========================================================================
//
// clean up the resources
//
//==========================================================================
void D_Cleanup()
{
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
if (demorecording)
{
G_CheckDemoStatus();
}
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
// Music and sound should be stopped first
S_StopMusic(true);
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
S_ClearSoundData();
S_UnloadReverbDef();
G_ClearMapinfo();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
M_ClearMenus(); // close menu if open
F_EndFinale(); // If an intermission is active, end it now
AM_ClearColorsets();
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
DeinitSWColorMaps();
FreeSBarInfoScript();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
// clean up game state
D_ErrorCleanup ();
- the big cleanup of the exit cleanup is done! atterm is gone and only a few system-side functions use atexit. All game side cleanup is performed in D_DoomMain now.
2019-10-07 18:28:55 +00:00
P_Shutdown();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
M_SaveDefaults(NULL); // save config before the restart
// delete all data that cannot be left until reinitialization
- moved RenderView out of the framebuffer classes to complete the consolidation of the renderer's entry points.
2020-04-25 15:58:26 +00:00
CleanSWDrawer();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
V_ClearFonts(); // must clear global font pointers
ColorSets.Clear();
PainFlashes.Clear();
gameinfo.~gameinfo_t();
new (&gameinfo) gameinfo_t; // Reset gameinfo
S_Shutdown(); // free all channels and delete playlist
C_ClearAliases(); // CCMDs won't be reinitialized so these need to be deleted here
DestroyCVarsFlagged(CVAR_MOD); // Delete any cvar left by mods
DeinitMenus();
- split game dependent parts out of menudef.cpp.
2020-06-13 22:27:32 +00:00
savegameManager.ClearSaveGames();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
LightDefaults.DeleteAndClear(); // this can leak heap memory if it isn't cleared.
- split animation management out of the texture manager into a separate class.
2020-04-11 16:54:54 +00:00
TexAnim.DeleteAll();
- store the Vulkan descriptor sets in the material - where they belong! Having them in the base texture object was a major maintenance issue.
2020-04-18 21:56:22 +00:00
TexMan.DeleteAll();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
// delete GameStartupInfo data
GameStartupInfo.Name = "";
GameStartupInfo.BkColor = GameStartupInfo.FgColor = GameStartupInfo.Type = 0;
- add 'loadwidescreen' to gameinfo, works exactly like 'loadbrightmaps' or 'loadlights'
2020-10-26 14:08:34 +00:00
GameStartupInfo.LoadWidescreen = GameStartupInfo.LoadLights = GameStartupInfo.LoadBrightmaps = -1;
- Discord RPC presence. Adds new IWADINFO and GAMEINFO keys: DiscordAppId - this should point to your AppId for your game. It will use a default GZDoom one if not found.
2022-03-10 03:45:31 +00:00
GameStartupInfo.DiscordAppId = "";
- add steamappid field for DRPC
2022-03-10 05:03:50 +00:00
GameStartupInfo.SteamAppId = "";
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
GC::FullGC(); // clean up before taking down the object list.
// Delete the reference to the VM functions here which were deleted and will be recreated after the restart.
- eliminate dependency on linking order for autosegs registration
2020-11-13 09:03:16 +00:00
AutoSegs::ActionFunctons.ForEach([](AFuncDesc *afunc)
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
{
*(afunc->VMPointer) = NULL;
- eliminate dependency on linking order for autosegs registration
2020-11-13 09:03:16 +00:00
});
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
GC::DelSoftRootHead();
- took InitializeDefaults out of PClass and moved it to PClassActor. Like so many other parts, this created a hard dependency of the low level code on very invasive game content.
2020-04-11 17:25:32 +00:00
for (auto& p : players)
{
p.PendingWeapon = nullptr;
}
PClassActor::AllActorClasses.Clear();
ScriptUtil::Clear();
- copied the restart cleanup code into its own function
2019-09-30 22:30:44 +00:00
PClass::StaticShutdown();
GC::FullGC(); // perform one final garbage collection after shutdown
assert(GC::Root == nullptr);
restart++;
PClass::bShutdown = false;
PClass::bVMOperational = false;
}
Normalize line endings
2016-03-01 15:47:10 +00:00
//==========================================================================
//
// restart the game
//
//==========================================================================
Marked a few commands as unsafe This process of finding unsafe commands is not complete!
2018-01-07 13:03:49 +00:00
UNSAFE_CCMD(restart)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
// remove command line args that would get in the way during restart
Args->RemoveArgs("-iwad");
Args->RemoveArgs("-deh");
Args->RemoveArgs("-bex");
Args->RemoveArgs("-playdemo");
Args->RemoveArgs("-file");
Args->RemoveArgs("-altdeath");
Args->RemoveArgs("-deathmatch");
Args->RemoveArgs("-skill");
Args->RemoveArgs("-savedir");
Args->RemoveArgs("-xlat");
Args->RemoveArgs("-oldsprites");
if (argv.argc() > 1)
{
- don't show the IWAD picker upon restart. This doesn't work with fullscreen mode. Instead just pick the first IWAD from the list until a better solution can be implemented. - handle a 'restart' CCMD a bit more controlled. Instead of throwing an exception in the CCMD handler it now just flags D_DoomLoop to return. If the exception is thrown within the CCMD this can easily happen deep inside the renderer when it calls NetUpdate. But since the software renderer with its use of global variables is not equipped to be yanked out of lile this it could leave broken data behind that caused glitches or even crashes on subsequently played maps.
2016-03-08 12:07:21 +00:00
for (int i = 1; i<argv.argc(); i++)
Normalize line endings
2016-03-01 15:47:10 +00:00
{
Args->AppendArg(argv[i]);
}
}
- don't show the IWAD picker upon restart. This doesn't work with fullscreen mode. Instead just pick the first IWAD from the list until a better solution can be implemented. - handle a 'restart' CCMD a bit more controlled. Instead of throwing an exception in the CCMD handler it now just flags D_DoomLoop to return. If the exception is thrown within the CCMD this can easily happen deep inside the renderer when it calls NetUpdate. But since the software renderer with its use of global variables is not equipped to be yanked out of lile this it could leave broken data behind that caused glitches or even crashes on subsequently played maps.
2016-03-08 12:07:21 +00:00
wantToRestart = true;
Normalize line endings
2016-03-01 15:47:10 +00:00
}
- the native part wasn't saved.
2017-02-14 18:34:01 +00:00
DEFINE_FIELD_X(InputEventData, event_t, type)
DEFINE_FIELD_X(InputEventData, event_t, subtype)
DEFINE_FIELD_X(InputEventData, event_t, data1)
DEFINE_FIELD_X(InputEventData, event_t, data2)
DEFINE_FIELD_X(InputEventData, event_t, data3)
DEFINE_FIELD_X(InputEventData, event_t, x)
DEFINE_FIELD_X(InputEventData, event_t, y)
- added I_FriendlyWindowTitle cvar, which takes the current game/mod name and uses it as a default window title.
2017-10-31 23:47:56 +00:00
- update window title with current level name
2019-12-25 14:52:57 +00:00
void I_UpdateWindowTitle()
- added I_FriendlyWindowTitle cvar, which takes the current game/mod name and uses it as a default window title.
2017-10-31 23:47:56 +00:00
{
- Strip out any color escape sequences before setting a window title.
2020-06-02 19:49:53 +00:00
FString titlestr;
- update window title with current level name
2019-12-25 14:52:57 +00:00
switch (I_FriendlyWindowTitle)
{
case 1:
- copied constexpr declarations plus a few fixed in utility code and fixed a few places where this triggered a compile error now.
2020-09-27 06:36:30 +00:00
if (level.LevelName.IsNotEmpty())
- update window title with current level name
2019-12-25 14:52:57 +00:00
{
- system backend cleanup. This is mainly for running CI on Linux and macOS. Windws is already working.
2020-04-22 17:57:14 +00:00
titlestr.Format("%s - %s", level.LevelName.GetChars(), GameStartupInfo.Name.GetChars());
- update window title with current level name
2019-12-25 14:52:57 +00:00
break;
}
- fixed most of implicit fallthrough compilation warnings src/common/console/c_console.cpp:1032:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/console/c_console.cpp:958:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/backend/codegen.cpp:2969:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:2656:4: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/frontend/zcc_compile.cpp:521:5: warning: this statement may fall through [-Wimplicit-fallthrough=] src/common/scripting/jit/jit_math.cpp:966:19: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1538:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:1549:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/d_main.cpp:3820:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gameconfigfile.cpp:544:25: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:193:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:200:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/gamedata/p_xlat.cpp:210:11: warning: this statement may fall through [-Wimplicit-fallthrough=] src/g_game.cpp:1145:20: warning: this statement may fall through [-Wimplicit-fallthrough=] src/maploader/maploader.cpp:2142:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/menu/doommenu.cpp:159:28: warning: this statement may fall through [-Wimplicit-fallthrough=] src/m_cheat.cpp:109:3: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_ceiling.cpp:254:24: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:322:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:330:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_floor.cpp:344:10: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:129:47: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/mapthinkers/a_plats.cpp:284:8: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:6302:18: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_acs.cpp:8111:16: warning: this statement may fall through [-Wimplicit-fallthrough=] src/playsim/p_spec.cpp:344:6: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/decorate/thingdef_parse.cpp:1343:9: warning: this statement may fall through [-Wimplicit-fallthrough=] src/scripting/zscript/zcc_compile_doom.cpp:298:12: warning: this statement may fall through [-Wimplicit-fallthrough=] src/wi_stuff.cpp:463:14: warning: this statement may fall through [-Wimplicit-fallthrough=]
2020-10-31 11:22:13 +00:00
[[fallthrough]];
- update window title with current level name
2019-12-25 14:52:57 +00:00
case 2:
- Strip out any color escape sequences before setting a window title.
2020-06-02 19:49:53 +00:00
titlestr = GameStartupInfo.Name;
- update window title with current level name
2019-12-25 14:52:57 +00:00
break;
default:
- add steamappid field for DRPC
2022-03-10 05:03:50 +00:00
I_UpdateDiscordPresence(false, NULL, GameStartupInfo.DiscordAppId.GetChars(), GameStartupInfo.SteamAppId.GetChars());
- added I_FriendlyWindowTitle cvar, which takes the current game/mod name and uses it as a default window title.
2017-10-31 23:47:56 +00:00
I_SetWindowTitle(NULL);
- Strip out any color escape sequences before setting a window title.
2020-06-02 19:49:53 +00:00
return;
}
// Strip out any color escape sequences before setting a window title
TArray<char> copy(titlestr.Len() + 1);
const char* srcp = titlestr;
char* dstp = copy.Data();
while (*srcp != 0)
{
if (*srcp != TEXTCOLOR_ESCAPE)
{
*dstp++ = *srcp++;
}
else if (srcp[1] == '[')
{
srcp += 2;
while (*srcp != ']' && *srcp != 0) srcp++;
if (*srcp == ']') srcp++;
}
else
{
if (srcp[1] != 0) srcp += 2;
else break;
}
- update window title with current level name
2019-12-25 14:52:57 +00:00
}
- Strip out any color escape sequences before setting a window title.
2020-06-02 19:49:53 +00:00
*dstp = 0;
- add i_discordrpc (defaults false) to control Discord Presence
2022-03-10 19:12:19 +00:00
if (i_discordrpc)
I_UpdateDiscordPresence(true, copy.Data(), GameStartupInfo.DiscordAppId.GetChars(), GameStartupInfo.SteamAppId.GetChars());
else
I_UpdateDiscordPresence(false, nullptr, nullptr, nullptr);
- Strip out any color escape sequences before setting a window title.
2020-06-02 19:49:53 +00:00
I_SetWindowTitle(copy.Data());
Marked a few commands as unsafe This process of finding unsafe commands is not complete!
2018-01-07 13:03:49 +00:00
}
Reference in a new issue Copy permalink