[Deadchannel-commits] code/game.py code/preferences.py data/default_preferences.cfg

[Bruno C. <bru...@us...>]

This is an automated email from the git, the tree hashes are:

       via  6d919fc872b07572540022ecfbdc34fbe97c502e (commit)
       via  f76e6cfc32fd286cfa1e3b61e9782595a71e2b04 (commit)
      from  5a59d44d824d386fc4f355ce2bca6d0b49e16238 (commit)


- Log -----------------------------------------------------------------
commit 6d919fc872b07572540022ecfbdc34fbe97c502e
Merge: f76e6cf 5a59d44
Author: Bruno Cardoso Lopes <bruno@keyser.(none)>
Date:   Sat Dec 5 02:00:40 2009 -0200

    Merge branch 'master' of ssh://brunocardoso@deadchannel.git.sourceforge.net/gitroot/deadchannel/deadchannel

commit f76e6cfc32fd286cfa1e3b61e9782595a71e2b04
Author: Bruno Cardoso Lopes <bruno@keyser.(none)>
Date:   Sat Dec 5 02:00:10 2009 -0200

    Add support for fullscreen toogle. Just press 'f' on an updated default_preferences.cfg

diff --git a/code/game.py b/code/game.py
index 069eb42..e63c513 100644
--- a/code/game.py
+++ b/code/game.py
@@ -157,6 +157,8 @@ class Game:
                         player.prev_secondary_weapon()
                     elif key == preferences.key_next_secondary_weapon:
                         player.next_secondary_weapon()
+                    elif key == preferences.key_toogle_fullscreen:
+                        pygame.display.toggle_fullscreen()
                 elif type == KEYUP:
                     if key == preferences.key_down:
                         player.accel_top()
diff --git a/code/preferences.py b/code/preferences.py
index 33bcdb5..9366c9d 100644
--- a/code/preferences.py
+++ b/code/preferences.py
@@ -96,6 +96,9 @@ class Preferences:
     def get_key_next_secondary_weapon(self):
         return int(self.get('keyboard', 'next_secondary_weapon'))
 
+    def get_key_toogle_fullscreen(self):
+        return int(self.get('keyboard', 'toogle_fullscreen'))
+
     def get_mouse_sensitivity(self):
         return float(self.get('mouse', 'sensitivity'))
 
@@ -177,6 +180,7 @@ class Preferences:
     key_player_next_track = property(get_key_player_next_track)
     key_prev_secondary_weapon = property(get_key_prev_secondary_weapon)
     key_next_secondary_weapon = property(get_key_next_secondary_weapon)
+    key_toogle_fullscreen = property(get_key_toogle_fullscreen)
     mouse_sensitivity = property(get_mouse_sensitivity)
     mouse_fire = property(get_mouse_fire)
     mouse_secondary_fire = property(get_mouse_secondary_fire)
diff --git a/data/default_preferences.cfg b/data/default_preferences.cfg
index 6433dce..ca4017d 100644
--- a/data/default_preferences.cfg
+++ b/data/default_preferences.cfg
@@ -47,6 +47,7 @@ fire = 32
 prev_secondary_weapon = 97
 next_secondary_weapon = 115
 secondary_fire = 100
+toogle_fullscreen = 102
 [mouse]
 # mouse buttons are left = 1, middle = 2, right = 3, wheel up = 4 and down = 5
 fire = 1
-----------------------------------------------------------------------

Summary of changes:
 code/game.py                 |    2 ++
 code/preferences.py          |    4 ++++
 data/default_preferences.cfg |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)


-- 
Dead Channel is a sci-fi shoot 'em up game developed using pygame.