OpenWrt packages
Sign in or create your account | Project List | Help
OpenWrt packages Git Source Tree
Root/
| 1 | This is from alex4src_data.zip directory 'extras' |
| 2 | Index: alex4src/src/main.c |
| 3 | =================================================================== |
| 4 | --- alex4src.orig/src/main.c 2003-07-26 12:53:52.000000000 +0200 |
| 5 | +++ alex4src/src/main.c 2011-06-06 22:51:43.000000000 +0200 |
| 6 | @@ -840,6 +840,7 @@ |
| 7 | i = DIGI_AUTODETECT; |
| 8 | log2file(" DIGI_AUTODETECT selected (%d)", i); |
| 9 | break; |
| 10 | +#ifdef ALLEGRO_WINDOWS |
| 11 | case 2: |
| 12 | i = DIGI_DIRECTX(0); |
| 13 | log2file(" DIGI_DIRECTX(0) selected (%d)", i); |
| 14 | @@ -848,6 +849,20 @@ |
| 15 | i = DIGI_DIRECTAMX(0); |
| 16 | log2file(" DIGI_DIRECTAMX(0) selected (%d)", i); |
| 17 | break; |
| 18 | +#elif defined ALLEGRO_UNIX |
| 19 | +#ifdef DIGI_OSS |
| 20 | + case 2: |
| 21 | + i = DIGI_OSS; |
| 22 | + log2file(" DIGI_OSS selected (%d)", i); |
| 23 | + break; |
| 24 | +#endif |
| 25 | +#ifdef DIGI_ALSA |
| 26 | + case 3: |
| 27 | + i = DIGI_ALSA; |
| 28 | + log2file(" DIGI_ALSA selected (%d)", i); |
| 29 | + break; |
| 30 | +#endif |
| 31 | +#endif |
| 32 | default: |
| 33 | i = -770405; // dummy number |
| 34 | got_sound = 0; |
| 35 | Index: alex4src/src/main.h |
| 36 | =================================================================== |
| 37 | --- alex4src.orig/src/main.h 2003-07-26 12:53:52.000000000 +0200 |
| 38 | +++ alex4src/src/main.h 2011-06-06 22:51:43.000000000 +0200 |
| 39 | @@ -90,8 +90,7 @@ |
| 40 | |
| 41 | |
| 42 | // a little bounding box quickie |
| 43 | -#define check_bb_collision(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || \ |
| 44 | - ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) )) |
| 45 | +#define check_bb_collision(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) )) |
| 46 | |
| 47 | |
| 48 | #endif |
| 49 | \ No newline at end of file |
| 50 | Index: alex4src/src/shooter.c |
| 51 | =================================================================== |
| 52 | --- alex4src.orig/src/shooter.c 2003-07-26 12:53:52.000000000 +0200 |
| 53 | +++ alex4src/src/shooter.c 2011-06-06 22:51:43.000000000 +0200 |
| 54 | @@ -239,8 +239,7 @@ |
| 55 | |
| 56 | // PIXEL PERFECT COLLISION ROUTINES COURTESY OF IVAN BALDO'S PPCOL |
| 57 | |
| 58 | -#define pp_check_bb_collision_general(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || \ |
| 59 | - ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) )) |
| 60 | +#define pp_check_bb_collision_general(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) )) |
| 61 | #define pp_check_bb_collision(mask1,mask2,x1,y1,x2,y2) pp_check_bb_collision_general(x1,y1,mask1->w,mask1->h,x2,y2,mask2->w,mask2->h) |
| 62 | |
| 63 | int s_check_pp_collision(BITMAP *spr1, BITMAP *spr2, int x1, int y1, int x2, int y2) { |
| 64 |
