diff --git a/ChangeLog b/ChangeLog
index 69e770b..5b3278f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-$Id: ChangeLog,v 1.42 2003/09/16 20:04:02 stpohle Exp $
+$Id: ChangeLog,v 1.43 2003/09/16 20:04:31 stpohle Exp $
+
+- FullScreen switching from within the game
+  by pressing F8
 
 - first perfect BomberClone music file "cinderella_clown.mod"
   thanks to Psycho (http://www.moods.2xs.de/)
diff --git a/src/game.c b/src/game.c
index bc39c47..c8ca3fa 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.54 2003/09/12 18:10:36 stpohle Exp $ 
+/* $Id: game.c,v 1.55 2003/09/16 20:04:05 stpohle Exp $ 
   game.c - procedures for the game. */
 
 #include <string.h>
@@ -182,6 +182,13 @@ game_loop ()
             bman.updatestatusbar = 1; // force an update
         }
 
+        if (keys[SDLK_F8] && event.type == SDL_KEYDOWN) {
+            /* Switch Fullscreen */
+			SDL_WM_ToggleFullScreen(gfx.screen);
+			gfx.fullscreen = !gfx.fullscreen;
+            bman.updatestatusbar = 1; // force an update
+        }
+
         if (event.key.keysym.sym == SDLK_ESCAPE && event.type == SDL_KEYDOWN) {
             bman.state = GS_startup;
             done = 1;
diff --git a/src/packets.c b/src/packets.c
index 63271ee..884be1f 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -715,8 +715,7 @@ send_tunneldata (_net_addr * addr, int tunnelnr, int x, int y)
     tun_pkg.h.flags = PKGF_ackreq;
     tun_pkg.h.len = HTON16 (sizeof (struct pkg_tunneldata));
 
-    if ((GT_MP_PTPM && x != -1 && y != -1)
-        || (GT_MP_PTPS && x == -1 && y == -1)) {
+    if (GT_MP_PTPM || (GT_MP_PTPS && x == -1 && y == -1)) {
         tun_pkg.tunnel_nr = tunnelnr;
         tun_pkg.target.x = HTON16 (x);
         tun_pkg.target.y = HTON16 (y);