OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom into GZDoomUpdate-12-07-2023

Browse source
This commit is contained in:
nashmuhandes 2023-07-12 20:51:41 +08:00
commit 07f722b6f3
74 changed files with 773 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/common/platform/posix/cocoa/i_main.mm
View file

@ -151,21 +151,24 @@ void I_DetectOS()
case 10:
switch (version.minorVersion)
{
case 12: name = "macOS Sierra"; break;
case 13: name = "macOS High Sierra"; break;
case 14: name = "macOS Mojave"; break;
case 15: name = "macOS Catalina"; break;
case 16: name = "macOS Big Sur"; break;
case 12: name = "Sierra"; break;
case 13: name = "High Sierra"; break;
case 14: name = "Mojave"; break;
case 15: name = "Catalina"; break;
case 16: name = "Big Sur"; break;
}
break;
case 11:
name = "macOS Big Sur";
name = "Big Sur";
break;
case 12:
name = "macOS Monterey";
name = "Monterey";
break;
case 13:
name = "macOS Ventura";
name = "Ventura";
break;
case 14:
name = "Sonoma";
break;
}
@ -186,7 +189,7 @@ void I_DetectOS()
"Unknown";
#endif
Printf("%s running %s %d.%d.%d (%s) %s\n", model, name,
Printf("%s running macOS %s %d.%d.%d (%s) %s\n", model, name,
int(version.majorVersion), int(version.minorVersion), int(version.patchVersion),
release, architecture);
}

6
src/common/platform/posix/sdl/i_system.cpp
View file

@ -51,7 +51,6 @@
#include <asm/unistd.h>
#include <linux/perf_event.h>
#include <sys/mman.h>
#include "printf.h"
#endif
#include <SDL.h>
@ -65,6 +64,7 @@
#include "c_cvars.h"
#include "palutil.h"
#include "st_start.h"
#include "printf.h"
#ifndef NO_GTK
@ -408,7 +408,7 @@ FString I_GetFromClipboard (bool use_primary_selection)
FString I_GetCWD()
{
char* curdir = get_current_dir_name();
char* curdir = getcwd(NULL,0);
if (!curdir)
{
return "";
@ -447,7 +447,7 @@ unsigned int I_MakeRNGSeed()
void I_OpenShellFolder(const char* infolder)
{
char* curdir = get_current_dir_name();
char* curdir = getcwd(NULL,0);
if (!chdir(infolder))
{

16
src/common/platform/win32/i_mouse.cpp
View file

@ -189,6 +189,8 @@ CUSTOM_CVAR (Int, in_mouse, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
//
//==========================================================================
static bool mouse_shown = true;
static void SetCursorState(bool visible)
{
CursorState = visible || !m_hidepointer;
@ -196,13 +198,19 @@ static void SetCursorState(bool visible)
{
if (CursorState)
{
ShowCursor(1);
SetCursor((HCURSOR)(intptr_t)GetClassLongPtr(mainwindow.GetHandle(), GCLP_HCURSOR));
if(!mouse_shown)
{
ShowCursor(true);
mouse_shown = true;
}
}
else
{
ShowCursor(0);
SetCursor(NULL);
if(mouse_shown)
{
ShowCursor(false);
mouse_shown = false;
}
}
}
}

1
src/common/platform/win32/winres.h
View file

@ -10,6 +10,7 @@
// winres.h - Windows resource definitions
// extracted from WINUSER.H and COMMCTRL.H
#pragma once
#ifdef _AFX_MINREBUILD
#pragma component(minrebuild, off)