Skip to content

Commit

Permalink
Fix duplicate macros in BI defines
Browse files Browse the repository at this point in the history
  • Loading branch information
veteran29 committed Sep 28, 2023
1 parent 4161e0d commit d27cf12
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions include/a3/ui_f/hpp/defineResincl.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1540,8 +1540,8 @@ enum
#define IDC_FRIENDS_GAME_INVITE_VOICE 114
#define IDC_FRIENDS_PLAY_MESSAGE 115
#define IDC_FRIENDS_MISSIONS 152
#define IDC_MULTI_BATTLEYE_FILTER 154
#define IDC_MULTI_EXPANSIONS_FILTER 155
// #define IDC_MULTI_BATTLEYE_FILTER 154
// #define IDC_MULTI_EXPANSIONS_FILTER 155

// Send voice mail dialog
#define IDC_SVM_TITLE 101
Expand Down Expand Up @@ -1682,7 +1682,7 @@ enum
#define IDC_MP_QUICK_MAX_PING 111
#define IDC_MP_QUICK_BEST_SERVER 112
#define IDC_MP_QUICK_FIND_SERVER 113
#define IDC_MP_QUICK_SHOW_SERVERS 114
// #define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_SHOW_SERVERS 114
#define IDC_MP_QUICK_MODE_TITLE 115
#define IDC_MP_QUICK_MODE_PICTURE 116
Expand Down Expand Up @@ -3173,4 +3173,4 @@ enum
#define HZ_TANK_BOTH_TRACKS 32


#endif
#endif
26 changes: 13 additions & 13 deletions include/a3/ui_f/hpp/defineResinclDesign.inc
Original file line number Diff line number Diff line change
Expand Up @@ -328,19 +328,19 @@
#define IDC_RSCDISPLAYRESPAWN_MAP 1050

//--- RscDisplaySelectIsland
#define IDC_RSCDISPLAYSELECTISLAND_TITLE 1000
#define IDC_RSCDISPLAYSELECTISLAND_NAME 1002
#define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 1003
#define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 1004
#define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 1200
#define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 1201
#define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 1202
#define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 1203
#define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 1204
#define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 1205
#define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 2300
#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 2600
#define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 2700
// #define IDC_RSCDISPLAYSELECTISLAND_TITLE 1000
// #define IDC_RSCDISPLAYSELECTISLAND_NAME 1002
// #define IDC_RSCDISPLAYSELECTISLAND_AUTHOR 1003
// #define IDC_RSCDISPLAYSELECTISLAND_NAMEBACKGROUND 1004
// #define IDC_RSCDISPLAYSELECTISLAND_ISLANDPANORAMA 1200
// #define IDC_RSCDISPLAYSELECTISLAND_INTERLACING 1201
// #define IDC_RSCDISPLAYSELECTISLAND_CLOUD1 1202
// #define IDC_RSCDISPLAYSELECTISLAND_CLOUD2 1203
// #define IDC_RSCDISPLAYSELECTISLAND_CLOUD3 1204
// #define IDC_RSCDISPLAYSELECTISLAND_CLOUD4 1205
// #define IDC_RSCDISPLAYSELECTISLAND_ISLANDGROUP 2300
// #define IDC_RSCDISPLAYSELECTISLAND_BUTTONCONTINUE 2600
// #define IDC_RSCDISPLAYSELECTISLAND_BUTTONCANCEL 2700

//--- RscSpectator
#define IDC_RSCSPECTATOR_PLAYERNAMEBACKGROUND 1000
Expand Down

0 comments on commit d27cf12

Please sign in to comment.