diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.cc | 4 | ||||
| -rw-r--r-- | src/client/console.cc | 2 | ||||
| -rw-r--r-- | src/client/input.cc | 4 | ||||
| -rw-r--r-- | src/client/view.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/client/client.cc b/src/client/client.cc index a25b958..c93a0dc 100644 --- a/src/client/client.cc +++ b/src/client/client.cc @@ -92,7 +92,7 @@ void Client::init() // client variables core::Cvar::get("cl_name", "Player", core::Cvar::Archive); core::Cvar::get("cl_color", "1.0 1.0 1.0", core::Cvar::Archive); - cl_framerate = core::Cvar::get("cl_framerate", "0"); + cl_framerate = core::Cvar::get("cl_framerate", "120", core::Cvar::Archive); // initialize SDL, but do not initialize any subsystems SDL_Init(0); @@ -118,8 +118,6 @@ void Client::run() { con_print << "Running client..." << std::endl; - - Uint32 client_framerate = (Uint32)(1000/120); Uint32 elapsed = 0; diff --git a/src/client/console.cc b/src/client/console.cc index 3954d45..fc53b09 100644 --- a/src/client/console.cc +++ b/src/client/console.cc @@ -134,7 +134,7 @@ void draw() gl::disable(GL_TEXTURE_2D); // draw the transparent console background - gl::color(1.0f, 1.0f, 1.0f, 0.01f); + gl::color(1.0f, 1.0f, 1.0f, 0.02f); gl::begin(gl::Quads); gl::vertex(0.0f, 0.0f, 0.0f); diff --git a/src/client/input.cc b/src/client/input.cc index b339574..eda13fd 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -109,7 +109,9 @@ void frame(float seconds) switch (event.type) { case SDL_KEYUP: - if (!console::visible() && core::application()->connected() && core::localcontrol()) + if (!chat::visible() && !console::visible() && + core::application()->connected() && core::localcontrol()) + // send key events to the game world keyreleased(event.key.keysym); break; diff --git a/src/client/view.cc b/src/client/view.cc index 3a9a8fb..96a0631 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -128,7 +128,7 @@ void draw_status() float now = sys::time(); int h = 4 + CHARHEIGHT; for (size_t l = 0; l < MAXNOTIFYLINES; l++) { - if (console::notify_text[n].size() > 2 && console::notify_time[n] + 5 > now) { + if (console::notify_text[n].size() > 2 && console::notify_time[n] + 4 > now) { if (console::notify_text[n][0] == '?') gl::color(0.7f,0.7f,0.7f, 1.0f); else if (console::notify_text[n][0] == '*') |