diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-gtk/mapview.c codeciv/client/gui-gtk/mapview.c --- freeciv/client/gui-gtk/mapview.c Sun Aug 5 17:33:07 2001 +++ codeciv/client/gui-gtk/mapview.c Sun Aug 5 19:41:56 2001 @@ -1647,17 +1647,19 @@ void put_nuke_mushroom_pixmaps(int x, int y) { if (is_isometric) { - /* Do I get points for style? */ - char boom[] = "Really Loud BOOM!!!"; - int w = gdk_string_width(city_productions_font, boom); int canvas_x, canvas_y; + struct Sprite *mysprite = sprites.explode.iso_nuke; + get_canvas_xy(x, y, &canvas_x, &canvas_y); - draw_shadowed_string(map_canvas->window, main_font, - toplevel->style->black_gc, - toplevel->style->white_gc, - canvas_x + NORMAL_TILE_WIDTH / 2 - w / 2, - canvas_y + NORMAL_TILE_HEIGHT, - boom); + canvas_x += NORMAL_TILE_WIDTH/2 - mysprite->width/2; + canvas_y += NORMAL_TILE_HEIGHT/2 - mysprite->height/2; + + pixmap_put_overlay_tile(map_canvas->window, canvas_x, canvas_y, + mysprite); + + gdk_flush(); + sleep(1); + update_map_canvas_visible(); } else { int x_itr, y_itr; diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/tilespec.c codeciv/client/tilespec.c --- freeciv/client/tilespec.c Sun Aug 5 17:33:07 2001 +++ codeciv/client/tilespec.c Sun Aug 5 19:26:56 2001 @@ -500,10 +500,14 @@ } } - for(i=0; i<3; i++) { - for(j=0; j<3; j++) { - my_snprintf(buffer, sizeof(buffer), "explode.nuke_%d%d", i, j); - SET_SPRITE(explode.nuke[i][j], buffer); + if (is_isometric) { + SET_SPRITE(explode.iso_nuke, "explode.iso_nuke"); + } else { + for(i=0; i<3; i++) { + for(j=0; j<3; j++) { + my_snprintf(buffer, sizeof(buffer), "explode.nuke_%d%d", i, j); + SET_SPRITE(explode.nuke[i][j], buffer); + } } } diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/tilespec.h codeciv/client/tilespec.h --- freeciv/client/tilespec.h Sun Aug 5 17:33:07 2001 +++ codeciv/client/tilespec.h Sun Aug 5 19:26:38 2001 @@ -105,6 +105,7 @@ struct { struct Sprite *nuke[3][3]; /* row, column, from top-left */ struct Sprite **unit; + struct Sprite *iso_nuke; } explode; struct { struct Sprite Binary files freeciv/data/.xvpics/nuke.xpm and codeciv/data/.xvpics/nuke.xpm differ diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/data/hires/nuke.spec codeciv/data/hires/nuke.spec --- freeciv/data/hires/nuke.spec Thu Jan 1 01:00:00 1970 +++ codeciv/data/hires/nuke.spec Sun Aug 5 18:29:46 2001 @@ -0,0 +1,26 @@ +[spec] + +; Format and options of this spec file: +options = "+spec2" + +[info] + +artists = " + Tatu Rissanen + Jeff Mallatt (miscellaneous) +" + +[file] +gfx = "hires/nuke" + +[grid_main] + +x_top_left = 0 +y_top_left = 0 +dx = 90 +dy = 88 +is_pixel_border = 0 + +tiles = { "row", "column", "tag" + 0, 0, "explode.iso_nuke" +} diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/data/hires/nuke.xpm codeciv/data/hires/nuke.xpm --- freeciv/data/hires/nuke.xpm Thu Jan 1 01:00:00 1970 +++ codeciv/data/hires/nuke.xpm Sun Aug 5 18:05:46 2001 @@ -0,0 +1,99 @@ +/* XPM */ +static char * nuke_xpm[] = { +"90 88 8 1", +" c None", +". c #242424", +"+ c #4A4A4A", +"@ c #A05F4A", +"# c #BFA076", +"$ c #FFB012", +"% c #EEEE12", +"& c #FFFFFF", +" ........ ", +" ...++@+@@@... ", +" ..++@#$$#$#+@... ...... ", +" .++##%%##@#@++... .....++++... ", +" ......+@#%%#$##@@@@++.....+++@@@@+@+... ", +" ...++++#$$#%%$#@@#++@@@+...+@@@@@@@@+@++.. ", +" ..+@@@+#$$@#%$%#@@@#@@@@@+..+@@++++++@++@+.. ", +" .+@$$###$#@@$%%%$##@$#@@+@++.+++@@@@@@@+@+++. ", +" .+@$%$##$#@##$%%%%$$#@@#@@++.++@###@@@@@@+@++.. ", +" ........+@$%$##$$##$%%%&%&%$$##@#@@++++##$@#@###@@++++. ", +" ...++++++++@$%%#@##$#$%%&%&&&&%%$#$@$@@+@@#@#$#$@$##@@@++. ", +" ..++@@@@+@+@+@#$$@#@$$$%%%&&&&%%&%%$#$#$@@@@$#$$$%$$@$#@@++.... ", +" ..++@@@#@@+@+@@##@#@##$%%%&&&&%%%%&%%$##$#@$@#$%%%%$%$$$@@@++..... ", +" .++@#@@@@@#@@@#@@#$$#@#%%&%&&%&&%%&%&%$%$#@$##$%$%%%&&%$$@+@+++..+.. ", +" ..+@#@+@###@#@#@##@#$$%%%%%%&%&%&&&&&%&%$%$#$#%$%%%%&&&&%%$@+++@++.++. ", +" ..+@#@++##$$##$$#@###$%%%%&%%%%%&&%&&&%&%%#$$$#$%$&%&&&&&%@@+@@+@+@++.+. ", +" ..@@@+@#$$%$$%%%$###$$%%%%&&$$%$%&&&&&&%&%%#$#$%$%%&&&&&%@+@@#@@+@@@@+.+. ", +" ..+@++$$$$%$%$%$%%$$%%%%%$###$$$%$%%&%&%&%%$###%%%%&&&&&%@+@##$#@@#$@@@+.+. ", +" ..++@$$%$%$%%%%$%$%%%%%$$######$$%$%$%%&%&%$$#$#%&%$$%%$@@#$#$#$#@@#$@@+++.. ", +" .++@@%$$%%%&&&%%%%%%%%$#$$#@@#@#$$%$%$$%$%%%$#$#@#@@##$@@#$$$$$%%@@@#@@@+.+. ", +" ..+@@#$%$%%&&%%&%&&%$#####@@##@#@#$$%%$%$%$%%%$&$$@#@@@@@@$%%$%%$%#@@##@@++.+. ", +" ..+@#$$%%%&&%&&%&&&%##@#@@##@####@$%%$%$%$%&&%&%&$$#@#@@@#$%%%$$%$@#@#$#@@++.. ", +" .+@#$#%$%&&&&%&&&&&$#@#@@#@##$$###@$&%%&%#%%%&%&&%$$#@@@#%%%%&%%%%#@#%#$$@+++. ", +" .+@##$$%%&&%%%%&%&$#@#@#@@##$$$$$#$&&&&&&$##$$%%&&%$%@#@@$%%&%&%%$#$%$%$#@@+.+. ", +" .+@#$#$%&&&%%&%&&%$##@@@@@$@@@$$$$$%&%%&$$#@##$$%&%%$#@##$%%&&%&##%#$%%$#@@++.. ", +" .+@@#$%%%&%%%%&%&%$#@#@@#$$@$$$%$%$%%%%$$%$#@#@##%&&%$#@@#$%&&&%%$$$%$$$$@++.+. ", +" ..+@@#$%&%%$%%&%&%%#@@@#@$%$$%%%%%%##%%%%%%#@@#@@#&&&%@##$$&%&&&$%%$$%%$#@@++.. ", +" ..++@$%$%%$%%&&&%&%$#@@$$$$%%&%%%%%%$#%%%%%$$#@@#$%&&%#@##$%&&&%%%$%$%#$$@@+.+. ", +" .+@@$$%%$$%%&&&&%%$@$$$%$%&%&%%%%&&&%$%%&&%$@@@@#%&&%####%&%&&%%$%$%%$$$@@++.. ", +" ..+#$%$%$#%&&&%&%%#@$$%$%$%&%&&%&&%&&%&&%&&%$@@@#$&&%#$#$%%&&%$%%%$%%#$#@@++.. ", +" ..@##$%$$$%&&%&%$#@$#%$%$%%&&&%&&&&&&&%&&&&%%#@@@$&&$%#$#%&&&%%&&$%%$$$#@++.+. ", +" ...@#$##$$#$&%%%#@@@@#$$%$@#$%&&&&&&&&&&&&&%&&%$@#@$&%%#$$%&&&%&&&&&$%%#$@+@++.. ", +" ..+@@$%$####$%%$#@#@#$$%%%#@@$%&%&&&&&&&&%%&&&%%%#@@#&%#$$%%&&%%%&&&$$$$$#@@++... ", +" ..+@#$%$$###$%%%##$$$%$$%&%@@#%%&&&&&&&&&&&%$%&&%$#@@@&%%#$#%&%%%%&&&##%$##@+@++. ", +" ..+#$$&%$$#@$%%$#$$%%%&&&%&$$%%&%&&&&&&&&&&&%#%&%%##@#&$$#@#$%%%%%%&#$$$@#@@@++.. ", +" ..+@#$%&%%$@$%%%$#%%%%&&%$&%%%&%&&&&&&&&&&&&&&$#%%%$@@$%$##@#%$%%&%&%$$$%#@@+@+.. ", +" ..+@#$&&&$@$%%%&#%&&%$%%$%&$%%%&%&%&&&&&&&&&&&%##%$%#@#%#$@@#$%&%%%%$$#@#@#@++.. ", +" ..+@$%&%#@@$%%&%#%&&&##%%&%#$&%%&%&&&&&&&&&&&&%$@$%$$#$%##@##$%&%%%$%#@#@#@++.+. ", +" ..+@$%%%$@##$&$$%$&&&$##%&%@#%&%&&&&&&&&&&&&&&%@@#%%%$%$#@@##$%%$$$$#@#$#@#@++.+. ", +" ..+@#$%%$#$#$%%#&&&$%#$&&&&$#@%%&&%&&&&&&&&&&&&&$@#%&$%%$#@@#$%$%$#$#$#$%$#@#@++.. ", +" ...@#$%$%$$$$&&$##%#$&%#%&%&%#@%&%&&&&&&&&&&&&&&&%##$&%%$#@@#$$%$$#$$%&&&%%$##@@++.. ", +" ..@##$$%$$#$%&&%#%&%#%&%&$%%&$#%%&&&&&&&&&&&&&&&&%#@$%$$@@##$$%$$%%$$%%&%&%$$##@@@+.. ", +" ..+##$%$%$%#$%&&%%&&&##%%&%%&%%$%&%&&&&&&&&&&&&&&&$#@$$$$##$$$%$%&&%$%%%&&%%%$$$#@@++.. ", +" ..+#$$$%&%#@#%&&%%%&%$#%&%%%%&&%&&&&&&&&&&&&&&&&&&#@@%%$$$$$%%%%%%&%%$%&%%&&%%%$$#@@++.. ", +" .+@#$%%&%$#@#%&&&%&&&#&&%%%%&%&%%%&&&&&&&&&&&&&&&%#$$%$%%%%$%$%%$%&%&%$%&&%&&&%%$$#@++.. ", +"..+@$%%%&&%#@#$&&&%%&%#$%%%%%&%%&%&&&&&&&&&&&&&&&&&$#%$%&%&%%%%%$%%%%%%%%&&&&%%%%$$#@@+...", +"..+$$%&&&%%#@#$%&&&%%#$&$&%%%%%&%&&%&&&&%&&&&&&&&&%$%&%&&&%&&%%%%$%$%%&&&%&%&&&%$%$#$@+...", +"..+@$&&&&&%#@@#%&&&$#$&&&$&%$%%%%%&&&%&&&&&&&&&&&&%%&&&&%&&&&%%%$%$%%%%%&&$##$$$%$$#$@+...", +"..+$$&&&&%%$#@#$%&&&$%%$$$$$%$%%%%%&&&&&&&&&%&&&&&&%&&&&&&&&&&%%%$%$%$%%&$$$#####$$%$@++..", +"..+@$&&&&%%&$@@#%&&&%%%$$%$$$&%%%%&&%&&&&&&&&&&&&&%&&&&&&&&&&&&%%$$%$%%%%##$#@@#$%%%$@+...", +"..+@$%&&%%&%$#@#$&&&&%$%%$$$&$$%&&%&&&&%&&&&&&&&&&&&&&&&&&&&&&%%%%%$%%$%%#$$#@@@#&&$#@++..", +"..++#%&%%%&&$#$#$%&&&&%%%%%%&%$&%%&%%&&&&&&&&&&&&&&&&&&&&&&&&&&%%%$$%$%%#$###@@#%&%##@++. ", +" .++#$%%%$%&%$###%&&&&$%%%%%%%%%&&%%&%&&&%&%&&&&&&&&&&&&&&&&&&&%%$#%$%%###@@##@#&%$#@++.. ", +" ..+@#$%$%$%&%%$$$%&%%&$$#%%%%%%%%$%%&&%%&&&&&&%&&&&&&&&&&&&%&%$$%%$%%%$##@@@@@$%$#@@++.. ", +" ..+@@$$%$$$%%$#$$%%%%%$#$#$%%%$$#&%%%%&%&%&%&&&&&&&&&&&&%&&%$$##$%%$%$%$##@@@@#@#@@++.. ", +" .++@#$$###$$$#%#$#$%%&#%%%$%$##&#&&%%%&%%&&&&&&%&&&&&&&&%$@###$%$$$$&%%$####@@@@@++.. ", +" ..++@##$####$%$%$$$#$%##$%#$$$$@$&&&%$$%&&%&%&&&&&%&%&&%$##@@$&%%%$$%&%$##$#@##@@@+.. ", +" ..++@###@####%%%%%#$$$$##@@##@#%%%%$#&%%%%%%&%&&&&&&%%#@@@#%&%%%$$$%%%$$$$$##$#@@++. ", +" ..+++@@@@#@##$%%#$$$%$$%%$@@@@$%%%#&&&%%%%%%&%&%&&%%$$@@$%&&&%%%$%%&$%%%%%##$$#@@++. ", +" ..++++++@####$%&%$#$%$%%%$@@#%$#@#$%%$%%%%%%&&&%%$$#@$%&$#%&&%$%$%&%%%&&%%%%$$#@++. ", +" ...+...+##$$%%%$$$%$$$%$@@$$$@@@@@#@%%%%%%%%&&&&&%@$&%$@%%%&&%$%$%$$%%&%&&%%$#@@+.. ", +" ....+@@$$%%%&%$%%%$%&%%%%&%$@@@#$%%%%%%%%&%&&%&&%$%$@@%&&%&&%%%$$%%&%&&&%%$@@@++. ", +" ..+@##$$%%&%&&&&$#$&&&&&&&&$$@#%%$#$%%%$%&&&&&$#@@@#$%&&&&%&%&$$$%%&&&&&%$@@++.+.", +" .++@#$%$%&%%%&$&##$%&&%&&&&&$$@$#@$%%%$$%%&%&%$##@@@@$%&%&&%&%%$%%&&&&&%%$@@@++..", +" .+@+##$%%&%&%&$&$#@$%%&&&&&&&&%$@@@%$%%%$%&%&%%%$@###$$%&&%%%$%$%&&&&&&%&%$#@@+.+.", +" .@@@@$$%&%%%&&&&&#@@$%%%&&&&&%&$$@%%%%%%##$%%#$%%#@@@$$$%%$%$%$#$%&&%&%&%%$@@@++..", +" .@@+@##$$&%%&&%&&&$#@#$%%%&&%%%$%$@%$%%%%%###@@@$&%$@$$$$%$$$$%###%&%&%%%%$$@@+@++.", +" .@@+@##$%%$%%%%%&&%@@@#$%%&%%%$#$$@#%%%%%&%#@@###$%$#%$$%%%$%&%$@#%%&%%&%%$##@@++..", +" .@++@@$$$%%$%%%&&%$@@@@$$%%%%#@#%$#$$%$%%%&%$$$$%%&%%&&&%%%%%%%%#@$%%%%%&%$#@@@+.. ", +" .@.@@#$$$$%$%$%%%%$#@@###%$$#@$%$$#%$$%$%%%&&&&&&&&&&&%&%%%%&&%%@#%%%&%&%%$#@+@++. ", +" .@.+@##$%$$$$%$$%$%$@@@#$$$#@@%%$#$$%$%%%%%&&&&&&&&&&%&%%%&&&%&$@@$%%%%%%$$#@@++.. ", +" .+++@#$$%%$%$$$%$$$$#@@@##$#@#%%$#$%$$%$%%%&%%%&%&&&%&%&%&%%&&%%@#%#$%%%$$##@++.. ", +" .+.++$#$$$%%%$%$$#$$#@@#$$#@##$$$$$%%%$%%$%%%%%%&&%&&%%%&%$%$%%$@@##$%$$$##@++.+. ", +" .+.++#$#$#$$%%$%$$$#@###$#@#@#@##$%%%%%$%%%&%%%%%&&%&%%%%$$$%%$$#@##$$$##@@++.+. ", +" ...+@##$$$$$$$$$$#@@#$$#@@@+@@#$%$%$%%%$%&%&&%%%%%%%$%$%$$%&%$#@@@#$##@@@++.+. ", +" .+.+@@$#$#$%%$%#$#@@###@+@@@@@#$$%$%&&%%&%$%%$%$%$%$%$%$%%&%%$#@+@@#@@@@++.+. ", +" ....+@#$#$#$$$$$##@@++++@@@+@@@#%$%&%&&&&%$%$$$$$$$$%$$%&&&%$$#@@+@@@@@+++.. ", +" ..+.+@###$$##$#@@@++...++@+@@@#$$%$%%&&%&%$$%$$#$$$$%$%&%%$$##@+++@+@++... ", +" ..++.+@####$$@@@@++......++.+@##%$%$%%%&%%%%$$#@#$#$$$$%$$$##@+++++++... ", +" ..+.+++@@@@@+@+++..... ..+.++@#$%$%$%&%%%%$$##@@#$#$#$$$##@@+++..+... ", +" ..+.++++++++++..... ..+.+@@$$%%%%%%%$$$##@+@##$#$###@@@+++.... ", +" ...+.+++++..... ..+.+@#$$%%$$$$$##@@+++@#####@@@@++.. ", +" .......... ...++@##$$$$$##@@@+++++@@@@@@@+++.. ", +" ...++@######@@@@++++++++++++++.... ", +" ...+++@@@@@@@++++...+++++++..... ", +" ...++++++++++................ ", +" ....+++++... ........ ", +" ....... "}; diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/data/hires.tilespec codeciv/data/hires.tilespec --- freeciv/data/hires.tilespec Sun Aug 5 17:32:59 2001 +++ codeciv/data/hires.tilespec Sun Aug 5 19:31:54 2001 @@ -15,6 +15,7 @@ normal_tile_height = 32 small_tile_width = 15 small_tile_height = 20 + is_isometric = 1 ; Font to use to draw city names: @@ -45,5 +46,5 @@ "misc/space.spec", "misc/treaty.spec", "hires/cities.spec", - "hires/icons.spec" - + "hires/icons.spec", + "hires/nuke.spec" Binary files freeciv/data/palettes.tar.gz and codeciv/data/palettes.tar.gz differ