X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=53290c195d93d05deb93c5ba8f24387e6cedbddc;hb=4b0f1eb4220d2dbe4cffb288f745661b32c96a5b;hp=fe7f0e5cdb8375626d60258ab799893705b83fea;hpb=aaef409525599bb87a6dc8c099fbc0e11a455bae;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index fe7f0e5c..53290c19 100644 --- a/src/tools.c +++ b/src/tools.c @@ -27,6 +27,10 @@ #include +#ifdef MSDOS +extern BOOL wait_for_vsync; +#endif + void SetDrawtoField(int mode) { if (mode == DRAW_BUFFERED && soft_scrolling_on) @@ -68,7 +72,7 @@ void BackToFront() if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) redraw_mask |= REDRAW_FIELD; - if (redraw_mask & REDRAW_FIELD) + if (redraw_mask & REDRAW_FIELD || ScreenMovPos) redraw_mask &= ~REDRAW_TILES; if (!redraw_mask) @@ -84,6 +88,9 @@ void BackToFront() if (redraw_mask & REDRAW_FIELD) { +#ifdef MSDOS + wait_for_vsync = TRUE; +#endif if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER) XCopyArea(display,backbuffer,window,gc, REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, @@ -101,12 +108,24 @@ void BackToFront() XCopyArea(display,buffer,window,gc, fx,fy, SXSIZE,SYSIZE, SX,SY); + + + +#if 0 + printf("FULL SCREEN REDRAW [%d]\n", ScreenMovPos); +#endif + + + } redraw_mask &= ~REDRAW_MAIN; } if (redraw_mask & REDRAW_DOORS) { +#ifdef MSDOS + wait_for_vsync = TRUE; +#endif if (redraw_mask & REDRAW_DOOR_1) XCopyArea(display,backbuffer,window,gc, DX,DY, DXSIZE,DYSIZE, @@ -393,12 +412,12 @@ void DrawPlayerField() graphic += PlayerFrame; - if (PlayerMovPos) + if (PlayerGfxPos) { if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT) - sxx = PlayerMovPos; + sxx = PlayerGfxPos; else - syy = PlayerMovPos; + syy = PlayerGfxPos; } @@ -407,6 +426,9 @@ void DrawPlayerField() + + + if (draw_thru_mask) DrawGraphicShiftedThruMask(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING); /* @@ -420,7 +442,11 @@ void DrawPlayerField() - if (PlayerPushing && PlayerMovPos) + MarkTileDirty(sx,sy); + + + + if (PlayerPushing && PlayerGfxPos) { int nextJX = JX + (JX - lastJX); int nextJY = JY + (JY - lastJY); @@ -438,12 +464,19 @@ void DrawPlayerField() if (element == EL_FELSBROCKEN && sxx) { - int phase = PlayerMovPos / (TILEX/4); + int phase = (PlayerGfxPos / (TILEX/4)); if (PlayerMovDir == MV_LEFT) graphic += phase; else - graphic += phase+4; + graphic += (phase+4)%4; + + + /* + printf("----> (%d, %d, %d)\n", + PlayerGfxPos, phase, graphic); + */ + } DrawGraphicShifted(px,py, sxx,syy, graphic, CUT_NO_CUTTING); @@ -460,12 +493,12 @@ void DrawPlayerField() if (element == EL_DYNAMIT) { - if ((phase = (48-MovDelay[x][y])/6) > 6) + if ((phase = (96-MovDelay[x][y])/12) > 6) phase = 6; } else { - if ((phase = ((48-MovDelay[x][y])/3) % 8) > 3) + if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3) phase = 7-phase; } @@ -506,6 +539,9 @@ static int getGraphicAnimationPhase(int frames, int delay, int mode) else phase = (FrameCounter % (delay * frames)) / delay; + if (mode == ANIM_REVERSE) + phase = -phase; + return(phase); } @@ -514,19 +550,6 @@ void DrawGraphicAnimation(int x, int y, int graphic, { int phase = getGraphicAnimationPhase(frames, delay, mode); -/* - int phase; - - if (mode == ANIM_OSCILLATE) - { - int max_anim_frames = frames*2 - 2; - phase = (FrameCounter % (delay * max_anim_frames)) / delay; - phase = (phase < frames ? phase : max_anim_frames - phase); - } - else - phase = (FrameCounter % (delay * frames)) / delay; -*/ - if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y))) DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase); } @@ -544,9 +567,7 @@ void DrawGraphic(int x, int y, int graphic) #endif DrawGraphicExt(drawto_field, gc, x, y, graphic); - redraw_tiles++; - redraw[redraw_x1 + x][redraw_y1 + y] = TRUE; - redraw_mask |= REDRAW_TILES; + MarkTileDirty(x,y); } void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic) @@ -628,9 +649,7 @@ void DrawGraphicThruMask(int x, int y, int graphic) return; } - redraw_tiles++; - redraw[redraw_x1 + x][redraw_y1 + y]=TRUE; - redraw_mask|=REDRAW_TILES; + MarkTileDirty(x,y); } void DrawElementThruMask(int x, int y, int element) @@ -641,9 +660,7 @@ void DrawElementThruMask(int x, int y, int element) void DrawMiniGraphic(int x, int y, int graphic) { DrawMiniGraphicExt(drawto, gc, x, y, graphic); - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; + MarkTileDirty(x/2, y/2); } void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic) @@ -709,7 +726,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode) else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */ width -= dx; else if (dx) /* allg. Bewegung in x-Richtung */ - redraw[redraw_x1 + x + SIGN(dx)][redraw_y1 + y] = TRUE; + MarkTileDirty(x + SIGN(dx), y); if (y < BY1) /* Element kommt von oben ins Bild */ { @@ -741,12 +758,12 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode) height = dy; cy = TILEY-dy; dy = TILEY; - redraw[redraw_x1 + x][redraw_y1 + y + 1] = TRUE; + MarkTileDirty(x, y + 1); } /* Element verläßt unten das Bild */ else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW)) height -= dy; else if (dy) /* allg. Bewegung in y-Richtung */ - redraw[redraw_x1 + x][redraw_y1 + y + SIGN(dy)] = TRUE; + MarkTileDirty(x, y + SIGN(dy)); } if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) @@ -775,9 +792,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode) } #endif - redraw_tiles++; - redraw[redraw_x1 + x][redraw_y1 + y] = TRUE; - redraw_mask |= REDRAW_TILES; + MarkTileDirty(x,y); } void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode) @@ -903,7 +918,7 @@ void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic, else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */ width -= dx; else if (dx) /* allg. Bewegung in x-Richtung */ - redraw[redraw_x1 + x + SIGN(dx)][redraw_y1 + y] = TRUE; + MarkTileDirty(x + SIGN(dx), y); if (y < BY1) /* Element kommt von oben ins Bild */ { @@ -935,12 +950,12 @@ void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic, height = dy; cy = TILEY-dy; dy = TILEY; - redraw[redraw_x1 + x][redraw_y1 + y + 1] = TRUE; + MarkTileDirty(x, y + 1); } /* Element verläßt unten das Bild */ else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW)) height -= dy; else if (dy) /* allg. Bewegung in y-Richtung */ - redraw[redraw_x1 + x][redraw_y1 + y + SIGN(dy)] = TRUE; + MarkTileDirty(x, y + SIGN(dy)); } if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) @@ -978,9 +993,7 @@ void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic, } #endif - redraw_tiles++; - redraw[redraw_x1 + x][redraw_y1 + y] = TRUE; - redraw_mask |= REDRAW_TILES; + MarkTileDirty(x,y); } void ErdreichAnbroeckeln(int x, int y) @@ -1048,8 +1061,7 @@ void ErdreichAnbroeckeln(int x, int y) width,height, FX+x*TILEX+cx,FY+y*TILEY+cy); } - redraw_tiles++; - redraw[redraw_x1 + x][redraw_y1 + y] = TRUE; + MarkTileDirty(x,y); } else { @@ -1093,8 +1105,7 @@ void ErdreichAnbroeckeln(int x, int y) SY+(graphic / GFX_PER_LINE)*TILEY+cy, width,height, FX+xx*TILEX+cx,FY+yy*TILEY+cy); - redraw_tiles++; - redraw[redraw_x1 + xx][redraw_y1 + yy] = TRUE; + MarkTileDirty(xx,yy); } } } @@ -1216,10 +1227,6 @@ void DrawMiniElement(int x, int y, int element) graphic = el2gfx(element); DrawMiniGraphic(x,y,graphic); - - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; } void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y) @@ -1472,6 +1479,9 @@ BOOL AreYouSure(char *text, unsigned int ays_state) case FocusOut: HandleFocusEvent((XFocusChangeEvent *) &event); break; + case ClientMessage: + HandleClientMessageEvent((XClientMessageEvent *) &event); + break; default: break; } @@ -1556,6 +1566,10 @@ unsigned int MoveDoor(unsigned int door_state) static unsigned int door2 = DOOR_CLOSE_2; int x, start, stepsize = 4, door_anim_delay = stepsize*5000; +#ifdef MSDOS + stepsize = 2; +#endif + if (door_state == DOOR_GET_STATE) return(door1 | door2); @@ -1659,7 +1673,9 @@ unsigned int MoveDoor(unsigned int door_state) } BackToFront(); +#ifndef MSDOS Delay(door_anim_delay); +#endif if (game_status==MAINMENU) DoAnimation();