Menu
▾
▴
[Timewarp-commit] source/menu editfleet.cpp, 1.1, 1.2 mainmenu.cpp, 1.2, 1.3
|
From: Rob <geo...@us...> - 2006-06-06 03:23:53
|
Update of /cvsroot/timewarp/source/menu In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source/menu Modified Files: editfleet.cpp mainmenu.cpp Log Message: Index: mainmenu.cpp =================================================================== RCS file: /cvsroot/timewarp/source/menu/mainmenu.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mainmenu.cpp 2 Jun 2006 13:38:22 -0000 1.2 --- mainmenu.cpp 5 Jun 2006 19:03:43 -0000 1.3 *************** *** 165,168 **** --- 165,169 ---- int mainRet; do { + //mainRet = popup_dialog(mainDialog, MAIN_DIALOG_MELEE); mainRet = tw_do_dialog(window, mainDialog, MAIN_DIALOG_MELEE); Index: editfleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/menu/editfleet.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editfleet.cpp 2 Jun 2006 08:10:55 -0000 1.1 --- editfleet.cpp 5 Jun 2006 19:03:43 -0000 1.2 *************** *** 34,42 **** FLEET_DIALOG_SHIP_CATAGORIES_TEXT, //TEMP, ! FLEET_DIALOG_SC1_TOGGLE, ! FLEET_DIALOG_SC2_TOGGLE, ! FLEET_DIALOG_SC3_TOGGLE, FLEET_DIALOG_TW_OFFICIAL_TOGGLE, - FLEET_DIALOG_TW_EXP_TOGGLE, FLEET_DIALOG_TW_SPECIAL_TOGGLE, FLEET_DIALOG_SORTBY_TEXT1, --- 34,39 ---- FLEET_DIALOG_SHIP_CATAGORIES_TEXT, //TEMP, ! FLEET_DIALOG_SC_TOGGLE, FLEET_DIALOG_TW_OFFICIAL_TOGGLE, FLEET_DIALOG_TW_SPECIAL_TOGGLE, FLEET_DIALOG_SORTBY_TEXT1, *************** *** 125,142 **** { d_check_proc_fleeteditor, // x=30-->x=10 ! 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC1", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE ! { d_check_proc_fleeteditor, ! 10, 66, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC2", NULL, NULL },//FLEET_DIALOG_SC2_TOGGLE ! { d_check_proc_fleeteditor, ! 10, 79, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC3", NULL, NULL },//FLEET_DIALOG_SC3_TOGGLE { d_check_proc_fleeteditor, ! // 30, 93, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE ! 80, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE ! { d_check_proc_fleeteditor, ! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE ! 80, 66, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE { d_check_proc_fleeteditor, ! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE ! 80, 79, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE { d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1 --- 122,130 ---- { d_check_proc_fleeteditor, // x=30-->x=10 ! 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"Star Control", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE { d_check_proc_fleeteditor, ! 10, 67, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE { d_check_proc_fleeteditor, ! 10, 82, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE { d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1 *************** *** 147,155 **** 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST - //{ d_text_list_proc, - // 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST - // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 390, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"+", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC { my_d_button_proc, 602, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"-", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC --- 135,140 ---- *************** *** 167,171 **** { d_button_proc, 582, 120, 16, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"^", NULL, NULL },//FLEET_DIALOG_SORTBY_ASCENDING2 - // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 270, 210, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add", NULL, NULL },//FLEET_DIALOG_ADD_BUTTON { my_d_button_proc, 270, 235, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add All", NULL, NULL },//FLEET_DIALOG_ADD_ALL_BUTTON --- 152,155 ---- *************** *** 175,180 **** 10, 372, 85, 85, 255, 0, 0, 0, 0, 0, (void *)NULL, NULL, NULL },//FLEET_DIALOG_SHIP_PICTURE_BITMAP - //{ d_textbox_proc, 10, 372, 310, 85, 255, 0, 0, 0, 0, 0, (void *)"SHIP PICTURE TODO", NULL, NULL },//FLEET_DIALOG_SHIP_STATS_BITMAP - { d_textbox_proc, 325, 372, 305, 85, 255, 0, 0, 0, 0, 0, (void *)"Summary Text\0 ", NULL, NULL },//FLEET_DIALOG_SHIP_SUMMARY_TEXT --- 159,162 ---- *************** *** 301,329 **** for (int c=0; c<num_shiptypes; c++) { ! switch (shiptypes[c].origin) { ! case SHIP_ORIGIN_SC1: ! if (fleetDialog[FLEET_DIALOG_SC1_TOGGLE].flags & D_SELECTED) ! reference_fleet->addShipType(&shiptypes[c]); ! break; ! ! case SHIP_ORIGIN_SC2: ! if (fleetDialog[FLEET_DIALOG_SC2_TOGGLE].flags & D_SELECTED) ! reference_fleet->addShipType(&shiptypes[c]); ! break; ! ! case SHIP_ORIGIN_SC3: ! if (fleetDialog[FLEET_DIALOG_SC3_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; ! case SHIP_ORIGIN_TW_ALPHA: if (fleetDialog[FLEET_DIALOG_TW_OFFICIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; - - case SHIP_ORIGIN_TW_BETA: - if (fleetDialog[FLEET_DIALOG_TW_EXP_TOGGLE].flags & D_SELECTED) - reference_fleet->addShipType(&shiptypes[c]); - break; case SHIP_ORIGIN_TW_SPECIAL: --- 283,297 ---- for (int c=0; c<num_shiptypes; c++) { ! switch (shiptypes[c].origin) ! { ! case SHIP_ORIGIN_SC: ! if (fleetDialog[FLEET_DIALOG_SC_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; ! case SHIP_ORIGIN_TW_ALPHA: if (fleetDialog[FLEET_DIALOG_TW_OFFICIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_TW_SPECIAL: *************** *** 343,351 **** case FLEET_DIALOG_SHIP_CATAGORIES_TEXT: break; ! case FLEET_DIALOG_SC1_TOGGLE: ! case FLEET_DIALOG_SC2_TOGGLE: ! case FLEET_DIALOG_SC3_TOGGLE: case FLEET_DIALOG_TW_OFFICIAL_TOGGLE: - case FLEET_DIALOG_TW_EXP_TOGGLE: case FLEET_DIALOG_TW_SPECIAL_TOGGLE: availableFleetDirty = true; --- 311,316 ---- case FLEET_DIALOG_SHIP_CATAGORIES_TEXT: break; ! case FLEET_DIALOG_SC_TOGGLE: case FLEET_DIALOG_TW_OFFICIAL_TOGGLE: case FLEET_DIALOG_TW_SPECIAL_TOGGLE: availableFleetDirty = true; |
