X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=71d03604c22eb6081e1632232d3ffb852a5c9e41;hb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;hp=bde68249425127f49c3f6c81a68ee324611b6b41;hpb=f45528c08776cd2c87a83bf3ec7e1f7fe7b18765;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index bde68249..71d03604 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  events.c                                                *
 ***********************************************************/
@@ -21,12 +20,13 @@
 #include "misc.h"
 #include "tape.h"
 #include "joystick.h"
+#include "network.h"
 
 void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))	/* got an event */
+    if (XPending(display))	/* got event from X server */
     {
       XEvent event;
 
@@ -180,8 +180,8 @@ void HandleExposeEvent(XExposeEvent *event)
   {
     int fx = FX, fy = FY;
 
-    fx += (local_player->MovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
-    fy += (local_player->MovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+    fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
+    fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
 
     XCopyArea(display,fieldbuffer,backbuffer,gc,
 	      fx,fy, SXSIZE,SYSIZE,
@@ -245,7 +245,7 @@ void HandleClientMessageEvent(XClientMessageEvent *event)
 {
   if ((event->window == window) &&
       (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    CloseAll();
+    game_status = EXITGAME;
 }
 
 void HandleButton(int mx, int my, int button)
@@ -268,20 +268,23 @@ void HandleButton(int mx, int my, int button)
   }
 
 #ifdef DEBUG
-  if (game_status == PLAYING && button)
+  if (game_status == PLAYING && !button)
   {
     int sx = (mx - SX) / TILEX;
     int sy = (my - SY) / TILEY;
 
-    if (IN_SCR_FIELD(sx,sy))
+    if (IN_VIS_FIELD(sx,sy))
     {
-      int x = UNSCROLLX(sx);
-      int y = UNSCROLLY(sy);
+      int x = LEVELX(sx);
+      int y = LEVELY(sy);
 
       printf("INFO: Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
       printf("      Store[%d][%d] == %d\n", x,y, Store[x][y]);
       printf("      Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
       printf("      StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
+      printf("      MovPos[%d][%d] == %d\n", x,y, MovPos[x][y]);
+      printf("      MovDir[%d][%d] == %d\n", x,y, MovDir[x][y]);
+      printf("      MovDelay[%d][%d] == %d\n", x,y, MovDelay[x][y]);
       printf("\n");
     }
   }
@@ -664,6 +667,20 @@ void HandleKey(KeySym key, int key_status)
 	    printf("\n");
 	  }
 
+	  break;
+
+	case XK_t:
+	  {
+	    char *color[] = { "yellow", "red", "green", "blue" };
+
+	    do
+	      TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    while(!stored_player[TestPlayer].active);
+
+	    printf("TestPlayer = %d (%s player)\n",
+		   TestPlayer, color[TestPlayer]);
+	  }
+
 	  break;
 #endif
 
@@ -685,6 +702,8 @@ void HandleNoXEvent()
     return;
   }
 
+  HandleNetworking();
+
   switch(game_status)
   {
     case MAINMENU:
@@ -711,7 +730,12 @@ void HandleJoystick()
 {
   int joystick	= Joystick();
   int keyboard	= key_joystick_mapping;
+
+  /*
   int joy	= (tape.playing ? TapePlayAction() : (joystick | keyboard));
+  */
+
+  int joy	= (joystick | keyboard);
   int left	= joy & JOY_LEFT;
   int right	= joy & JOY_RIGHT;
   int up	= joy & JOY_UP;
@@ -764,7 +788,12 @@ void HandleJoystick()
       if (tape.pausing || AllPlayersGone)
 	joy = 0;
 
-      HandleGameActions(joy);
+      /*
+      if (!network_player_action_stored)
+	SendToServer_MovePlayer(joy, 0);
+      */
+
+      HandleGameActions((byte)joy);
       break;
 
     default: