Project

General

Profile

Feature #805 ยป 0011-Clear-out-ACTRES_UNUSED_1.patch

Marko Lindqvist, 08/25/2024 04:46 AM

View differences:

ai/default/daicity.c
case ACTRES_TELEPORT_CONQUER:
case ACTRES_HOMELESS:
case ACTRES_ENABLER_CHECK:
case ACTRES_UNUSED_1:
fc_assert_msg(action_id_get_target_kind(act_id) == ATK_CITY,
"Action not aimed at cities");
break;
common/actions.c
* Lua? */
chance = ACTPROB_NOT_IMPLEMENTED;
break;
case ACTRES_UNUSED_1:
chance = ACTPROB_NOT_IMPLEMENTED;
break;
}
/* Non signal action probabilities should be in range. */
common/actres.c
{ ACT_TGT_COMPL_SIMPLE, ABK_STANDARD, /* ACTRES_COLLECT_RANSOM */
TRUE, ACTIVITY_LAST, DRT_NONE,
EC_NONE, ERM_NONE, ATK_UNITS },
{ ACT_TGT_COMPL_FLEXIBLE, ABK_NONE, /* ACTRES_UNUSED_1 */
FALSE, ACTIVITY_LAST, DRT_NONE,
EC_NONE, ERM_NONE, RS_DEFAULT_USER_ACTION_TARGET_KIND },
{ ACT_TGT_COMPL_SIMPLE, ABK_NONE, /* ACTRES_TRANSPORT_DEBOARD */
FALSE, ACTIVITY_LAST, DRT_NONE,
EC_NONE, ERM_NONE, ATK_UNIT },
common/actres.h
* break;
*/
#define ASSERT_UNUSED_ACTRES_CASES \
case ACTRES_UNUSED_1: \
fc_assert_msg(FALSE, "ACTRES_UNUSED_1"); \
break;
/* When making changes to this, update also atk_helpnames at actions.c */
#define SPECENUM_NAME action_target_kind
common/fc_types.h
#define SPECENUM_VALUE45NAME "Unit Build Irrigation"
#define SPECENUM_VALUE46 ACTRES_COLLECT_RANSOM
#define SPECENUM_VALUE46NAME "Collect Ransom"
/* TODO: Rearrange action results to get rid of this */
#define SPECENUM_VALUE47 ACTRES_UNUSED_1
#define SPECENUM_VALUE47NAME "Unused1"
#define SPECENUM_VALUE47 ACTRES_TRANSPORT_LOAD
#define SPECENUM_VALUE47NAME "Unit Transport Load"
#define SPECENUM_VALUE48 ACTRES_TRANSPORT_DEBOARD
#define SPECENUM_VALUE48NAME "Unit Transport Deboard"
#define SPECENUM_VALUE49 ACTRES_TRANSPORT_UNLOAD
......
#define SPECENUM_VALUE61NAME "Wipe Units"
#define SPECENUM_VALUE62 ACTRES_SPY_ESCAPE
#define SPECENUM_VALUE62NAME "Unit Spy Escape"
#define SPECENUM_VALUE63 ACTRES_TRANSPORT_LOAD
#define SPECENUM_VALUE63NAME "Unit Transport Load"
#define SPECENUM_VALUE64 ACTRES_CLEAN
#define SPECENUM_VALUE64NAME "Clean"
#define SPECENUM_VALUE63 ACTRES_CLEAN
#define SPECENUM_VALUE63NAME "Clean"
/* TODO: Move close to "Move" */
#define SPECENUM_VALUE65 ACTRES_TELEPORT
#define SPECENUM_VALUE65NAME "Teleport"
#define SPECENUM_VALUE66 ACTRES_TELEPORT_CONQUER
#define SPECENUM_VALUE66NAME "Teleport Conquer"
#define SPECENUM_VALUE64 ACTRES_TELEPORT
#define SPECENUM_VALUE64NAME "Teleport"
#define SPECENUM_VALUE65 ACTRES_TELEPORT_CONQUER
#define SPECENUM_VALUE65NAME "Teleport Conquer"
/* Hardcoded action that's just controlled by enablers */
#define SPECENUM_VALUE67 ACTRES_ENABLER_CHECK
#define SPECENUM_VALUE66 ACTRES_ENABLER_CHECK
/* All consequences are handled as (ruleset) action data. */
#define SPECENUM_COUNT ACTRES_LAST
#include "specenum_gen.h"
    (1-1/1)