From ab6f936f3f73a1169d2b0b8c1db3acacef6842c3 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 15 Jun 2011 13:05:14 +1000 Subject: [PATCH] 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). --- src/globals.c | 8 ++++---- src/globals.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/globals.c b/src/globals.c index 76c658d..05c4d3d 100644 --- a/src/globals.c +++ b/src/globals.c @@ -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 diff --git a/src/globals.h b/src/globals.h index e9f87d7..6a3c515 100644 --- a/src/globals.h +++ b/src/globals.h @@ -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