X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fdesertpillars.cpp;h=297619c74a2f5532d7de22dac9e5c5b2e73df40a;hb=ae9abd6be3e556d0a202cc5ab05668da715382c9;hp=0f148f7de28ebc4335eff4bef2bea967de51ab5d;hpb=73ab6382709fa2c9a30f196e462e8f60f7f4beda;p=libs%2Fgl.git

diff --git a/demos/desertpillars.cpp b/demos/desertpillars.cpp
index 0f148f7d..297619c7 100644
--- a/demos/desertpillars.cpp
+++ b/demos/desertpillars.cpp
@@ -262,7 +262,7 @@ const char DesertPillars::cube_transform_src[] =
 const float DesertPillars::cube_shapes[] = { -0.4, 0.5, 1.0, 0.3 };
 
 
-DesertPillars::Options::Options(const Graphics::Display &display, int argc, char **argv)
+DesertPillars::Options::Options(const Graphics::Display &dpy, int argc, char **argv)
 {
 	GetOpt getopt;
 	getopt.add_option('f', "fullscreen", window_opts.fullscreen, GetOpt::NO_ARG).set_help("Run in fullscreen mode");
@@ -270,7 +270,7 @@ DesertPillars::Options::Options(const Graphics::Display &display, int argc, char
 
 	if(window_opts.fullscreen)
 	{
-		const Graphics::VideoMode &mode = display.get_desktop_mode();
+		const Graphics::VideoMode &mode = dpy.get_desktop_mode();
 		window_opts.width = mode.width;
 		window_opts.height = mode.height;
 	}
@@ -304,7 +304,7 @@ DesertPillars::DesertPillars(int argc, char **argv):
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &DesertPillars::exit), 0));
 	if(options.window_opts.fullscreen)
 		window.show_cursor(false);
-	keyboard.signal_button_press.connect(sigc::mem_fun(this, &DesertPillars::key_press));
+	keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &DesertPillars::key_press), false));
 
 	create_pipeline();
 	create_skybox();