OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '4.14.1' of https://github.com/ZDoom/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2025-03-13 03:00:11 +08:00
commit 799011d327
89 changed files with 3735 additions and 2607 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/d_main.cpp
View file

@ -1064,7 +1064,7 @@ void D_Display ()
if (DrawFSHUD || automapactive) StatusBar->DrawAltHUD();
if (players[consoleplayer].camera && players[consoleplayer].camera->player && !automapactive)
{
StatusBar->DrawCrosshair();
StatusBar->DrawCrosshair(vp.TicFrac);
}
StatusBar->CallDraw (HUD_AltHud, vp.TicFrac);
StatusBar->DrawTopStuff (HUD_AltHud);
@ -3216,9 +3216,10 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
lfi.gameTypeFilter.push_back(LumpFilterIWAD.GetChars());
// Workaround for old Doom filter names.
if (LumpFilterIWAD.Compare("doom.id.doom") == 0)
if (LumpFilterIWAD.IndexOf("doom.id.doom") >= 0)
{
lfi.gameTypeFilter.push_back("doom.doom");
FString NewFilterName = (FString)"doom.doom" + LumpFilterIWAD.Mid(12); // "doom.id.doom" is 12 characters
lfi.gameTypeFilter.push_back(NewFilterName.GetChars());
}