OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed up format specifiers

Browse source 
also cleanup imports
This commit is contained in:
Marcus Minhorst 2025-08-09 10:35:10 -04:00 • committed by Ricardo Luís Vaz Silva
commit 4a3bfae42e
6 changed files with 147 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

142
src/d_main.cpp
View file

@ -39,87 +39,81 @@
#include <math.h>
#include <assert.h>
#include "engineerrors.h"
#include "i_time.h"
#include "d_gui.h"
#include "m_random.h"
#include "doomdef.h"
#include "doomstat.h"
#include "gstrings.h"
#include "filesystem.h"
#include "s_sound.h"
#include "v_video.h"
#include "intermission/intermission.h"
#include "wipe.h"
#include "m_argv.h"
#include "m_misc.h"
#include "menu.h"
#include "doommenu.h"
#include "a_dynlight.h"
#include "am_map.h"
#include "animations.h"
#include "autosegs.h"
#include "c_buttons.h"
#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"
#include "a_dynlight.h"
#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"
#include "v_draw.h"
#include "po_man.h"
#include "p_local.h"
#include "autosegs.h"
#include "fragglescript/t_fs.h"
#include "g_levellocals.h"
#include "events.h"
#include "vm.h"
#include "types.h"
#include "i_system.h"
#include "g_cvars.h"
#include "r_data/r_vanillatrans.h"
#include "s_music.h"
#include "swrenderer/r_swcolormaps.h"
#include "findfile.h"
#include "md5.h"
#include "c_buttons.h"
#include "common/scripting/dap/DebugServer.h"
#include "d_buttons.h"
#include "i_interface.h"
#include "animations.h"
#include "texturemanager.h"
#include "d_dehacked.h"
#include "d_main.h"
#include "d_net.h"
#include "d_netinf.h"
#include "decallib.h"
#include "doomdef.h"
#include "doomfont.h"
#include "doommenu.h"
#include "doomstat.h"
#include "engineerrors.h"
#include "events.h"
#include "filesystem.h"
#include "findfile.h"
#include "formats/multipatchtexture.h"
#include "scriptutil.h"
#include "v_palette.h"
#include "texturemanager.h"
#include "fragglescript/t_fs.h"
#include "g_cvars.h"
#include "g_game.h"
#include "g_levellocals.h"
#include "gameconfigfile.h"
#include "gi.h"
#include "gstrings.h"
#include "hu_stuff.h"
#include "hw_clock.h"
#include "hwrenderer/scene/hw_drawinfo.h"
#include "doomfont.h"
#include "i_interface.h"
#include "i_sound.h"
#include "i_system.h"
#include "i_time.h"
#include "i_video.h"
#include "m_argv.h"
#include "m_cheat.h"
#include "m_joy.h"
#include "m_misc.h"
#include "m_random.h"
#include "md5.h"
#include "menu.h"
#include "p_local.h"
#include "p_setup.h"
#include "po_man.h"
#include "r_data/r_vanillatrans.h"
#include "r_sky.h"
#include "r_utility.h"
#include "s_music.h"
#include "s_sound.h"
#include "sbar.h"
#include "sbarinfo.h"
#include "screenjob.h"
#include "startscreen.h"
#include "scriptutil.h"
#include "shiftstate.h"
#include "common/scripting/dap/DebugServer.h"
#include "common/widgets/errorwindow.h"
#include "st_start.h"
#include "st_stuff.h"
#include "startscreen.h"
#include "swrenderer/r_swcolormaps.h"
#include "teaminfo.h"
#include "texturemanager.h"
#include "types.h"
#include "v_draw.h"
#include "v_palette.h"
#include "v_text.h"
#include "v_video.h"
#include "version.h"
#include "vm.h"
#include "wi_stuff.h"
#include "wipe.h"
#include "zwidget/window/window.h"
#ifdef __unix__
#include "i_system.h" // for SHARE_DIR
@ -4139,7 +4133,7 @@ CCMD(fs_dir)
auto fnid = fileSystem.GetResourceId(i);
auto length = fileSystem.FileLength(i);
bool hidden = fileSystem.FindFile(fn1) != i;
Printf(PRINT_HIGH | PRINT_NONOTIFY, "%s%-64s %-15s (%5d) %10d %s %s\n", hidden ? TEXTCOLOR_RED : TEXTCOLOR_UNTRANSLATED, fn1, fns, fnid, length, container, hidden ? "(h)" : "");
Printf(PRINT_HIGH | PRINT_NONOTIFY, "%s%-64s %-15s (%5d) %10ld %s %s\n", hidden ? TEXTCOLOR_RED : TEXTCOLOR_UNTRANSLATED, fn1, fns, fnid, length, container, hidden ? "(h)" : "");
}
}
@ -4150,6 +4144,6 @@ CCMD(type)
if (lump >= 0)
{
auto data = fileSystem.ReadFile(lump);
Printf("%.*s\n", data.size(), data.string());
Printf("%.*s\n", static_cast<int>(data.size()), data.string());
}
}