#include "joystick.h"
#include "network.h"
+/* values for key_status */
+#define KEY_NOT_PRESSED FALSE
+#define KEY_RELEASED FALSE
+#define KEY_PRESSED TRUE
+
void EventLoop(void)
{
while(1)
Delay(10);
}
-
-
-#if 0
- else /* got no event, but don't be lazy... */
- {
- HandleNoXEvent();
-
- /* don't use all CPU time when idle; the main loop while playing
- has its own synchronization and is CPU friendly, too */
-
- if (game_status != PLAYING)
- {
- XSync(display, FALSE);
- Delay(10);
- }
- }
-#endif
-
-
-
if (game_status == EXITGAME)
return;
}
int x = event->x, y = event->y;
int width = event->width, height = event->height;
- if (setup.direct_draw_on && game_status==PLAYING)
+ if (setup.direct_draw && game_status==PLAYING)
{
int xx,yy;
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
SetDrawtoField(DRAW_DIRECT);
}
- if (setup.soft_scrolling_on && game_status == PLAYING)
+ if (setup.soft_scrolling && game_status == PLAYING)
{
int fx = FX, fy = FY;
void HandleClientMessageEvent(XClientMessageEvent *event)
{
+#ifndef MSDOS
if ((event->window == window) &&
(event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
CloseAllAndExit(0);
+#endif
}
void HandleButton(int mx, int my, int button)
old_mx = mx;
old_my = my;
- HandleVideoButtons(mx,my,button);
- HandleSoundButtons(mx,my,button);
- HandleGameButtons(mx,my,button);
- }
-
-#ifdef DEBUG
- if (game_status == PLAYING && !button)
- {
- int sx = (mx - SX) / TILEX;
- int sy = (my - SY) / TILEY;
-
- if (IN_VIS_FIELD(sx,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");
- }
+ HandleVideoButtons(mx,my, button);
+ HandleSoundButtons(mx,my, button);
+ HandleGameButtons(mx,my, button);
}
-#endif
switch(game_status)
{
case MAINMENU:
- HandleMainMenu(mx,my,0,0,button);
+ HandleMainMenu(mx,my, 0,0, button);
break;
case TYPENAME:
- HandleTypeName(0,XK_Return);
+ HandleTypeName(0, XK_Return);
break;
case CHOOSELEVEL:
- HandleChooseLevel(mx,my,0,0,button);
+ HandleChooseLevel(mx,my, 0,0, button);
break;
case HALLOFFAME:
break;
case LEVELED:
- LevelEd(mx,my,button);
+ LevelEd(mx,my, button);
break;
case HELPSCREEN:
break;
case SETUP:
- HandleSetupScreen(mx,my,0,0,button);
+ HandleSetupScreen(mx,my, 0,0, button);
break;
case SETUPINPUT:
- HandleSetupInputScreen(mx,my,0,0,button);
+ HandleSetupInputScreen(mx,my, 0,0, button);
break;
case PLAYING:
-
- /* --> NoXEvent() will follow */
-
- /*
- HandleGameActions(0);
- */
-
+#ifdef DEBUG
+ if (button == MB_RELEASED)
+ {
+ int sx = (mx - SX) / TILEX;
+ int sy = (my - SY) / TILEY;
+
+ if (IN_VIS_FIELD(sx,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");
+ }
+ }
+#endif
break;
default:
key_action |= key_info[i].action;
if (key_status == KEY_PRESSED)
- {
- if (network_playing)
- local_player->action |= key_action;
- else
- stored_player[pnr].action |= key_action;
- }
+ stored_player[pnr].action |= key_action;
else
- {
- if (network_playing)
- local_player->action &= ~key_action;
- else
- stored_player[pnr].action &= ~key_action;
- }
+ stored_player[pnr].action &= ~key_action;
}
}
else
joy |= key_info[i].action;
}
-
-#if 0
-
-
- /* Map cursor keys to joystick directions */
-
- switch(key)
- {
- case XK_Left: /* normale Richtungen */
-#ifdef XK_KP_Left
- case XK_KP_Left:
-#endif
- case XK_KP_4:
-#ifndef MSDOS
- case XK_J:
-#endif
- case XK_j:
- joy |= JOY_LEFT;
- break;
-
- case XK_Right:
-#ifdef XK_KP_Right
- case XK_KP_Right:
-#endif
- case XK_KP_6:
-#ifndef MSDOS
- case XK_K:
-#endif
- case XK_k:
- joy |= JOY_RIGHT;
- break;
-
- case XK_Up:
-#ifdef XK_KP_Up
- case XK_KP_Up:
-#endif
- case XK_KP_8:
-#ifndef MSDOS
- case XK_I:
-#endif
- case XK_i:
- joy |= JOY_UP;
- break;
-
- case XK_Down:
-#ifdef XK_KP_Down
- case XK_KP_Down:
-#endif
- case XK_KP_2:
-#ifndef MSDOS
- case XK_M:
-#endif
- case XK_m:
- joy |= JOY_DOWN;
- break;
-
-#ifdef XK_KP_Home
- case XK_KP_Home: /* Diagonalrichtungen */
-#endif
- case XK_KP_7:
- joy |= JOY_UP | JOY_LEFT;
- break;
-
-#ifdef XK_KP_Page_Up
- case XK_KP_Page_Up:
-#endif
- case XK_KP_9:
- joy = JOY_UP | JOY_RIGHT;
- break;
-
-#ifdef XK_KP_End
- case XK_KP_End:
-#endif
- case XK_KP_1:
- joy |= JOY_DOWN | JOY_LEFT;
- break;
-
-#ifdef XK_KP_Page_Down
- case XK_KP_Page_Down:
-#endif
- case XK_KP_3:
- joy |= JOY_DOWN | JOY_RIGHT;
- break;
-
-#ifndef MSDOS
- case XK_S: /* Feld entfernen */
-#endif
- case XK_s:
- joy |= JOY_BUTTON_1 | JOY_LEFT;
- break;
-
-#ifndef MSDOS
- case XK_D:
-#endif
- case XK_d:
- joy |= JOY_BUTTON_1 | JOY_RIGHT;
- break;
-
-#ifndef MSDOS
- case XK_E:
-#endif
- case XK_e:
- joy |= JOY_BUTTON_1 | JOY_UP;
- break;
-
-#ifndef MSDOS
- case XK_X:
-#endif
- case XK_x:
- joy |= JOY_BUTTON_1 | JOY_DOWN;
- break;
-
- case XK_Shift_L: /* Linker Feuerknopf */
-#ifndef MSDOS
- case XK_Control_L:
- case XK_Alt_L:
- case XK_Meta_L:
-#endif
- joy |= JOY_BUTTON_1;
- break;
-
- case XK_Shift_R: /* Rechter Feuerknopf */
-#ifndef MSDOS
- case XK_Control_R:
- case XK_Alt_R:
- case XK_Meta_R:
- case XK_Mode_switch:
- case XK_Multi_key:
- case XK_B: /* (Bombe legen) */
-#endif
- case XK_b:
- joy |= JOY_BUTTON_2;
- break;
-
- default:
- break;
- }
-
-
-#endif
-
-
if (joy)
{
if (key_status == KEY_PRESSED)
if (key_status == KEY_RELEASED)
return;
- if (key==XK_Return && game_status==PLAYING && AllPlayersGone)
+ if (key == XK_Return && game_status == PLAYING && AllPlayersGone)
{
CloseDoor(DOOR_CLOSE_1);
game_status = MAINMENU;
return;
}
- if (key==XK_Escape && game_status!=MAINMENU) /* quick quit to MAINMENU */
+ /* allow quick escape to the main menu with the Escape key */
+ if (key == XK_Escape && game_status != MAINMENU)
{
CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
game_status = MAINMENU;
return;
}
- if (game_status==PLAYING && (tape.playing || tape.pausing))
+
+
+#ifndef DEBUG
+
+ if (game_status == PLAYING && (tape.playing || tape.pausing))
return;
+#endif
+
+
+
switch(game_status)
{
case TYPENAME:
- HandleTypeName(0,key);
+ HandleTypeName(0, key);
break;
case MAINMENU:
switch(key)
{
case XK_Return:
- if (game_status==MAINMENU)
- HandleMainMenu(0,0,0,0,MB_MENU_CHOICE);
- else if (game_status==CHOOSELEVEL)
- HandleChooseLevel(0,0,0,0,MB_MENU_CHOICE);
- else if (game_status==SETUP)
- HandleSetupScreen(0,0,0,0,MB_MENU_CHOICE);
- else if (game_status==SETUPINPUT)
- HandleSetupInputScreen(0,0,0,0,MB_MENU_CHOICE);
+ if (game_status == MAINMENU)
+ HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
+ else if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(0,0, 0,0, MB_MENU_CHOICE);
+ else if (game_status == SETUP)
+ HandleSetupScreen(0,0, 0,0, MB_MENU_CHOICE);
+ else if (game_status == SETUPINPUT)
+ HandleSetupInputScreen(0,0, 0,0, MB_MENU_CHOICE);
break;
default:
case XK_8:
case XK_9:
if (key == XK_0)
- GameFrameDelay = 500;
+ {
+ if (GameFrameDelay == 500)
+ GameFrameDelay = GAME_FRAME_DELAY;
+ else
+ GameFrameDelay = 500;
+ }
else
GameFrameDelay = (key - XK_0) * 10;
printf("Game speed == %d%% (%d ms delay between two frames)\n",
#if 0
- case XK_x:
-
- {
- int i,j,k, num_steps = 8, step_size = TILEX / num_steps;
- static long scroll_delay=0;
- long scroll_delay_value = 4*4 / num_steps;
-
- printf("Scroll test\n");
-
- for(i=0;i<3;i++)
- {
- for(j=0;j<SCR_FIELDX;j++)
- {
- for(k=0;k<num_steps;k++)
- {
- int xxx = j*TILEX+k*step_size;
- int done = 0;
-
- while(!done)
- {
- if (DelayReached(&scroll_delay, scroll_delay_value))
- {
- XCopyArea(display,fieldbuffer,window,gc,
- SX+xxx,SY,
- SXSIZE-xxx,SYSIZE,
- SX,SY);
- XCopyArea(display,fieldbuffer,window,gc,
- SX,SY,
- xxx,SYSIZE,
- SX+SXSIZE-xxx,SY);
-
- XFlush(display);
- XSync(display,FALSE);
-
- done = 1;
- }
- else
- {
- Delay(1);
- }
- }
-
- /*
- Delay(160 / num_steps);
- */
- /*
- Delay(120 / num_steps);
- */
- }
- }
- }
- }
-
- break;
-
- case XK_y:
- /*
- {
- printf("FX = %d, FY = %d\n", FX,FY);
-
- XCopyArea(display,fieldbuffer,window,gc,
- 0,0,
- MIN(WIN_XSIZE,FXSIZE),MIN(WIN_YSIZE,FYSIZE),
- 0,0);
- XFlush(display);
- XSync(display,FALSE);
- Delay(1000);
- }
- */
-
- printf("direct_draw_on == %d\n", setup.direct_draw_on);
-
- break;
-
case XK_z:
{
int i;
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
#endif
{
if (button_status && game_status != PLAYING)
{
- HandleButton(-1,-1,button_status);
+ HandleButton(-1,-1, button_status);
return;
}
+#ifndef MSDOS
if (options.network)
HandleNetworking();
+#endif
- switch(game_status)
- {
- case MAINMENU:
- case CHOOSELEVEL:
- case HALLOFFAME:
- case HELPSCREEN:
- case SETUP:
- case SETUPINPUT:
- HandleJoystick();
- break;
+ HandleJoystick();
- case PLAYING:
- HandleJoystick();
+ if (game_status == PLAYING)
+ HandleGameActions();
+}
- /*
- HandleGameActions(0);
+static int HandleJoystickForAllPlayers()
+{
+ int i;
+ int result = 0;
+
+ for (i=0; i<MAX_PLAYERS; i++)
+ {
+ byte joy_action = 0;
+
+ /*
+ if (!setup.input[i].use_joystick)
+ continue;
*/
- break;
+ joy_action = Joystick(i);
+ result |= joy_action;
- default:
- break;
+
+ if (!setup.input[i].use_joystick)
+ continue;
+
+
+ stored_player[i].action = joy_action;
}
+
+ return result;
}
void HandleJoystick()
{
- int joystick = Joystick();
+ int joystick = HandleJoystickForAllPlayers();
int keyboard = key_joystick_mapping;
int joy = (joystick | keyboard);
int left = joy & JOY_LEFT;
int up = joy & JOY_UP;
int down = joy & JOY_DOWN;
int button = joy & JOY_BUTTON;
- int newbutton = (JoystickButton() == JOY_BUTTON_NEW_PRESSED);
+ int newbutton = (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED);
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
case SETUP:
case SETUPINPUT:
{
- static long joystickmove_delay = 0;
+ static unsigned long joystickmove_delay = 0;
- if (joystick && !button && !DelayReached(&joystickmove_delay,150))
+ if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
newbutton = dx = dy = 0;
if (game_status==MAINMENU)
return;
}
- /*
- if (tape.pausing || AllPlayersGone)
- {
- int i;
-
- for (i=0; i<MAX_PLAYERS; i++)
- stored_player[i].action = 0;
- }
- */
-
- HandleGameActions();
break;
default:
projects / rocksndiamonds.git / blobdiff