From: <ufo...@li...> - 2006-06-25 20:09:30
|
Revision: 1050 Author: ssvb Date: 2006-06-25 13:09:06 -0700 (Sun, 25 Jun 2006) ViewCVS: http://svn.sourceforge.net/ufo2000/?rev=1050&view=rev Log Message: ----------- * Added F4 hotkey for swithing into soldier inventory editor in addition to current Ctrl-Click (mostly needed for Nokia 770, where F4 is mapped to 'menu' key) * Version bump Modified Paths: -------------- trunk/src/connect.cpp trunk/src/units.cpp trunk/src/units.h trunk/src/version.h Modified: trunk/src/connect.cpp =================================================================== --- trunk/src/connect.cpp 2006-06-24 22:48:35 UTC (rev 1049) +++ trunk/src/connect.cpp 2006-06-25 20:09:06 UTC (rev 1050) @@ -443,8 +443,7 @@ //Editor::load(); break; case KEY_F4: - //editor->set_man(name[1]); - //Editor::show(); + local.edit_unit(0); break; case KEY_F5: // Toggle F_RAWMESSAGES FLAGS ^= F_RAWMESSAGES; Modified: trunk/src/units.cpp =================================================================== --- trunk/src/units.cpp 2006-06-24 22:48:35 UTC (rev 1049) +++ trunk/src/units.cpp 2006-06-25 20:09:06 UTC (rev 1050) @@ -674,6 +674,26 @@ } /** + * Activate unit inventory editor + */ +bool Units::edit_unit(int num) +{ + if (editor->set_man(name[num])) { + clear(screen); + + editor->show(); + editor->build_Units(*this); + reset_video(); + + destroy_bitmap(screen2); + screen2 = create_bitmap(640, SCREEN2H - 1); clear(screen2); + return true; + } else { + return false; + } +} + +/** * Mission-planner: select position for a soldier in deployment-area on map. * When user ctrl-clicks on a soldier-name, call editor for soldier-equipment. */ @@ -717,22 +737,7 @@ if (mouse_inside(x1, y1, x2, y2)) { if (key[KEY_LCONTROL]) { // do editor - //if (is_selected(i)) // don't edit selected - // return; - if (editor->set_man(name[i])) { - clear(screen); - - editor->show(); - editor->build_Units(*this); - reset_video(); - - destroy_bitmap(screen2); - screen2 = create_bitmap(640, SCREEN2H - 1); clear(screen2); - /*if (is_selected(i)) { - lev[i] = -1; - net->send_deselect_unit(i); - }*/ - } + edit_unit(i); return ; } selected = i; Modified: trunk/src/units.h =================================================================== --- trunk/src/units.h 2006-06-24 22:48:35 UTC (rev 1049) +++ trunk/src/units.h 2006-06-25 20:09:06 UTC (rev 1050) @@ -99,6 +99,7 @@ int select_unit(int num, int n_lev, int n_col, int n_row); int deselect_unit(int num); int is_selected(int num) {return (lev[num] != -1);} + bool edit_unit(int num); friend class Platoon; }; Modified: trunk/src/version.h =================================================================== --- trunk/src/version.h 2006-06-24 22:48:35 UTC (rev 1049) +++ trunk/src/version.h 2006-06-25 20:09:06 UTC (rev 1050) @@ -23,7 +23,7 @@ #define UFO_VERSION_TAG "beta" #define UFO_VERSION_STRING "0.7" -#define UFO_REVISION_NUMBER 1045 +#define UFO_REVISION_NUMBER 1050 #ifndef UFO_SVNVERSION #define UFO_SVNVERSION "unknown" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |