X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=9a2cdd41b6f6cce864ff645838e8572564bd3d9d;hb=1478ab1f979ae33fd900e5148c5d00dcba5ad402;hp=1b77ca40cbdd515890660201aae94fc01dc4fa6f;hpb=19b6c35938826bfd71478d7ddaf1a4729420d3b2;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index 1b77ca40..9a2cdd41 100644 --- a/src/events.c +++ b/src/events.c @@ -13,6 +13,7 @@ ***********************************************************/ #include "events.h" +#include "init.h" #include "screens.h" #include "tools.h" #include "game.h" @@ -54,6 +55,9 @@ void EventLoop(void) case FocusOut: HandleFocusEvent((XFocusChangeEvent *) &event); break; + case ClientMessage: + HandleClientMessageEvent((XClientMessageEvent *) &event); + break; default: break; } @@ -61,12 +65,18 @@ void EventLoop(void) 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; } } @@ -97,6 +107,9 @@ void ClearEventQueue() case FocusOut: HandleFocusEvent((XFocusChangeEvent *) &event); break; + case ClientMessage: + HandleClientMessageEvent((XClientMessageEvent *) &event); + break; default: break; } @@ -129,6 +142,9 @@ void SleepWhileUnmapped() case MapNotify: window_unmapped = FALSE; break; + case ClientMessage: + HandleClientMessageEvent((XClientMessageEvent *) &event); + break; default: break; } @@ -151,19 +167,26 @@ void HandleExposeEvent(XExposeEvent *event) SetDrawtoField(DRAW_BACKBUFFER); - for(xx=0;xx=x1 && xx<=x2 && yy>=y1 && yy<=y2) DrawScreenField(xx,yy); - DrawPlayerField(); + DrawAllPlayers(); SetDrawtoField(DRAW_DIRECT); } - if (soft_scrolling_on && game_status==PLAYING) + if (soft_scrolling_on && game_status == PLAYING) + { + 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); + XCopyArea(display,fieldbuffer,backbuffer,gc, - FX,FY, SXSIZE,SYSIZE, + fx,fy, SXSIZE,SYSIZE, SX,SY); + } XCopyArea(display,drawto,window,gc, x,y, width,height, x,y); @@ -218,6 +241,13 @@ void HandleFocusEvent(XFocusChangeEvent *event) } } +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; @@ -237,6 +267,29 @@ void HandleButton(int mx, int my, int button) HandleGameButtons(mx,my,button); } +#ifdef DEBUG + if (game_status == PLAYING && !button) + { + int sx = (mx - SX) / TILEX; + int sy = (my - SY) / TILEY; + + if (IN_SCR_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 + switch(game_status) { case MAINMENU: @@ -261,18 +314,13 @@ void HandleButton(int mx, int my, int button) HandleSetupScreen(mx,my,0,0,button); break; case PLAYING: - HandleGameActions(); + HandleGameActions(0); break; default: break; } } -int Gamespeed = 4; -int Movemethod = 1; -int Movespeed[2] = { 10, 4 }; -char *Movespeed_text[2] = { "asynchron", "syncron" }; - void HandleKey(KeySym key, int key_status) { int joy = 0; @@ -286,7 +334,9 @@ void HandleKey(KeySym key, int key_status) case XK_KP_Left: #endif case XK_KP_4: +#ifndef MSDOS case XK_J: +#endif case XK_j: joy |= JOY_LEFT; break; @@ -295,7 +345,9 @@ void HandleKey(KeySym key, int key_status) case XK_KP_Right: #endif case XK_KP_6: +#ifndef MSDOS case XK_K: +#endif case XK_k: joy |= JOY_RIGHT; break; @@ -304,7 +356,9 @@ void HandleKey(KeySym key, int key_status) case XK_KP_Up: #endif case XK_KP_8: +#ifndef MSDOS case XK_I: +#endif case XK_i: joy |= JOY_UP; break; @@ -313,7 +367,9 @@ void HandleKey(KeySym key, int key_status) case XK_KP_Down: #endif case XK_KP_2: +#ifndef MSDOS case XK_M: +#endif case XK_m: joy |= JOY_DOWN; break; @@ -341,35 +397,47 @@ void HandleKey(KeySym key, int key_status) 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; @@ -393,7 +461,7 @@ void HandleKey(KeySym key, int key_status) if (key_status == KEY_RELEASED) return; - if (key==XK_Return && game_status==PLAYING && GameOver) + if (key==XK_Return && game_status==PLAYING && AllPlayersGone) { CloseDoor(DOOR_CLOSE_1); game_status = MAINMENU; @@ -470,51 +538,56 @@ void HandleKey(KeySym key, int key_status) 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) + GameFrameDelay = 500; + else + GameFrameDelay = (key - XK_0) * 10; + printf("Game speed == %d%% (%d ms delay between two frames)\n", + GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay); 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 = 50; - 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; + local_player->dynamite = 1000; break; 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= tape.pos[tape.counter].delay) - { - PlayerMovDir = next_joy; - PlayerFrame = FrameCounter % 4; - PlayerPushing = TRUE; - } - } - } - } - - - /* - DrawPlayerField(); - */ - - + HandleGameActions(joy); break; - } + default: break; }