Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*

Feature #778036 ยป 0026-Remove-base-flags-retired-in-3.0.patch

Marko Lindqvist, 2018-10-06 10:07 AM

View differences:

common/base.c
/************************************************************************//**
Returns TRUE iff the given flag is retired.
If a base flag is retired without being replaced by an extra flag before
3.0 is released rscompat_req_type_name_3_0() must be updated.
****************************************************************************/
bool base_flag_is_retired(enum base_flag_id flag)
{
/* All base flags after BF_RETIRED_NO_STACK_DEATH are retired. */
return flag >= BF_RETIRED_NO_STACK_DEATH;
/* No new flags retired in 3.1. Flags that were retired in 3.0 are already
* completely removed. */
return FALSE;
}
/************************************************************************//**
common/base.h
* be presented to the player in ruleset help text */
#define SPECENUM_VALUE0NAME N_("NoAggressive")
/* Flags below this comment are retired in 3.0. */
/* Units inside will not die all at once */
#define SPECENUM_VALUE1 BF_RETIRED_NO_STACK_DEATH
#define SPECENUM_VALUE1NAME N_("NoStackDeath")
/* Base provides bonus for defending diplomat */
#define SPECENUM_VALUE2 BF_RETIRED_DIPLOMAT_DEFENSE
#define SPECENUM_VALUE2NAME N_("DiplomatDefense")
/* Paratroopers can use base for paradrop. Now an extra user flag. */
#define SPECENUM_VALUE3 BF_RETIRED_PARADROP_FROM
#define SPECENUM_VALUE3NAME N_("ParadropFrom")
#define SPECENUM_COUNT BF_COUNT
#define SPECENUM_BITVECTOR bv_base_flags
#include "specenum_gen.h"
fc_version
# - No new mandatory capabilities can be added to the release branch; doing
# so would break network capability of supposedly "compatible" releases.
#
NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2018.Oct.06"
NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2018.Oct.06b"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
server/ruleset.c
sval);
ok = FALSE;
break;
} else if ((!compat->compat_mode || compat->ver_terrain >= 10)
} else if ((!compat->compat_mode || compat->ver_terrain >= 20)
&& base_flag_is_retired(flag)) {
ruleset_error(LOG_ERROR, "\"%s\" base \"%s\": retired flag "
"\"%s\". Please update the ruleset.",
    (1-1/1)