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

Added: uses version.h

Browse Source 
Changed: cleaned up message handling a little
~g2k
This commit is contained in:
Tom Hicks
2005-06-25 18:19:29 -04:00
parent 890220ea4d
commit 05cf880b67
1 changed files with 303 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/windows.cpp
View File

@@ -30,6 +30,7 @@
#ifdef WIN32 #ifdef WIN32
//include necessary header files //include necessary header files
#include "../include/main.h" #include "../include/main.h"
#include "../include/version.h"
//link necessary libraries //link necessary libraries
#pragma comment(lib, "opengl32.lib") #pragma comment(lib, "opengl32.lib")
@@ -579,29 +580,25 @@ int WINAPI WinMain( HINSTANCE hInstance,
InitControls(); InitControls();
g_Screen.name = "OpenArena v0.1.0"; level.glFont.SetScreenDimensions(level.screen.width*2, level.screen.height*2);
g_Screen.width = level.screen.width;
g_Screen.height = level.screen.height;
g_Screen.bpp = level.screen.bpp;
g_Screen.fullscreen = level.screen.fullscreen;
level.glFont.SetScreenDimensions(g_Screen.width*2, g_Screen.height*2);
//level.glFont.BuildFont("oa\\textures\\menu\\font.bmp");//(level.gamedir + "\\textures\\menu\\font.bmp").c_str()); //level.glFont.BuildFont("oa\\textures\\menu\\font.bmp");//(level.gamedir + "\\textures\\menu\\font.bmp").c_str());
if (level.nextLevel == "") if (level.nextLevel == "")
{ {
level.LoadMap("intro.map"); level.LoadMap("intro.map");
} }
else
{
level.LoadMap();
}
if (!CreateGLWindow(g_Screen.name, g_Screen.width, g_Screen.height, g_Screen.bpp, g_Screen.fullscreen)) if (!CreateGLWindow(string(OPENARENA_VERSION), level.screen.width, level.screen.height, level.screen.bpp, level.screen.fullscreen))
{ {
return 0; return 0;
} }
while(!done) while(!done)
{ {
if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
{ {
if (msg.message==WM_QUIT) if (msg.message==WM_QUIT)
{ {
@@ -613,8 +610,7 @@ int WINAPI WinMain( HINSTANCE hInstance,
DispatchMessage(&msg); DispatchMessage(&msg);
} }
} }
else
{
if (active) if (active)
{ {
if (keys[VK_ESCAPE]) if (keys[VK_ESCAPE])
@@ -625,13 +621,7 @@ int WINAPI WinMain( HINSTANCE hInstance,
{ {
level.defaultPlayer[0].camera.Update(); level.defaultPlayer[0].camera.Update();
if(level.showConsole) if(!level.showConsole)
{
if(keys['I'] && !keys2['I'])
level.showConsole = false;
//level.UpdateConsole('\n');
}
else
{ {
if (level.mlook) if (level.mlook)
{ {
@@ -939,7 +929,6 @@ int WINAPI WinMain( HINSTANCE hInstance,
} }
} }
} }
}
level.UnloadMap(); level.UnloadMap();
KillGLWindow(); KillGLWindow();