Author: mir3x
Date: Sun Nov 20 23:13:55 2016
New Revision: 34588
URL: http://svn.gna.org/viewcvs/freeciv?rev=34588&view=rev
Log:
Don't use move_type in Qt client
Submitted by Emmet Hikory <persia>
See patch #4868
Modified:
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/menu.cpp
Modified: trunk/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=34588&r1=34587&r2=34588&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Sun Nov 20 23:13:55 2016
@@ -3554,6 +3554,7 @@
color col;
QIcon icon = qapp->style()->standardIcon(QStyle::SP_DialogCancelButton);
bool free_sprite = false;
+ struct unit_class *pclass;
if (!option.rect.isValid()) {
return;
@@ -3577,12 +3578,22 @@
} else if (VUT_UTYPE == target->kind) {
name = utype_name_translation(target->value.utype);
is_neutral = utype_has_flag(target->value.utype, UTYF_CIVILIAN);
-
- if (utype_move_type(target->value.utype) == UMT_SEA) {
+ pclass = utype_class(target->value.utype);
+ if (!uclass_has_flag(pclass, UCF_TERRAIN_DEFENSE)
+ && !uclass_has_flag(pclass, UCF_CAN_FORTIFY)
+ && !uclass_has_flag(pclass, UCF_ZOC)) {
is_sea = true;
}
- if (utype_move_type(target->value.utype) == UMT_BOTH) {
+ if ((utype_fuel(target->value.utype)
+ && !uclass_has_flag(pclass, UCF_TERRAIN_DEFENSE)
+ && !uclass_has_flag(pclass, UCF_CAN_PILLAGE)
+ && !uclass_has_flag(pclass, UCF_CAN_FORTIFY)
+ && !uclass_has_flag(pclass, UCF_ZOC))
+ || uclass_has_flag(pclass, UCF_MISSILE)) {
+ if (is_sea == true) {
+ is_sea = false;
+ }
is_flying = true;
}
Modified: trunk/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=34588&r1=34587&r2=34588&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp (original)
+++ trunk/client/gui-qt/menu.cpp Sun Nov 20 23:13:55 2016
@@ -1688,8 +1688,7 @@
utype_id = utype_index(utype);
if (!can_player_build_unit_now(client.conn.playing, utype)
- || utype_move_type(utype) != UMT_LAND
- || utype_has_flag(utype, UTYF_NOBUILD)) {
+ || !utype_can_do_action(utype, ACTION_AIRLIFT)) {
continue;
}
if (!can_player_build_unit_now(client.conn.playing, utype)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
