***********************************************************/
#include "events.h"
+#include "init.h"
#include "screens.h"
#include "tools.h"
#include "game.h"
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
- Delay(10000); /* don't use all CPU time when idle */
- }
- XSync(display,FALSE);
+ /* 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);
+ }
+ }
- if (game_status==EXITGAME)
+ if (game_status == EXITGAME)
return;
}
}
case FocusOut:
HandleFocusEvent((XFocusChangeEvent *) &event);
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
case MapNotify:
window_unmapped = FALSE;
break;
+ case ClientMessage:
+ HandleClientMessageEvent((XClientMessageEvent *) &event);
+ break;
default:
break;
}
int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
int x2 = (x-SX+width)/TILEX, y2 = (y-SY+height)/TILEY;
- drawto_field = backbuffer;
+ SetDrawtoField(DRAW_BACKBUFFER);
for(xx=0;xx<SCR_FIELDX;xx++)
for(yy=0;yy<SCR_FIELDY;yy++)
DrawScreenField(xx,yy);
DrawPlayerField();
- drawto_field = window;
+ SetDrawtoField(DRAW_DIRECT);
+ }
+
+ if (soft_scrolling_on && game_status == PLAYING)
+ {
+ int fx = FX, fy = FY;
+
+ fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+ fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
+
+ XCopyArea(display,fieldbuffer,backbuffer,gc,
+ fx,fy, SXSIZE,SYSIZE,
+ SX,SY);
}
XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
XAutoRepeatOn(display);
old_joystick_status = joystick_status;
joystick_status = JOYSTICK_OFF;
+ key_joystick_mapping = 0;
}
else if (event->type == FocusIn)
{
}
}
+void HandleClientMessageEvent(XClientMessageEvent *event)
+{
+ if ((event->window == window) &&
+ (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
+ CloseAll();
+}
+
void HandleButton(int mx, int my, int button)
{
static int old_mx = 0, old_my = 0;
}
}
-int Gamespeed = 4;
-int Movemethod = 0;
-int Movespeed[2] = { 10, 3 };
-char *Movespeed_text[2] = { "asynchron", "syncron" };
-
void HandleKey(KeySym key, int key_status)
{
int joy = 0;
case XK_KP_Left:
#endif
case XK_KP_4:
+#ifndef MSDOS
case XK_J:
+#endif
case XK_j:
joy |= JOY_LEFT;
break;
case XK_KP_Right:
#endif
case XK_KP_6:
+#ifndef MSDOS
case XK_K:
+#endif
case XK_k:
joy |= JOY_RIGHT;
break;
case XK_KP_Up:
#endif
case XK_KP_8:
+#ifndef MSDOS
case XK_I:
+#endif
case XK_i:
joy |= JOY_UP;
break;
case XK_KP_Down:
#endif
case XK_KP_2:
+#ifndef MSDOS
case XK_M:
+#endif
case XK_m:
joy |= JOY_DOWN;
break;
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;
key_joystick_mapping &= ~joy;
HandleJoystick();
-
- if (game_status != PLAYING)
- key_joystick_mapping = 0;
}
+ if (game_status != PLAYING)
+ key_joystick_mapping = 0;
+
if (key_status == KEY_RELEASED)
return;
case XK_7:
case XK_8:
case XK_9:
- Movespeed[Movemethod] = (Movemethod == 0 ? 4 : 0) + (key - XK_0);
- printf("method == %d, speed == %d (%s)\n",
- Movemethod, Movespeed[Movemethod],
- Movespeed_text[Movemethod]);
+ if (key == XK_0)
+ GameSpeed = 500;
+ else
+ GameSpeed = (key - XK_0) * 10;
+ printf("GameSpeed == %d\n", GameSpeed);
break;
case XK_a:
- Movemethod = !Movemethod;
- printf("method == %d, speed == %d (%s)\n",
- Movemethod, Movespeed[Movemethod],
- Movespeed_text[Movemethod]);
+ if (ScrollStepSize == TILEX/8)
+ ScrollStepSize = TILEX/4;
+ else
+ ScrollStepSize = TILEX/8;
+ printf("ScrollStepSize == %d\n", ScrollStepSize);
break;
case XK_f:
- Gamespeed = 2;
- printf("gamespeed == %d\n", Gamespeed);
+ ScrollStepSize = TILEX/8;
+ printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
break;
case XK_g:
- Gamespeed = 3;
- printf("gamespeed == %d\n", Gamespeed);
+ ScrollStepSize = TILEX/4;
+ printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize);
break;
case XK_h:
- Gamespeed = 4;
- printf("gamespeed == %d\n", Gamespeed);
+ ScrollStepSize = TILEX/2;
+ printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize);
break;
case XK_l:
- Gamespeed = 10;
- printf("gamespeed == %d\n", Gamespeed);
+ ScrollStepSize = TILEX;
+ printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
break;
+#ifndef MSDOS
case XK_Q:
+#endif
case XK_q:
Dynamite = 1000;
break;
-#endif
case XK_x:
{
- int i,j,k, num_steps = 16, step_size = TILEX / num_steps;
+ 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<10;i++)
+ for(i=0;i<3;i++)
{
for(j=0;j<SCR_FIELDX;j++)
{
{
if (DelayReached(&scroll_delay, scroll_delay_value))
{
- XCopyArea(display,backbuffer,window,gc,
+ XCopyArea(display,fieldbuffer,window,gc,
SX+xxx,SY,
SXSIZE-xxx,SYSIZE,
SX,SY);
- XCopyArea(display,backbuffer,window,gc,
+ XCopyArea(display,fieldbuffer,window,gc,
SX,SY,
xxx,SYSIZE,
SX+SXSIZE-xxx,SY);
}
else
{
- Delay(1000);
+ Delay(1);
}
}
/*
- Delay(160000 / num_steps);
+ Delay(160 / num_steps);
*/
/*
- Delay(120000 / 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);
+ }
+
+ break;
+#endif
+
default:
break;
}
void HandleNoXEvent()
{
- if (button_status && game_status!=PLAYING)
+ if (button_status && game_status != PLAYING)
{
HandleButton(-1,-1,button_status);
return;
break;
case PLAYING:
{
+ static int player_frame_reset_delay = 0;
BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
if (GameOver && newbutton)
return;
}
-
-
- if (PlayerMovPos)
- ScrollFigure(0);
-
-
-
if (tape.pausing || PlayerGone)
joy = 0;
if (joy)
{
+ player_frame_reset_delay = 0;
+
if (button1)
snapped = SnapField(dx,dy);
else
{
DigField(0,0,0,0,DF_NO_PUSH);
SnapField(0,0);
- PlayerFrame = 0;
+ if (++player_frame_reset_delay > MoveSpeed)
+ PlayerFrame = 0;
}
if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
}
}
}
-
- DrawPlayerField();
-
break;
}
default:
projects / rocksndiamonds.git / blobdiff