diff options
Diffstat (limited to 'src/client/view.cc')
-rw-r--r-- | src/client/view.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index e1e0820..1fdbcdc 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -177,7 +177,7 @@ void draw_status() if (state == core::Entity::ImpulseInitiate) { statestr << "^FInitializing kinetic impulse drive " << core::localcontrol()->timer(); } else if (state == core::Entity::Impulse) { - statestr << "^FKinetic impulse"; + //statestr << "^FKinetic impulse"; } else if (state == core::Entity::JumpInitiate) { statestr << "^FInitializing hyperspace jump drive "<< core::localcontrol()->timer(); } else if (state == core::Entity::Jump) { @@ -239,7 +239,17 @@ void draw_status() gl::end(); float u = core::localcontrol()->thrust(); - if ( u > 0) { + if (( u > 0) || (core::localcontrol()->eventstate() == core::Entity::Impulse)) { + + if (core::localcontrol()->eventstate() == core::Entity::Impulse) { + gl::color(0, .8, 0); + } else { + float d = math::absf(input::local_thrust - u); + if (d > 0.1) { + d = 0.1f; + } + gl::color(1, 1, .5f + d * 5.0f); + } Textures::bind("bitmaps/hud/thruster_indicator"); // 316 x 32 bitmap gl::begin(render::gl::Quads); glTexCoord2f(0, 0); @@ -256,7 +266,10 @@ void draw_status() gl::end(); } + Text::setfont("bitmaps/fonts/gui", 14, 24); + Text::setcolor('B'); //set normal color + std::stringstream speedstr; speedstr << "^B" << roundf(core::localcontrol()->speed() * 100.0f); Text::draw( 316+4+10, video::height - 6 -16 - render::Text::fontwidth() /2, speedstr); |