From 876ef6f2ddd1ac0449f1131ea49b13e6b11934a9 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 29 Nov 2010 03:42:15 +0000 Subject: [PATCH] swap audio channels, apparently they were switched. I blame my broken (mono) headphones. Also minor tweek for npfte to size the engine to match the plugin space. Also attempt to catch crashes instead of always taking the browser down too. git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3680 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/snd_al.c | 8 +- engine/client/snd_dma.c | 6 +- engine/client/sys_npfte.c | 21 +- engine/client/sys_plugfte.c | 13 +- engine/client/winquake.rc | 68 +- engine/common/bothdefs.h | 1 + engine/dotnet2005/ftequake.sln | 94 +- engine/dotnet2005/ftequake.vcproj | 1443 ------ engine/dotnet2005/npfte.vcproj | 7998 +---------------------------- engine/ftequake/npplug.rc | 2 +- engine/gl/gl_vidnt.c | 19 +- 11 files changed, 198 insertions(+), 9475 deletions(-) diff --git a/engine/client/snd_al.c b/engine/client/snd_al.c index 05dbfc764..95d0fe224 100644 --- a/engine/client/snd_al.c +++ b/engine/client/snd_al.c @@ -79,10 +79,10 @@ static AL_API void (AL_APIENTRY *palDistanceModel)( ALenum distanceModel ); #define AL_FORMAT_MONO16 0x1101 #define AL_FORMAT_STEREO8 0x1102 #define AL_FORMAT_STEREO16 0x1103 -#define AL_INVALID_NAME 0xA001 -#define AL_INVALID_ENUM 0xA002 -#define AL_INVALID_VALUE 0xA003 -#define AL_INVALID_OPERATION 0xA004 +#define AL_INVALID_NAME 0xA001 +#define AL_INVALID_ENUM 0xA002 +#define AL_INVALID_VALUE 0xA003 +#define AL_INVALID_OPERATION 0xA004 #define AL_OUT_OF_MEMORY 0xA005 #define AL_VENDOR 0xB001 #define AL_VERSION 0xB002 diff --git a/engine/client/snd_dma.c b/engine/client/snd_dma.c index 009cbab40..71c967a02 100644 --- a/engine/client/snd_dma.c +++ b/engine/client/snd_dma.c @@ -709,8 +709,8 @@ void S_DefaultSpeakerConfiguration(soundcardinfo_t *sc) if (sc->sn.numchannels < 3) { - VectorSet(sc->speakerdir[0], 0, 1, 0); - VectorSet(sc->speakerdir[1], 0, -1, 0); + VectorSet(sc->speakerdir[0], 0, -1, 0); + VectorSet(sc->speakerdir[1], 0, 1, 0); } else if (sc->sn.numchannels < 5) { @@ -917,7 +917,7 @@ void S_Control_f (void) { for (i = 0; i < MAXSOUNDCHANNELS; i++) { - VectorSet(sc->speakerdir[i], 0, (i&1)?-1:1, 0); + VectorSet(sc->speakerdir[i], 0, (i&1)?1:-1, 0); sc->dist[i] = 1; } } diff --git a/engine/client/sys_npfte.c b/engine/client/sys_npfte.c index ccc61f3d0..ce63faf5f 100644 --- a/engine/client/sys_npfte.c +++ b/engine/client/sys_npfte.c @@ -49,6 +49,12 @@ NPNetscapeFuncs *browserfuncs; #define SetWindowLongPtr SetWindowLong #define LONG_PTR LONG #endif +#ifndef GWLP_WNDPROC +#define GWLP_WNDPROC GWL_WNDPROC +#endif +#ifndef GWLP_USERDATA +#define GWLP_USERDATA GWL_USERDATA +#endif #endif @@ -92,7 +98,7 @@ LRESULT CALLBACK MyPluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar { struct context *ctx; struct contextpublic *pub; - ctx = (struct context *)GetWindowLongPtr(hWnd, GWL_USERDATA); + ctx = (struct context *)GetWindowLongPtr(hWnd, GWLP_USERDATA); if (!ctx) return DefWindowProc(hWnd, msg, wParam, lParam); pub = (struct contextpublic*)ctx; @@ -235,8 +241,8 @@ NPError NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save) if (pub->oldwnd) { if (pub->oldproc) - SetWindowLongPtr(pub->oldwnd, GWL_WNDPROC, (LONG_PTR)pub->oldproc); - SetWindowLongPtr(pub->oldwnd, GWL_USERDATA, (LONG_PTR)NULL); + SetWindowLongPtr(pub->oldwnd, GWLP_WNDPROC, (LONG_PTR)pub->oldproc); + SetWindowLongPtr(pub->oldwnd, GWLP_USERDATA, (LONG_PTR)NULL); } #endif @@ -263,17 +269,17 @@ NPError NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window) //we switched window? if (pub->oldwnd && pub->oldproc) { - SetWindowLongPtr(pub->oldwnd, GWL_WNDPROC, (LONG_PTR)pub->oldproc); + SetWindowLongPtr(pub->oldwnd, GWLP_WNDPROC, (LONG_PTR)pub->oldproc); } pub->oldproc = NULL; - p = (WNDPROC)GetWindowLongPtr(window->window, GWL_WNDPROC); + p = (WNDPROC)GetWindowLongPtr(window->window, GWLP_WNDPROC); if (p != MyPluginWndProc) pub->oldproc = p; pub->oldwnd = window->window; - SetWindowLongPtr(window->window, GWL_WNDPROC, (LONG_PTR)MyPluginWndProc); - SetWindowLongPtr(window->window, GWL_USERDATA, (LONG_PTR)ctx); + SetWindowLongPtr(window->window, GWLP_WNDPROC, (LONG_PTR)MyPluginWndProc); + SetWindowLongPtr(window->window, GWLP_USERDATA, (LONG_PTR)ctx); } InvalidateRgn(window->window, NULL, FALSE); @@ -677,6 +683,7 @@ NPError OSCALL NP_GetValue(void *instance, NPPVariable variable, void *value) NPError OSCALL NP_GetEntryPoints (NPPluginFuncs* pFuncs) { + MessageBox(NULL, "Foo", "Foo", 0); if (pFuncs->size < sizeof(NPPluginFuncs)) return NPERR_INVALID_FUNCTABLE_ERROR; pFuncs->size = sizeof(NPPluginFuncs); diff --git a/engine/client/sys_plugfte.c b/engine/client/sys_plugfte.c index 5fe20a6b4..869cfc932 100644 --- a/engine/client/sys_plugfte.c +++ b/engine/client/sys_plugfte.c @@ -252,16 +252,16 @@ int Plug_GenCommandline(struct context *ctx, char **argv, int maxargs) return argc; } -#ifdef _DEBUG #if _MSC_VER >= 1300 #define CATCHCRASH #endif -#endif #ifdef CATCHCRASH +#ifdef _DEBUG #include "dbghelp.h" DWORD CrashExceptionHandler (DWORD exceptionCode, LPEXCEPTION_POINTERS exceptionInfo); #endif +#endif int Plug_PluginThread(void *ctxptr) { @@ -382,10 +382,18 @@ int Plug_PluginThread(void *ctxptr) } } #ifdef CATCHCRASH +#ifdef _DEBUG __except (CrashExceptionHandler(GetExceptionCode(), GetExceptionInformation())) { } +#else + __except (EXCEPTION_EXECUTE_HANDLER) + { + NPQTV_Sys_Shutdown(); + MessageBox(sys_parentwindow, "Sorry, FTE plugin crashed.\nYou probably should restart your browser", "FTE crashed", 0); + } +#endif #endif Sys_LockMutex(ctx->mutex); @@ -885,6 +893,7 @@ static struct pscript_property pscript_properties[] = {"running", false, NULL, NULL, NULL, pscript_property_running_getb, pscript_property_running_setb}, {"startserver", false, NULL, pscript_property_startserver_gets, pscript_property_startserver_sets}, {"server", false, NULL, pscript_property_curserver_gets, pscript_property_curserver_sets}, + {"join", false, NULL, NULL, pscript_property_curserver_sets}, {"playername", true, &name}, {NULL, true, &skin}, {NULL, true, &team}, diff --git a/engine/client/winquake.rc b/engine/client/winquake.rc index 3c0ed4007..435f3ce6d 100644 --- a/engine/client/winquake.rc +++ b/engine/client/winquake.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""windows.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -53,29 +53,15 @@ END // IDD_DIALOG1 DIALOGEX 0, 0, 67, 40 -STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP | - WS_VISIBLE +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE FONT 16, "Times New Roman", 0, 0, 0x1 BEGIN CTEXT "FTE QuakeWorld",IDC_STATIC,0,0,67,21,SS_CENTERIMAGE - CTEXT "http://www.fteqw.com",IDC_STATIC,0,23,66,17, - SS_CENTERIMAGE + CTEXT "http://www.fteqw.com",IDC_STATIC,0,23,66,17,SS_CENTERIMAGE END -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// define this to prevent syntax error -#define IDS_STRING1 1 - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STRING1 "WinQuake" -END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -97,7 +83,45 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON3 ICON DISCARDABLE "bymorphed.ico" +IDI_ICON3 ICON "bymorphed.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904b0" + BEGIN + VALUE "CompanyName", "Forethought Entertainment" + VALUE "FileDescription", "Quake Worlds" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "winquake" + VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "ProductName", "FTEQuake" + VALUE "ProductVersion", "1, 0, 0, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1200 + END +END + #endif // English (U.K.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h index c47c365cd..ec92f59af 100644 --- a/engine/common/bothdefs.h +++ b/engine/common/bothdefs.h @@ -79,6 +79,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef _WIN32 //needs testing on other platforms #define AVAIL_FREETYPE +#define AVAIL_OPENAL #endif #define ODE_DYNAMIC diff --git a/engine/dotnet2005/ftequake.sln b/engine/dotnet2005/ftequake.sln index ee0fe0062..c7a42adeb 100644 --- a/engine/dotnet2005/ftequake.sln +++ b/engine/dotnet2005/ftequake.sln @@ -4,15 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 9.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake.vcproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1364}" ProjectSection(ProjectDependencies) = postProject {382E6790-D1CA-48F5-8E53-D114635EB61D} = {382E6790-D1CA-48F5-8E53-D114635EB61D} - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89} = {66E1D0C0-BEB5-4365-A457-E177AFA6EB89} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gas2masm", "gas2masm.vcproj", "{382E6790-D1CA-48F5-8E53-D114635EB61D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "..\..\plugins\botlib\botlib.vcproj", "{66E1D0C0-BEB5-4365-A457-E177AFA6EB89}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npfte", "npfte.vcproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "..\..\plugins\botlib\botlib.vcproj", "{77725D10-5A04-4CB3-887D-F23AB5652DA9}" +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "setup", "..\setup\setup.vdproj", "{E0EE8B50-3A75-42A9-B80A-787675979B0C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution D3DDebug|Win32 = D3DDebug|Win32 @@ -125,39 +126,6 @@ Global {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release|Win32.ActiveCfg = Debug|x64 {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release|x64.ActiveCfg = Debug|x64 {382E6790-D1CA-48F5-8E53-D114635EB61D}.Release|x64.Build.0 = Debug|x64 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.D3DDebug|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.D3DDebug|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.D3DDebug|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug Dedicated Server|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug Dedicated Server|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug Dedicated Server|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Debug|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLDebug|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLDebug|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLDebug|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLRelease|Win32.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLRelease|Win32.Build.0 = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.GLRelease|x64.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MDebug|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MDebug|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MDebug|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLDebug|Win32.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLDebug|Win32.Build.0 = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLDebug|x64.ActiveCfg = Debug|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLRelease|Win32.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLRelease|Win32.Build.0 = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MinGLRelease|x64.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MRelease|Win32.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MRelease|Win32.Build.0 = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.MRelease|x64.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release Dedicated Server|Win32.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release Dedicated Server|Win32.Build.0 = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release Dedicated Server|x64.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release|Win32.ActiveCfg = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release|Win32.Build.0 = Release|Win32 - {66E1D0C0-BEB5-4365-A457-E177AFA6EB89}.Release|x64.ActiveCfg = Release|Win32 {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.D3DDebug|Win32.ActiveCfg = GLRelease|x64 {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.D3DDebug|x64.ActiveCfg = GLRelease|x64 {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.D3DDebug|x64.Build.0 = GLRelease|x64 @@ -197,6 +165,60 @@ Global {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.Release|Win32.Build.0 = GLRelease|Win32 {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.Release|x64.ActiveCfg = GLRelease|x64 {88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}.Release|x64.Build.0 = GLRelease|x64 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.D3DDebug|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.D3DDebug|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.D3DDebug|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug Dedicated Server|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug Dedicated Server|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug Dedicated Server|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Debug|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.GLDebug|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.GLDebug|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.GLDebug|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.GLRelease|Win32.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.GLRelease|x64.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MDebug|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MDebug|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MDebug|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLDebug|Win32.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLDebug|Win32.Build.0 = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLDebug|x64.ActiveCfg = Debug|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLRelease|Win32.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLRelease|Win32.Build.0 = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MinGLRelease|x64.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MRelease|Win32.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MRelease|Win32.Build.0 = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.MRelease|x64.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release Dedicated Server|Win32.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release Dedicated Server|Win32.Build.0 = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release Dedicated Server|x64.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release|Win32.ActiveCfg = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release|Win32.Build.0 = Release|Win32 + {77725D10-5A04-4CB3-887D-F23AB5652DA9}.Release|x64.ActiveCfg = Release|Win32 + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.D3DDebug|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.D3DDebug|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Debug Dedicated Server|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Debug Dedicated Server|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Debug|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Debug|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.GLDebug|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.GLDebug|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.GLRelease|Win32.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.GLRelease|x64.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MDebug|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MDebug|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MinGLDebug|Win32.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MinGLDebug|x64.ActiveCfg = Debug + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MinGLRelease|Win32.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MinGLRelease|x64.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MRelease|Win32.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.MRelease|x64.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Release Dedicated Server|Win32.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Release Dedicated Server|x64.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Release|Win32.ActiveCfg = Release + {E0EE8B50-3A75-42A9-B80A-787675979B0C}.Release|x64.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/engine/dotnet2005/ftequake.vcproj b/engine/dotnet2005/ftequake.vcproj index 62b3c094c..d2071572b 100644 --- a/engine/dotnet2005/ftequake.vcproj +++ b/engine/dotnet2005/ftequake.vcproj @@ -1654,7 +1654,6 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -14140,7 +14139,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/dotnet2005/npfte.vcproj b/engine/dotnet2005/npfte.vcproj index 62040685e..d6b2fa3f4 100644 --- a/engine/dotnet2005/npfte.vcproj +++ b/engine/dotnet2005/npfte.vcproj @@ -329,13 +329,13 @@ + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -30835,6 +24521,14 @@ UsePrecompiledHeader="0" /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/ftequake/npplug.rc b/engine/ftequake/npplug.rc index 130e909a6..51abfb74a 100644 --- a/engine/ftequake/npplug.rc +++ b/engine/ftequake/npplug.rc @@ -1,6 +1,6 @@ //Microsoft Developer Studio generated resource script. // -#include "resource.h" +#include "../dotnet2005/resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/engine/gl/gl_vidnt.c b/engine/gl/gl_vidnt.c index fb29e7996..9eea8a6ed 100644 --- a/engine/gl/gl_vidnt.c +++ b/engine/gl/gl_vidnt.c @@ -359,16 +359,21 @@ qboolean VID_SetWindowedMode (rendererstate_t *info) WindowStyle = WS_CHILDWINDOW|WS_OVERLAPPED; ExWindowStyle = 0; - if (info->width > sys_parentwidth) + //if (vid_fullscreen.ival < 0) + { WindowRect.right = sys_parentwidth; - else if (info->width < sys_parentwidth) - WindowRect.left = (sys_parentwidth - info->width)/2; - - if (info->height > sys_parentheight) WindowRect.bottom = sys_parentheight; - else if (info->height < sys_parentheight) - WindowRect.top = (sys_parentheight - info->height)/2; + } + if (WindowRect.right > sys_parentwidth) + WindowRect.right = sys_parentwidth; + else if (WindowRect.right < sys_parentwidth) + WindowRect.left = (sys_parentwidth - WindowRect.right)/2; + + if (WindowRect.bottom > sys_parentheight) + WindowRect.bottom = sys_parentheight; + else if (WindowRect.bottom < sys_parentheight) + WindowRect.top = (sys_parentheight - WindowRect.bottom)/2; WindowRect.right += WindowRect.left; WindowRect.bottom += WindowRect.top;