From: <js...@us...> - 2006-03-06 04:16:54
|
Update of /cvsroot/exult/exult/mapedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22350/mapedit Modified Files: exult_studio.glade shapeedit.cc studio.cc studio.h Log Message: Added 'new' button to equip window Index: exult_studio.glade =================================================================== RCS file: /cvsroot/exult/exult/mapedit/exult_studio.glade,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- exult_studio.glade 3 Mar 2006 07:05:12 -0000 1.131 +++ exult_studio.glade 6 Mar 2006 04:16:50 -0000 1.132 @@ -13722,17 +13722,48 @@ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkSpinButton" id="equip_recnum"> + <widget class="GtkHBox" id="hbox60"> + <property name="border_width">4</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">0 0 100 1 10 10</property> - <signal name="changed" handler="on_equip_recnum_changed"/> + <property name="homogeneous">False</property> + <property name="spacing">4</property> + + <child> + <widget class="GtkSpinButton" id="equip_recnum"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">0 0 100 1 10 10</property> + <signal name="changed" handler="on_equip_recnum_changed"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="equip_new"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">New</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_equip_new_clicked" last_modification_time="Mon, 06 Mar 2006 02:34:20 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> Index: shapeedit.cc =================================================================== RCS file: /cvsroot/exult/exult/mapedit/shapeedit.cc,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- shapeedit.cc 19 Nov 2005 07:52:24 -0000 1.40 +++ shapeedit.cc 6 Mar 2006 04:16:51 -0000 1.41 @@ -112,6 +112,19 @@ ExultStudio::get_instance()->init_equip_window(recnum); return TRUE; } + +/* + * Add new record. + */ +C_EXPORT void on_equip_new_clicked + ( + GtkButton *btn, + gpointer user_data + ) + { + ExultStudio::get_instance()->new_equip_record(); + } + /* * Draw shape in one of the Equip dialog rows. */ @@ -396,6 +409,23 @@ } /* + * Add a new equipment record. + */ + +void ExultStudio::new_equip_record + ( + ) + { + Equip_record rec; + Monster_info::add_equip(rec); + int ecnt = Monster_info::get_equip_cnt(); + int recnum = ecnt; + // Show new entry. + set_spin("equip_recnum", recnum, 1, ecnt); + shape_info_modified = true; + } + +/* * Shape window's Okay, Apply buttons. */ C_EXPORT void on_shinfo_okay_clicked Index: studio.cc =================================================================== RCS file: /cvsroot/exult/exult/mapedit/studio.cc,v retrieving revision 1.178 retrieving revision 1.179 diff -u -d -r1.178 -r1.179 --- studio.cc 14 Jan 2006 20:56:07 -0000 1.178 +++ studio.cc 6 Mar 2006 04:16:51 -0000 1.179 @@ -1236,6 +1236,12 @@ // Make sure data's been read in. svga->read_info(game_type, true); svga->write_info(game_type); + // Tell Exult to reload. + unsigned char buf[Exult_server::maxlength]; + unsigned char *ptr = &buf[0]; + ExultStudio *studio = ExultStudio::get_instance(); + studio->send_to_server(Exult_server::reload_shapes_info, + buf, ptr - buf); } shape_info_modified = false; if (force || shape_names_modified) Index: studio.h =================================================================== RCS file: /cvsroot/exult/exult/mapedit/studio.h,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- studio.h 19 Nov 2005 07:52:24 -0000 1.107 +++ studio.h 6 Mar 2006 04:16:51 -0000 1.108 @@ -239,6 +239,7 @@ void close_equip_window(); void show_equip_shape(Equip_row_widgets *eq, int x = 0, int y = 0, int w = -1, int h = -1); + void new_equip_record(); void set_shape_notebook_frame(int frnum); void init_shape_notebook(Shape_info& info, GtkWidget *book, int shnum, int frnum); |