X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.c;h=253a8d7fcee20e336a05b27b9b68843987a34c32;hb=b2a0ff1ddd4430110b331129469dabb8ea7b6ba7;hp=a066cff5dcfa5cbdc26c0db36158551e3463b3bd;hpb=d0893e6987c21c25ec137438a18cfe1288362139;p=rocksndiamonds.git diff --git a/src/misc.c b/src/misc.c index a066cff5..253a8d7f 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,22 +1,16 @@ /*********************************************************** * 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 * *----------------------------------------------------------* * misc.c * -* * -* Letzte Aenderung: 15.06.1995 * ***********************************************************/ -#include "misc.h" -#include "tools.h" -#include "sound.h" #include #include #include @@ -24,353 +18,172 @@ #include #include -void microsleep(unsigned long usec) +#include "misc.h" +#include "tools.h" +#include "sound.h" +#include "random.h" + +static unsigned long mainCounter(int mode) { - struct timeval delay; + static struct timeval base_time = { 0, 0 }; + struct timeval current_time; + unsigned long counter_ms; - delay.tv_sec = usec / 1000000; - delay.tv_usec = usec % 1000000; + gettimeofday(¤t_time, NULL); - if (select(0,NULL,NULL,NULL,&delay)!=0) - fprintf(stderr,"%s: in function microsleep: select failed!\n", - progname); -} + if (mode == INIT_COUNTER || current_time.tv_sec < base_time.tv_sec) + base_time = current_time; -unsigned long be2long(unsigned long *be) /* big-endian -> longword */ -{ - unsigned char *ptr = (unsigned char *)be; + counter_ms = (current_time.tv_sec - base_time.tv_sec) * 1000 + + (current_time.tv_usec - base_time.tv_usec) / 1000; - return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]); + return counter_ms; /* return milliseconds since last init */ } -char *int2str(int ct, int nr) +void InitCounter() /* set counter back to zero */ { - static char str[20]; - - sprintf(str,"%09d",ct); - return(&str[strlen(str)-nr]); + mainCounter(INIT_COUNTER); } -unsigned int RND(unsigned int max) +unsigned long Counter() /* get milliseconds since last call of InitCounter() */ { - return(rand() % max); + return(mainCounter(READ_COUNTER)); } -unsigned int InitRND(long seed) +static void sleep_milliseconds(unsigned long milliseconds_delay) { - struct timeval current_time; - - if (seed==NEW_RANDOMIZE) + if (milliseconds_delay < 5) { - gettimeofday(¤t_time,NULL); - srand((unsigned int) current_time.tv_usec); - return((unsigned int) current_time.tv_usec); + /* we want to wait only a few ms -- if we assume that we have a + kernel timer resolution of 10 ms, we would wait far to long; + therefore it's better to do a short interval of busy waiting + to get our sleeping time more accurate */ + + unsigned long base_counter = Counter(), actual_counter = Counter(); + + while (actual_counter < base_counter + milliseconds_delay && + actual_counter >= base_counter) + actual_counter = Counter(); } else { - srand((unsigned int) seed); - return((unsigned int) seed); - } -} + struct timeval delay; -char *GetLoginName() -{ - struct passwd *pwd; + delay.tv_sec = milliseconds_delay / 1000; + delay.tv_usec = 1000 * (milliseconds_delay % 1000); - if (!(pwd=getpwuid(getuid()))) - return("ANONYMOUS"); - else - return(pwd->pw_name); + if (select(0, NULL, NULL, NULL, &delay) != 0) + fprintf(stderr,"%s: in function sleep_milliseconds: select() failed!\n", + progname); + } } -static struct AnimInfo toon[NUM_TOONS] = -{ - DWARF_XSIZE, DWARF_YSIZE, - DWARF_X, DWARF_Y, - DWARF_FRAMES, - DWARF_FPS, - DWARF_STEPSIZE, - FALSE, - ANIMDIR_RIGHT, - ANIMPOS_DOWN, - - DWARF_XSIZE, DWARF_YSIZE, - DWARF_X, DWARF2_Y, - DWARF_FRAMES, - DWARF_FPS, - DWARF_STEPSIZE, - FALSE, - ANIMDIR_LEFT, - ANIMPOS_DOWN, - - JUMPER_XSIZE, JUMPER_YSIZE, - JUMPER_X, JUMPER_Y, - JUMPER_FRAMES, - JUMPER_FPS, - JUMPER_STEPSIZE, - FALSE, - ANIMDIR_LEFT, - ANIMPOS_DOWN, - - CLOWN_XSIZE, CLOWN_YSIZE, - CLOWN_X, CLOWN_Y, - CLOWN_FRAMES, - CLOWN_FPS, - CLOWN_STEPSIZE, - FALSE, - ANIMDIR_UP, - ANIMPOS_ANY, - - BIRD_XSIZE, BIRD_YSIZE, - BIRD1_X, BIRD1_Y, - BIRD_FRAMES, - BIRD_FPS, - BIRD_STEPSIZE, - TRUE, - ANIMDIR_RIGHT, - ANIMPOS_UPPER, - - BIRD_XSIZE, BIRD_YSIZE, - BIRD2_X, BIRD2_Y, - BIRD_FRAMES, - BIRD_FPS, - BIRD_STEPSIZE, - TRUE, - ANIMDIR_LEFT, - ANIMPOS_UPPER -}; - -void InitAnimation() +void Delay(unsigned long delay) /* Sleep specified number of milliseconds */ { - HandleAnimation(ANIM_START); + sleep_milliseconds(delay); } -void StopAnimation() +BOOL FrameReached(unsigned long *frame_counter_var, unsigned long frame_delay) { - HandleAnimation(ANIM_STOP); + unsigned long actual_frame_counter = FrameCounter; + + if (actual_frame_counter < *frame_counter_var+frame_delay && + actual_frame_counter >= *frame_counter_var) + return(FALSE); + + *frame_counter_var = actual_frame_counter; + return(TRUE); } -void DoAnimation() +BOOL DelayReached(unsigned long *counter_var, unsigned long delay) { - HandleAnimation(ANIM_CONTINUE); + unsigned long actual_counter = Counter(); + + if (actual_counter < *counter_var + delay && + actual_counter >= *counter_var) + return(FALSE); + + *counter_var = actual_counter; + return(TRUE); } -void HandleAnimation(int mode) +void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay) { - static long animstart_delay = -1; - static long animstart_delay_value = 0; - static BOOL anim_restart = TRUE; - static BOOL reset_delay = TRUE; - static int toon_nr = 0; + unsigned long actual_counter; - if (!toons_on || game_status==PLAYING) - return; - - switch(mode) + while(1) { - case ANIM_START: - anim_restart = TRUE; - reset_delay = TRUE; - return; - break; - case ANIM_CONTINUE: - break; - case ANIM_STOP: - redraw_mask |= REDRAW_FIELD; - BackToFront(); - return; - break; - default: - break; - } + actual_counter = Counter(); - if (reset_delay) - { - animstart_delay = Counter(); - animstart_delay_value = RND(500); - reset_delay = FALSE; + if (actual_counter < *counter_var + delay && + actual_counter >= *counter_var) + sleep_milliseconds((*counter_var + delay - actual_counter) / 2); + else + break; } - if (anim_restart) - { - if (!DelayReached(&animstart_delay,animstart_delay_value)) - return; + *counter_var = actual_counter; +} - toon_nr = RND(NUM_TOONS); - } +char *int2str(int ct, int nr) +{ + static char str[20]; - anim_restart = reset_delay = AnimateToon(toon_nr,anim_restart); + sprintf(str,"%09d",ct); + return(&str[strlen(str)-nr]); } -BOOL AnimateToon(int toon_nr, BOOL restart) +unsigned int SimpleRND(unsigned int max) { - static pos_x = 0, pos_y = 0; - static delta_x = 0, delta_y = 0; - static int frame = 0, frame_step = 1; - static BOOL horiz_move, vert_move; - static long anim_delay = 0; - static int anim_delay_value = 0; - struct AnimInfo *anim = &toon[toon_nr]; - static int width,height; - static int pad_x,pad_y; - static int cut_x,cut_y; - static int src_x, src_y; - static int dest_x, dest_y; - - if (restart) - { - horiz_move = (anim->direction & (ANIMDIR_LEFT | ANIMDIR_RIGHT)); - vert_move = (anim->direction & (ANIMDIR_UP | ANIMDIR_DOWN)); - anim_delay_value = 100/anim->frames_per_second; - frame = 0; - - if (horiz_move) - { - if (anim->position==ANIMPOS_UP) - pos_y = 0; - else if (anim->position==ANIMPOS_DOWN) - pos_y = FULL_SYSIZE-anim->height; - else if (anim->position==ANIMPOS_UPPER) - pos_y = RND((FULL_SYSIZE-anim->height)/2); - else - pos_y = RND(FULL_SYSIZE-anim->height); - - if (anim->direction==ANIMDIR_RIGHT) - { - delta_x = anim->stepsize; - pos_x = -anim->width+delta_x; - } - else - { - delta_x = -anim->stepsize; - pos_x = FULL_SXSIZE+delta_x; - } - delta_y = 0; - } - else - { - if (anim->position==ANIMPOS_LEFT) - pos_x = 0; - else if (anim->position==ANIMPOS_RIGHT) - pos_x = FULL_SXSIZE-anim->width; - else - pos_x = RND(FULL_SXSIZE-anim->width); - - if (anim->direction==ANIMDIR_DOWN) - { - delta_y = anim->stepsize; - pos_y = -anim->height+delta_y; - } - else - { - delta_y = -anim->stepsize; - pos_y = FULL_SYSIZE+delta_y; - } - delta_x = 0; - } - } + static unsigned long root = 654321; + struct timeval current_time; - if (pos_x <= -anim->width - anim->stepsize || - pos_x >= FULL_SXSIZE + anim->stepsize || - pos_y <= -anim->height - anim->stepsize || - pos_y >= FULL_SYSIZE + anim->stepsize) - return(TRUE); + gettimeofday(¤t_time,NULL); + root = root * 4253261 + current_time.tv_sec + current_time.tv_usec; + return(root % max); +} - if (!DelayReached(&anim_delay,anim_delay_value)) - { - if (game_status==HELPSCREEN && !restart) - DrawAnim(src_x+cut_x,src_y+cut_y, width,height, - REAL_SX+dest_x,REAL_SY+dest_y, pad_x,pad_y); +unsigned int RND(unsigned int max) +{ + return(random_linux_libc() % max); +} - return(FALSE); - } +unsigned int InitRND(long seed) +{ + struct timeval current_time; - if (pos_x<-anim->width) - pos_x = -anim->width; - else if (pos_x>FULL_SXSIZE) - pos_x = FULL_SXSIZE; - if (pos_y<-anim->height) - pos_y = -anim->height; - else if (pos_y>FULL_SYSIZE) - pos_y = FULL_SYSIZE; - - pad_x = (horiz_move ? anim->stepsize : 0); - pad_y = (vert_move ? anim->stepsize : 0); - src_x = anim->src_x + frame * anim->width; - src_y = anim->src_y; - dest_x = pos_x; - dest_y = pos_y; - cut_x = cut_y = 0; - width = anim->width; - height = anim->height; - - if (pos_x<0) + if (seed==NEW_RANDOMIZE) { - dest_x = 0; - width += pos_x; - cut_x = -pos_x; + gettimeofday(¤t_time,NULL); + srandom_linux_libc((unsigned int) current_time.tv_usec); + return((unsigned int) current_time.tv_usec); } - else if (pos_x>FULL_SXSIZE-anim->width) - width -= (pos_x - (FULL_SXSIZE-anim->width)); - - if (pos_y<0) + else { - dest_y = 0; - height += pos_y; - cut_y = -pos_y; + srandom_linux_libc((unsigned int) seed); + return((unsigned int) seed); } - else if (pos_y>FULL_SYSIZE-anim->height) - height -= (pos_y - (FULL_SYSIZE-anim->height)); - - DrawAnim(src_x+cut_x,src_y+cut_y, width,height, - REAL_SX+dest_x,REAL_SY+dest_y, pad_x,pad_y); - - pos_x += delta_x; - pos_y += delta_y; - frame += frame_step; +} - if (frame<0 || frame>=anim->frames) - { - if (anim->pingpong) - { - frame_step *= -1; - frame = (frame<0 ? 1 : anim->frames-2); - } - else - frame = (frame<0 ? anim->frames-1 : 0); - } +char *GetLoginName() +{ + struct passwd *pwd; - return(FALSE); + if (!(pwd=getpwuid(getuid()))) + return("ANONYMOUS"); + else + return(pwd->pw_name); } -void DrawAnim(int src_x, int src_y, int width, int height, - int dest_x, int dest_y, int pad_x, int pad_y) +void MarkTileDirty(int x, int y) { - int buf_x = DOOR_GFX_PAGEX3, buf_y = DOOR_GFX_PAGEY1; - - XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc,dest_x-pad_x,dest_y-pad_y, - width+2*pad_x,height+2*pad_y, buf_x,buf_y); - XSetClipOrigin(display,clip_gc[PIX_TOONS],dest_x-src_x,dest_y-src_y); - XCopyArea(display,pix[PIX_TOONS],backbuffer,clip_gc[PIX_TOONS], - src_x,src_y, width,height, dest_x,dest_y); - XCopyArea(display,backbuffer,window,gc, dest_x-pad_x,dest_y-pad_y, - width+2*pad_x,height+2*pad_y, dest_x-pad_x,dest_y-pad_y); - - BackToFront(); - - XCopyArea(display,pix[PIX_DB_DOOR],backbuffer,gc, buf_x,buf_y, - width+2*pad_x,height+2*pad_y, dest_x-pad_x,dest_y-pad_y); - -/* - XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc,dest_x-pad_x,dest_y-pad_y, - width+2*pad_x,height+2*pad_y, buf_x,buf_y); - XSetClipOrigin(display,clip_gc[PIX_TOONS], - buf_x-src_x+pad_x,buf_y-src_y+pad_y); - XCopyArea(display,pix[PIX_TOONS],pix[PIX_DB_DOOR],clip_gc[PIX_TOONS], - src_x,src_y, width,height, buf_x+pad_x,buf_y+pad_y); - XCopyArea(display,pix[PIX_DB_DOOR],window,gc, buf_x,buf_y, - width+2*pad_x,height+2*pad_y, dest_x-pad_x,dest_y-pad_y); -*/ - - XFlush(display); + int xx = redraw_x1 + x; + int yy = redraw_y1 + y; + + if (!redraw[xx][yy]) + { + redraw[xx][yy] = TRUE; + redraw_tiles++; + redraw_mask |= REDRAW_TILES; + } }