rpms/methane/devel methane-fullscreen.patch, 1.2, 1.3 methane.spec, 1.10, 1.11

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/methane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29144

Modified Files:
	methane-fullscreen.patch methane.spec 
Log Message:
* Thu Nov 12 2009 Hans de Goede <hdegoede at redhat.com> 1.5.0-2
- Hide cursor in fullscreen mode


methane-fullscreen.patch:
 methane.cpp |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

Index: methane-fullscreen.patch
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane-fullscreen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- methane-fullscreen.patch	11 Nov 2009 10:07:26 -0000	1.2
+++ methane-fullscreen.patch	16 Nov 2009 10:16:19 -0000	1.3
@@ -1,12 +1,7 @@
-Only in methane-1.5.0.new: build
-Only in methane-1.5.0.new: debugfiles.list
-Only in methane-1.5.0.new: debuglinks.list
-Only in methane-1.5.0.new: debugsources.list
-Only in methane-1.5.0.new: methane
-diff -ur methane-1.5.0/sources/methane.cpp methane-1.5.0.new/sources/methane.cpp
---- methane-1.5.0/sources/methane.cpp	2009-11-09 23:24:15.000000000 +0100
-+++ methane-1.5.0.new/sources/methane.cpp	2009-11-09 23:20:25.000000000 +0100
-@@ -36,6 +36,7 @@
+diff -up methane-1.5.0/sources/methane.cpp.fullscreen methane-1.5.0/sources/methane.cpp
+--- methane-1.5.0/sources/methane.cpp.fullscreen	2009-11-12 08:41:46.000000000 +0100
++++ methane-1.5.0/sources/methane.cpp	2009-11-12 08:42:36.000000000 +0100
+@@ -36,6 +36,7 @@ FILE *methanescoresfptr = NULL;
  
  RenderTarget GLOBAL_RenderTarget = opengl;
  bool GLOBAL_SoundEnable = true;
@@ -14,7 +9,7 @@ diff -ur methane-1.5.0/sources/methane.c
  
  //------------------------------------------------------------------------------
  // Keyboard stuff
-@@ -59,6 +60,20 @@
+@@ -59,6 +60,20 @@ public:
  
  	int main(const std::vector<CL_String> &args)
  	{
@@ -35,7 +30,7 @@ diff -ur methane-1.5.0/sources/methane.c
  		// Create a console window for text-output if not available
  		CL_ConsoleWindow console("Console");
  		try
-@@ -103,7 +118,13 @@
+@@ -103,8 +118,16 @@ public:
  			CL_DisplayWindowDescription desc;
  			desc.set_title("Super Methane Brothers");
  			desc.set_size(CL_Size(SCR_WIDTH*2,SCR_HEIGHT*2), true);
@@ -48,9 +43,12 @@ diff -ur methane-1.5.0/sources/methane.c
 +			else
 +				desc.set_allow_resize(true);
  			CL_DisplayWindow window(desc);
++			if (GLOBAL_FullScreenEnable)
++				window.hide_cursor();
  
  			CMethDoc Game(window);
-@@ -129,8 +150,6 @@
+ 
+@@ -129,8 +152,6 @@ public:
  			int last_time = CL_System::get_time();
  
  			int quit_flag = 0;
@@ -59,7 +57,7 @@ diff -ur methane-1.5.0/sources/methane.c
  			int on_options_screen = 1;
  			int option_page = 0;
  			int game_speed = 60;
-@@ -276,7 +295,8 @@
+@@ -276,7 +297,8 @@ public:
  
  	bool get_options()
  	{
@@ -69,7 +67,7 @@ diff -ur methane-1.5.0/sources/methane.c
  
  		// Connect the Window close event
  		CL_Slot slot_quit = window.sig_window_close().connect(this, &SuperMethaneBrothers::on_window_close);
-@@ -311,6 +331,12 @@
+@@ -311,6 +333,12 @@ public:
  				}
  			}
  
@@ -82,7 +80,7 @@ diff -ur methane-1.5.0/sources/methane.c
  			gc.clear(CL_Colorf(0.0f,0.0f,0.2f));
  
  			int ypos = 40;
-@@ -333,6 +359,15 @@
+@@ -333,6 +361,15 @@ public:
  			{
  				options_font.draw_text(gc, 10, ypos, "Audio - Disabled. Press 'A' to modify");
  			}
@@ -98,4 +96,3 @@ diff -ur methane-1.5.0/sources/methane.c
  
  			ypos += 100;
  			options_font.draw_text(gc, 10, ypos, "Press the spacebar to start");
-Only in methane-1.5.0.new/sources: methane.cpp~


Index: methane.spec
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- methane.spec	11 Nov 2009 10:28:14 -0000	1.10
+++ methane.spec	16 Nov 2009 10:16:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           methane
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Super Methane Brothers
 Group:          Amusements/Games
 License:        GPLv2+
@@ -89,6 +89,9 @@ fi
 
 
 %changelog
+* Thu Nov 12 2009 Hans de Goede <hdegoede at redhat.com> 1.5.0-2
+- Hide cursor in fullscreen mode
+
 * Wed Nov 11 2009 Hans de Goede <hdegoede at redhat.com> 1.5.0-1
 - New upstream release 1.5.0
 - Hiscore save file format has changed, this means all