diff --git a/powder.c b/powder.c index 2bf88fefd..4b52a6d82 100755 --- a/powder.c +++ b/powder.c @@ -26,9 +26,6 @@ #include #include #include -#ifdef OCL -#include -#endif //#include #ifdef MT #include @@ -64,7 +61,7 @@ #define ZSIZE_D 16 #define ZFACTOR_D 8 -unsigned char ZFACTOR = 256/ZSIZE_D;//ZFACTOR_D; +unsigned char ZFACTOR = 256/ZSIZE_D; unsigned char ZSIZE = ZSIZE_D; #define CELL 4 @@ -115,6 +112,7 @@ char *it_msg = "\brThe Powder Toy\n" "\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n" "\n" +"\bgControl+C/V/X are Copy, Paste and cut respectively.\n" "\bgTo choose a material, hover over once of the icons on the right, it will show a selection of elements in that group.\n" "\bgPick your material from the menu using mouse left/right buttons.\n" "Draw freeform lines by dragging your mouse left/right button across the drawing area.\n" @@ -137,11 +135,7 @@ char *it_msg = "\n" "\bgSpecial thanks to Brian Ledbetter for maintaining ports & server development in the past." "\nand CW for hosting the original server.\n" -#ifdef WIN32 -"\nThanks to Akuryo for Windows icons.\n" -#endif -"\n" -"\bgTo use online features such as saving, you need to register at: http://powder.hardwired.org.uk/Register.html" +"\bgTo use online features such as saving, you need to register at: \brhttp://powder.hardwired.org.uk/Register.html" ; typedef struct { @@ -1110,7 +1104,7 @@ int nearest_part(int ci, int t){ int cy = (int)parts[ci].y; for(i=0; i= YRES/CELL) save_y = YRES/CELL-1; save_w = 1; save_h = 1; - if(b==1) + if(b==1){ save_mode = 2; - else if(b==4) + } else if(b==4){ save_mode = 0; + copy_mode = 0; + } } else if(save_mode==2) { save_w = (mx/sdl_scale+CELL/2)/CELL - save_x; save_h = (my/sdl_scale+CELL/2)/CELL - save_y; @@ -8071,8 +8103,21 @@ int main(int argc, char *argv[]) if(save_w<1) save_w = 1; if(save_h<1) save_h = 1; if(!b) { - stamp_save(save_x*CELL, save_y*CELL, save_w*CELL, save_h*CELL); - save_mode = 0; + if(copy_mode==1){ + clipboard_data=build_save(&clipboard_length, save_x*CELL, save_y*CELL, save_w*CELL, save_h*CELL); + clipboard_ready = 1; + save_mode = 0; + copy_mode = 0; + } else if(copy_mode==2){ + clipboard_data=build_save(&clipboard_length, save_x*CELL, save_y*CELL, save_w*CELL, save_h*CELL); + clipboard_ready = 1; + save_mode = 0; + copy_mode = 0; + clear_area(save_x*CELL, save_y*CELL, save_w*CELL, save_h*CELL); + } else { + stamp_save(save_x*CELL, save_y*CELL, save_w*CELL, save_h*CELL); + save_mode = 0; + } } } else if(sdl_zoom_trig && zoom_en<2) { x /= sdl_scale; diff --git a/version.h b/version.h index 64ce64e01..449eb6133 100755 --- a/version.h +++ b/version.h @@ -21,11 +21,11 @@ #define VERSION_H #define SAVE_VERSION 38 -#define MINOR_VERSION 0 -#define IDENT_VERSION "S" //Change this if you're not Simon! It should be a single letter. +#define MINOR_VERSION 1 +#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. #define MENUV3 -//#define BETA +#define BETA #define HEAT_ENABLE #endif