Skip to content

Commit 82321a9

Browse files
gtaylorgtaylor
committed
Clean up btechstats includes
1 parent 6d6d429 commit 82321a9

11 files changed

Lines changed: 142 additions & 91 deletions

‎src/btech/character/btechstats.c‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
1+
#include <stdint.h>
2+
#include <stdio.h>
3+
#include <stdlib.h>
4+
#include <string.h>
5+
#include <strings.h>
6+
#include <time.h>
7+
8+
#include "btech/context.h"
9+
#include "btech_channel.h"
10+
#include "btechstats.h"
11+
#include "btechstats_api.h"
12+
#include "btechstats_global.h"
113
#include "btechstats_internal.h"
214
#include "checked_conversion.h"
15+
#include "command_handlers_api.h"
16+
#include "mech_utils_api.h"
17+
#include "mux/commands/command_helpers.h"
18+
#include "mux/network/mux_event_alloc.h"
19+
#include "mux/server/game.h"
20+
#include "mux/server/platform.h"
21+
#include "mux/support/alloc.h"
322
#include "mux/support/checked_storage.h"
23+
#include "mux/support/hash_table.h"
24+
#include "mux/support/stringutil.h"
425
#include "registry_api.h"
26+
#include "special_object.h"
527

628
static size_t character_value_index(int code) {
729
if (code < 0 || code >= NUM_CHARVALUES)

‎src/btech/character/btechstats.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/*
2-
* $Id: btechstats.h,v 1.1.1.1 2005/01/11 21:18:03 kstevens Exp $
3-
*
4-
* Author: Markus Stenberg <fingon@iki.fi>
5-
*
6-
* Copyright (c) 1996 Markus Stenberg
7-
* Copyright (c) 1998-2002 Thomas Wouters
8-
* Copyright (c) 2000-2002 Cord Awtry
9-
* Copyright (c) 1999-2005 Kevin Stevens
10-
* All rights reserved
11-
*
12-
* Last modified: Mon Jul 13 11:10:38 1998 fingon
13-
*
14-
*/
15-
161
/* Function declarations / skill list for btechstats.c */
172

183
#pragma once

‎src/btech/character/btechstats_global.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@ constexpr int VALUES_ADVS = 8; /* Advantages and lives */
2323
constexpr int VALUES_ALL = 15;
2424
constexpr int VALUES_CO = 6; /* Attr + Skill */
2525

26-
/* hmm. */
27-
2826
constexpr int CHAR_VALUE = 0;
2927
constexpr int CHAR_SKILL = 1;
3028
constexpr int CHAR_ADVANTAGE = 2;
3129
constexpr int CHAR_ATTRIBUTE = 3;
3230

3331
/* 4 diff. skill types */
34-
3532
constexpr int CHAR_ATHLETIC = 0x0001;
3633
constexpr int CHAR_MENTAL = 0x0002;
3734
constexpr int CHAR_PHYSICAL = 0x0004;
@@ -53,7 +50,6 @@ constexpr int SK_XP = 0x4000; /* Always raise xp (not spammable) */
5350
constexpr int XP_MAX = 256 * 256 * 256; /* Then we wrap ; tough beans */
5451

5552
/* 3 diff. adv types */
56-
5753
constexpr int CHAR_ADV_VALUE = 0;
5854
constexpr int CHAR_ADV_BOOL = 1;
5955
constexpr int CHAR_ADV_EXCEPT = 2;
@@ -64,14 +60,5 @@ constexpr int CHAR_INT = 4;
6460
constexpr int CHAR_LRN = 8;
6561
constexpr int CHAR_CHA = 16;
6662

67-
constexpr int GREEN = 0;
68-
constexpr int REGULAR = 1;
69-
constexpr int VETEREN = 2;
70-
constexpr int ELITE = 3;
71-
constexpr int HISTORICAL = 4;
72-
73-
#include "btech_api.h"
74-
#include "btechstats_api.h"
75-
7663
constexpr int EE_NUMBER = 11;
7764
constexpr int LIVES_NUMBER = 5;

‎src/btech/character/btechstats_internal.h‎

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,12 @@
11
#pragma once
2-
#include "btech_api.h" // IWYU pragma: keep
3-
#include "btech_event.h" // IWYU pragma: keep
4-
#include "map_terrain.h" // IWYU pragma: keep
5-
#include "mech_lifecycle.h"
6-
#include "mux/objects/powers.h" // IWYU pragma: keep
7-
#include "mux/server/runtime_clock.h" // IWYU pragma: keep
8-
/*
9-
* Author: Markus Stenberg <fingon@iki.fi>
10-
*
11-
* Copyright (c) 1996 Markus Stenberg
12-
* Copyright (c) 1998-2002 Thomas Wouters
13-
* Copyright (c) 2000-2002 Cord Awtry
14-
* Copyright (c) 1999-2005 Kevin Stevens
15-
* All rights reserved
16-
*
17-
*/
182

19-
#include <ctype.h>
20-
#include <math.h>
21-
#include <stdio.h>
22-
#include <stdlib.h>
23-
#include <string.h>
24-
#include <strings.h>
3+
#include <stdbool.h>
4+
#include <time.h>
255

26-
#include "btconfig.h"
276
#include "btech/context.h"
28-
#include "btech_channel.h"
29-
#include "btechstats_api.h"
30-
#include "command_handlers_api.h"
31-
#include "map_obj_api.h"
32-
#include "mech_equipment_api.h"
33-
#include "mech_events_api.h"
34-
#include "mech_notify_api.h"
35-
#include "mux/commands/command_handlers.h"
36-
#include "mux/objects/attrs.h"
37-
#include "mux/objects/character_state.h"
38-
#include "mux/objects/db.h"
39-
#include "mux/objects/flags.h"
40-
#include "mux/server/game.h"
41-
#include "mux/server/log.h"
7+
#include "btechstats.h"
428
#include "mux/server/platform.h"
43-
#include "mux/server/server_config.h"
44-
#include "mux/support/alloc.h"
45-
#include "mux/support/formatting.h"
46-
#include "mux/world/player.h"
47-
#include "special_object.h"
48-
#include "weapon_settings.h"
49-
50-
#include "coolmenu.h"
51-
#include "mech_crew_api.h"
52-
#include "mech_identity_api.h"
53-
#include "mech_progress_api.h"
54-
#include "mycool.h"
559

56-
#include "btechstats.h"
57-
#include "mech_api_types.h"
58-
#include "mech_classification_api.h"
59-
#include "mech_combat_misc_api.h"
60-
#include "mech_partnames_api.h"
61-
#include "mech_runtime_api.h"
62-
#include "mech_specification_api.h"
63-
#include "mech_status_types.h"
64-
#include "mech_utils_api.h"
65-
#include "mux/commands/command_helpers.h"
66-
#include "mux/network/mux_event_alloc.h"
67-
#include "mux/support/hash_table.h"
68-
#include "mux/support/stringutil.h"
69-
#include "section_types.h"
7010
int character_value_by_code(BtechContext *context, DbRef player, int code);
7111
void character_stats_clear(PSTATS *stats);
7212
void character_stats_retrieve(BtechContext *context, DbRef player, int modes,

‎src/btech/character/character_battle_value.c‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1+
#include <math.h>
2+
#include <stdlib.h>
3+
#include <string.h>
4+
5+
#include "btech/context.h"
6+
#include "btech_channel.h"
7+
#include "btechstats.h"
8+
#include "btechstats_api.h"
9+
#include "btechstats_global.h"
110
#include "btechstats_internal.h"
11+
#include "command_handlers_api.h"
12+
#include "equipment_types.h"
13+
#include "mech_classification_api.h"
214
#include "mech_crew_api.h"
315
#include "mech_equipment_api.h"
16+
#include "mech_identity_api.h"
17+
#include "mech_lifecycle.h"
418
#include "mech_move_api.h"
19+
#include "mech_progress_api.h"
520
#include "mech_runtime_api.h"
21+
#include "mech_specification_api.h"
22+
#include "mech_utils_api.h"
23+
#include "mux/commands/command_helpers.h"
24+
#include "mux/objects/db.h"
25+
#include "mux/objects/flags.h"
26+
#include "mux/server/platform.h"
27+
#include "mux/support/alloc.h"
628
#include "mux/support/checked_storage.h"
29+
#include "mux/support/formatting.h"
30+
#include "section_types.h"
731
#include "weapon_catalogue_api.h"
32+
#include "weapon_settings.h"
833

934
static const char *function_argument(char *const *arguments, int count,
1035
size_t index) {

‎src/btech/character/character_experience.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1+
#include "btech/context.h"
2+
#include "btech_channel.h"
3+
#include "btechstats.h"
4+
#include "btechstats_api.h"
5+
#include "btechstats_global.h"
16
#include "btechstats_internal.h"
7+
#include "command_handlers_api.h"
8+
#include "mech_classification_api.h"
29
#include "mech_crew_api.h"
10+
#include "mech_identity_api.h"
11+
#include "mech_lifecycle.h"
12+
#include "mech_progress_api.h"
313
#include "mech_runtime_api.h"
14+
#include "mech_utils_api.h"
15+
#include "mux/objects/db.h"
16+
#include "mux/objects/flags.h"
17+
#include "mux/server/platform.h"
18+
#include "mux/support/formatting.h"
19+
#include "special_object.h"
420

521
void lower_xp(BtechContext *context, DbRef player, int promillage) {
622
PSTATS stats, *s = &stats;

‎src/btech/character/character_health.c‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,40 @@
1+
#include <stdio.h>
2+
#include <stdlib.h>
3+
#include <string.h>
4+
5+
#include "btconfig.h"
6+
#include "btech/context.h"
7+
#include "btech_channel.h"
8+
#include "btechstats.h"
9+
#include "btechstats_api.h"
10+
#include "btechstats_global.h"
111
#include "btechstats_internal.h"
12+
#include "command_handlers_api.h"
13+
#include "equipment_types.h"
14+
#include "mech_combat_misc_api.h"
215
#include "mech_crew_api.h"
316
#include "mech_equipment_api.h"
17+
#include "mech_events_api.h"
18+
#include "mech_identity_api.h"
19+
#include "mech_lifecycle.h"
420
#include "mech_notify_api.h"
21+
#include "mech_partnames_api.h"
522
#include "mech_runtime_api.h"
23+
#include "mech_specification_api.h"
24+
#include "mech_utils_api.h"
25+
#include "mux/commands/command_handlers.h"
26+
#include "mux/objects/attrs.h"
27+
#include "mux/objects/character_state.h"
28+
#include "mux/objects/db.h"
29+
#include "mux/objects/flags.h"
30+
#include "mux/server/game.h"
31+
#include "mux/server/platform.h"
32+
#include "mux/support/alloc.h"
633
#include "mux/support/checked_storage.h"
34+
#include "mux/support/formatting.h"
35+
#include "mux/world/player.h"
736
#include "registry_api.h"
37+
#include "special_object.h"
838
#include "weapon_catalogue_api.h"
939

1040
static int player_character_section(size_t index) {

‎src/btech/character/character_persistence.c‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1+
#include <stdlib.h>
2+
#include <string.h>
3+
#include <strings.h>
4+
5+
#include "btech/context.h"
6+
#include "btechstats.h"
7+
#include "btechstats_api.h"
8+
#include "btechstats_global.h"
19
#include "btechstats_internal.h"
10+
#include "command_handlers_api.h"
11+
#include "coolmenu.h"
12+
#include "mux/objects/db.h"
13+
#include "mux/objects/flags.h"
14+
#include "mux/server/log.h"
15+
#include "mux/server/platform.h"
16+
#include "mux/server/server_config.h"
217
#include "mux/support/checked_storage.h"
18+
#include "mux/support/formatting.h"
19+
#include "mycool.h"
320
#include "registry_api.h"
21+
#include "special_object.h"
422

523
typedef struct CharacterXpRanking {
624
DbRef player;

‎src/btech/character/character_state_adapter.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1+
#include <stddef.h>
2+
#include <string.h>
3+
#include <strings.h>
4+
5+
#include "btech/context.h"
6+
#include "btechstats.h"
7+
#include "btechstats_api.h"
8+
#include "btechstats_global.h"
19
#include "btechstats_internal.h"
10+
#include "mux/objects/character_state.h"
11+
#include "mux/objects/db.h"
12+
#include "mux/objects/flags.h"
13+
#include "mux/server/platform.h"
214

315
static CharacterFixedState fixed_state_from_stats(BtechContext *context,
416
PSTATS *stats) {

‎src/btech/character/character_value_catalog.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#include <stddef.h>
2+
#include <stdlib.h>
3+
4+
#include "btechstats.h"
5+
#include "btechstats_global.h"
16
#include "btechstats_internal.h"
27
#include "mux/support/checked_storage.h"
38

0 commit comments

Comments
 (0)