diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2012-01-03 22:01:37 +0100 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2012-01-03 22:01:37 +0100 |
| commit | 2991f4071e50cca641044376dc2196d9dcfff80d (patch) | |
| tree | b578297bed74be8d4221f8608d83747c548e7601 /src/engine/client/client.cpp | |
| parent | 50d872531aae6640f57da98e8dcf6dbae1f9cd82 (diff) | |
| download | zcatch-2991f4071e50cca641044376dc2196d9dcfff80d.tar.gz zcatch-2991f4071e50cca641044376dc2196d9dcfff80d.zip | |
fixed kicking of command buffer if it's full when rendering. fixed compile error on windows
Diffstat (limited to 'src/engine/client/client.cpp')
| -rw-r--r-- | src/engine/client/client.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 5067f8b2..f126a09c 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -49,6 +49,10 @@ #include <windows.h> #endif +#include "SDL.h" +#ifdef main +#undef main +#endif void CGraph::Init(float Min, float Max) { @@ -1690,8 +1694,6 @@ void CClient::InitInterfaces() m_Friends.Init(); } -#include "SDL.h" - void CClient::Run() { m_LocalStartTime = time_get(); |