(f)) {} /*explicit*/ fixed_point(double f) : intValue(float2fix
((float)f)) {} #if __WORDSIZE != 64 - /*explicit*/ fixed_point(long int l) : intValue(((int64_t)l) << p) {} + /*explicit*/ fixed_point(unsigned long l) : intValue(((int64_t)l) << p) {} + /*explicit*/ fixed_point(long l) : intValue(((int64_t)l) << p) {} #endif /*explicit*/ fixed_point(unsigned int l) : intValue(((int64_t)l) << p) {} #ifdef SIZE_T_FIXEDPOINT_METHODS @ 1.5 log @Fix build on i386. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2010/07/26 10:01:45 adam Exp $ @ 1.4 log @Changes 0.9.2.1: * Fix build on 64 bits system Changes 0.9.2: * The rope of grapple no longer gets stuck in ground. * Network games between specific computers which didn't work properly before should work now. * A bug has been fixed which prevented the bugzilla team to have more then three players. * Poisoned characters die now when they have to less health. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -64,7 +64,7 @@@@ struct fixed_point { d11 1 @ 1.3 log @Changes 0.8.1: - Game mode editor for local game (allows you to choose some game options) - Team editor for local game (allows you to personalize characters names) - Better menus: tabs, basic keyboard control, more options,... - All characters redrawn: better graphisms, new positions, new clothes,... - 2 new skins: Pidgin and Suse - New maps: Lonely island and oktopus - New waters: add lava, dirty water,... - Better minimap - New weapon: slap - Some sounds added (thanks a lot to wesnoth project) - A lot of bug fixes - A lot of improvements (code and graphism) - Translations updates @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2008/06/02 16:57:37 drochner Exp $ d3 11 a13 65 --- src/map/tileitem.cpp.orig 2008-05-16 00:47:34.000000000 +0200 +++ src/map/tileitem.cpp @@@@ -136,40 +136,42 @@@@ void TileItem_AlphaSoftware::Dig(const P buf += y * line_size; //Empties each line of the tile horizontaly that are in the circle - while ( (uint) y <= center.y + radius + EXPLOSION_BORDER_SIZE&& y < CELL_SIZE.y ) + for (; (uint)y <= center.y + radius + EXPLOSION_BORDER_SIZE && y < CELL_SIZE.y; + buf += line_size, y++) { //Abscisse distance from the center of the circle to the circle int dac = center.y - y; - //Angle on the circle - float angle = asin( (float)dac / (float)radius); + //Darken the border of the removed ground + int bstart_x, bend_x, blenght; + blenght = lrint(sqrt((radius + EXPLOSION_BORDER_SIZE) * (radius + EXPLOSION_BORDER_SIZE) + - dac * dac)); + + if ((uint)abs(dac) > radius) { + bstart_x = center.x - blenght; + bend_x = center.x + blenght; + Darken(bstart_x, bend_x, buf, bpp); + continue; + } //Zone of the line which needs to be emptied - int start_x, end_x, lenght; - lenght = (int) ((float) radius * cos (angle)); - lenght = lenght > 0 ? lenght : - lenght; - start_x = center.x - lenght; - lenght *= 2; - end_x = start_x + lenght; - Empty(start_x, end_x, buf, bpp); + int lenght; + lenght = lrint(sqrt(radius * radius - dac * dac)); - //Darken the border of the removed ground // Left half of the circle - int bstart_x, bend_x, blenght; - angle = asin( (float)dac / (float)(radius + EXPLOSION_BORDER_SIZE)); - blenght = (int) ((float) (radius + EXPLOSION_BORDER_SIZE) * cos (angle)); - blenght = blenght > 0 ? blenght : - blenght; bstart_x = center.x - blenght; - bend_x = bstart_x + (blenght - lenght/2); + bend_x = center.x - lenght; Darken(bstart_x, bend_x, buf, bpp); // Right half of the circle - bstart_x = center.x + lenght/2 + 1; - bend_x = bstart_x + (blenght - lenght/2); + bstart_x = center.x + lenght; + bend_x = center.x + blenght; Darken(bstart_x, bend_x, buf, bpp); - buf += line_size; - y++; + int start_x, end_x; + start_x = center.x - lenght; + end_x = center.x + lenght; + Empty(start_x, end_x, buf, bpp); } } @ 1.2 log @update to 0.8 changes: * Network game (port 3826 is registred by IANA for Wormux) * A lot of bug fixes (memory leaks, useless code deleted ...) * 15 new maps * New weapons: Flamethrower, Football bomb, Cluzooka * Minimap preview * Camera improvements * Better use of anti-aliasing * Water/lava particles added * Various graphical improvements * Sound cache: no more lag on explosion * More sounds and musics * Better characters: Better positions, characters' eyes follow cursor,... * Weapons tweaking * Smaller step in angle selection when pressing Shift * Menus compatible with smallest resolutions * Help section added (menu explaining shortkeys and howtoplay.pdf documentation provided) * Language selection * "Looking for updates" option * Volume control option * Joystick support * Improve collision detection, cursor,... * User dir as XDG recommandation (Freedesktop) * Initial management of command line options * Experimental random map generator and skin viewer * AI improvements (still stupid so still hidden feature) pkgsrc note: rewrote the patch which fixes some broken/nonportable geometry calculations, explosion craters look much nicer now @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- src/map/tileitem.cpp.orig 2007-01-28 15:03:48.000000000 +0100 d5 7 a11 2 @@@@ -125,15 +125,15 @@@@ void TileItem_AlphaSoftware::Dig(const P while ( (uint) y <= center.y + radius + EXPLOSION_BORDER_SIZE&& y < CELL_SIZE.y ) d14 1 a14 2 - int dac = center.y - y; + int dac = y - center.y; d16 1 a16 1 //Angle on the circle d18 11 a28 1 + float angle = asin( (float)dac / (float)(radius + EXPLOSION_BORDER_SIZE)); d31 2 a32 2 int start_x, end_x, lenght; lenght = (int) ((float) radius * cos (angle)); d34 12 a45 8 +// lenght = lenght > 0 ? lenght : - lenght; start_x = center.x - lenght; lenght *= 2; end_x = start_x + lenght; @@@@ -144,7 +144,7 @@@@ void TileItem_AlphaSoftware::Dig(const P int bstart_x, bend_x, blenght; angle = asin( (float)dac / (float)(radius + EXPLOSION_BORDER_SIZE)); blenght = (int) ((float) (radius + EXPLOSION_BORDER_SIZE) * cos (angle)); a46 1 +// blenght = blenght > 0 ? blenght : - blenght; d48 9 a56 1 bend_x = bstart_x + (blenght - lenght/2); d58 10 @ 1.1.1.1 log @import wormux-0.7.9, another silly battle game @ text @@