1
0
mirror of https://git.zap.org.au/git/trader.git synced 2024-12-04 14:46:45 -05:00

Rename the global variables map and move

Rename the global array variables map[] and move[] to galaxy_map[] and
game_move[] respectively to prevent clashes with functions from various
libraries (particularly NCurses).
This commit is contained in:
John Zaitseff 2011-06-15 13:05:14 +10:00
parent 18fde51d30
commit ab6f936f3f
2 changed files with 8 additions and 8 deletions

View File

@ -52,10 +52,10 @@ const char *company_names[MAX_COMPANIES] = {
* Global variable definitions *
************************************************************************/
company_info_t company[MAX_COMPANIES]; // Array of companies
player_info_t player[MAX_PLAYERS]; // Array of players
map_val_t map[MAX_X][MAX_Y]; // Map of the galaxy
move_rec_t move[NUMBER_MOVES]; // Current moves
company_info_t company[MAX_COMPANIES]; // Array of companies
player_info_t player[MAX_PLAYERS]; // Array of players
map_val_t galaxy_map[MAX_X][MAX_Y]; // Map of the galaxy
move_rec_t game_move[NUMBER_MOVES]; // Current moves
double interest_rate; // Current interest rate
double credit_limit; // Credit limit of current player

View File

@ -116,10 +116,10 @@ extern const char *company_names[MAX_COMPANIES];
* Global variable declarations *
************************************************************************/
extern company_info_t company[MAX_COMPANIES]; // Array of companies
extern player_info_t player[MAX_PLAYERS]; // Array of players
extern map_val_t map[MAX_X][MAX_Y]; // Map of the galaxy
extern move_rec_t move[NUMBER_MOVES]; // Current moves
extern company_info_t company[MAX_COMPANIES]; // Array of companies
extern player_info_t player[MAX_PLAYERS]; // Array of players
extern map_val_t galaxy_map[MAX_X][MAX_Y]; // Map of the galaxy
extern move_rec_t game_move[NUMBER_MOVES]; // Current moves
extern double interest_rate; // Current interest rate
extern double credit_limit; // Credit limit of current player