maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Moved resources around

Browse Source 
~G2k
This commit is contained in:
Tom Hicks
2006-07-01 20:38:56 -04:00
parent 7faadb55bd
commit fc736f6b93
56 changed files with 481 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/windows.cpp
View File

@@ -29,8 +29,8 @@
////////////////////////////////////////////////////////////////////////////////
#ifdef WIN32
//include necessary header files
#include "../include/main.h"
#include "../include/version.h"
#include "main.h"
#include "version.h"
//link necessary libraries
#pragma comment(lib, "opengl32.lib")
@@ -250,9 +250,10 @@ int WINAPI WinMain( HINSTANCE hInstance,
level.LoadMap();
}
g_Screen.SetOnInit(InitGL);
g_Screen.SetOnResize(ReSizeGLScene);
if (!g_Screen.Open(string(OPENARENA_VERSION), level.screen.GetWidth(), level.screen.GetHeight(), level.screen.GetColorDepth(), level.screen.GetFullscreen()))
g_Screen = g_PluginManager.GetDefaultVideoPlugin()->CreateNewWindow(level.screen.GetWidth(), level.screen.GetHeight());
g_Screen->SetInitializer(new OpenArena::Window::Initializer());
g_Screen->SetResizer(new OpenArena::Window::Resizer());
if (!g_Screen->Open(string(OPENARENA_VERSION), level.screen.GetWidth(), level.screen.GetHeight(), level.screen.GetColorDepth(), level.screen.GetFullscreen()))
{
return 0;
}
@@ -292,7 +293,7 @@ int WINAPI WinMain( HINSTANCE hInstance,
}
else
{
SetCursorPos(g_Screen.GetWidth()/2, g_Screen.GetHeight()/2);
SetCursorPos(g_Screen->GetWidth()/2, g_Screen->GetHeight()/2);
}
//////////
@@ -579,14 +580,14 @@ int WINAPI WinMain( HINSTANCE hInstance,
}
}
g_Screen.SwapBuffers();
g_Screen->SwapBuffers();
if (keys[OpenArena::KEY_F1])
{
keys[OpenArena::KEY_F1]=false;
g_Screen.Close();
g_Screen.ToggleFullscreen();
if (!g_Screen.Open("OpenArena",g_Screen.GetWidth(),g_Screen.GetHeight(),g_Screen.GetColorDepth(),g_Screen.GetFullscreen()))
g_Screen->Close();
g_Screen->ToggleFullscreen();
if (!g_Screen->Open("OpenArena",g_Screen->GetWidth(),g_Screen->GetHeight(),g_Screen->GetColorDepth(),g_Screen->GetFullscreen()))
{
return 0;
}
@@ -594,7 +595,7 @@ int WINAPI WinMain( HINSTANCE hInstance,
}
level.UnloadMap();
g_Screen.Close();
g_Screen->Close();
return (msg.wParam);
}