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

Changed: #ifdef'd windows only stuff

Browse Source 
Changed: Removed an old comment
~g2k
This commit is contained in:
Tom Hicks
2005-06-25 15:54:39 -04:00
parent 1882f4e3d8
commit ec12f2216e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/main.h
View File

@@ -1,19 +1,21 @@
#ifndef __main_h__ #ifndef __main_h__
#define __main_h__ #define __main_h__
#ifdef WIN32
#include <windows.h> // Header file for windows #include <windows.h> // Header file for windows
#include <stdio.h> // Header file for standard input/output #endif
#include <gl\gl.h> // Header file for OpenGL32 library #include <cstdio> // Header file for standard input/output
#include <gl\glu.h> // Header file for Glu32 library #include <GL/gl.h> // Header file for OpenGL32 library
#include <gl\glaux.h> // Header file for GLaux library #include <GL/glu.h> // Header file for Glu32 library
#include <math.h> #include <math.h>
#include "camera.h" #include "camera.h"
#include "level.h" #include "level.h"
#include "myGL.h" #include "mygl.h"
#include "WorldDefs.h" #include "worlddefs.h"
#include "mydefs.h" #include "mydefs.h"
#include "screen.h"
#include "window.h"
#pragma warning(disable: 4786) #pragma warning(disable: 4786)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Variables // Variables
@@ -27,13 +29,17 @@ static bool fullscreen=true; // Is window fullscreen flag
//static SCREEN g_Screen = {800,600,16,1,"OpenArena"}; //static SCREEN g_Screen = {800,600,16,1,"OpenArena"};
#ifdef WIN32
static POINT mpos; static POINT mpos;
#endif
static float lastTime = 0.0f; // This will hold the time from the last frame static float lastTime = 0.0f; // This will hold the time from the last frame
static float currentTime; static float currentTime;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Function Declarations // Function Declarations
LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration for WndProc
//This shouldn't need to be here
//LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration for WndProc
void InitControls(); // Sets up player controls void InitControls(); // Sets up player controls
int InitGL(); // All setup for OpenGL goes here int InitGL(); // All setup for OpenGL goes here