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

Changed: Made g++ friendly

Browse Source 
Changed: #ifdef'd something that needs to be abstracted into oa_audio library
~g2k
This commit is contained in:
Tom Hicks
2005-06-25 15:52:57 -04:00
parent 815c13ae23
commit 1882f4e3d8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/level.h
View File

@@ -27,6 +27,7 @@
#include "myglTexture.h" #include "myglTexture.h"
#include "player.h" #include "player.h"
#include "strmanip.h" #include "strmanip.h"
#include "keys.h"
using namespace std; using namespace std;
@@ -56,7 +57,7 @@ public:
void UnloadMap(); void UnloadMap();
void UpdateConsole(char); void UpdateConsole(char);
uint32 FPS(); uint32 FPS();
void ParseCmds(LPSTR); void ParseCmds(const char*);
void Print(int x, int y, const char* string, unsigned int set); void Print(int x, int y, const char* string, unsigned int set);
/*Not Yet Implemented /*Not Yet Implemented
@@ -71,7 +72,9 @@ public:
string* textureNames; string* textureNames;
string bgm; string bgm;
#ifdef WIN32
HSTREAM bgmStream; HSTREAM bgmStream;
#endif
unsigned char bgmCDA; unsigned char bgmCDA;
string gamedir; string gamedir;
float gravity; float gravity;
@@ -100,4 +103,5 @@ private:
string consoleOutput[MAX_CONSOLE_OUTPUT_LINES]; string consoleOutput[MAX_CONSOLE_OUTPUT_LINES];
string outputText[MAX_OUTPUT_TEXT_LINES]; string outputText[MAX_OUTPUT_TEXT_LINES];
}; };
#endif
#endif