From 365b0c6330ea607706b708d92da7a46b1ed1fb15 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 2 Feb 2008 11:09:04 +0000 Subject: introduced libsys implemented signal handling --- src/client/Makefile.am | 6 ++---- src/client/input.cc | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/client') diff --git a/src/client/Makefile.am b/src/client/Makefile.am index e191f5f..9807963 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,10 +3,8 @@ METASOURCES = AUTO bin_PROGRAMS = osirion osirion_LDADD = $(top_builddir)/src/math/libmath.la \ - $(top_builddir)/src/common/libcommon.la \ - $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/core/libcore.la \ - $(top_builddir)/src/game/libgame.la \ + $(top_builddir)/src/common/libcommon.la $(top_builddir)/src/sys/libsys.la \ + $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/core/libcore.la $(top_builddir)/src/game/libgame.la \ $(top_builddir)/src/gl/libgl.la osirion_SOURCES = application.cc camera.cc client.cc console.cc hud.cc input.cc main.cc \ shipdrawer.cc stardrawer.cc video.cc view.cc diff --git a/src/client/input.cc b/src/client/input.cc index 5f38d35..3e37a19 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -46,7 +46,7 @@ void Input::handle_keypressed(SDL_keysym* keysym) { switch( keysym->sym ) { case SDLK_ESCAPE: - client::application.shutdown(); + application.shutdown(); break; case SDLK_LEFT: camera.rotate_left(); @@ -91,7 +91,7 @@ void Input::process() handle_keyreleased( &event.key.keysym ); break; case SDL_QUIT: - client::application.shutdown(); + application.shutdown(); break; } -- cgit v1.2.3