(svn r2098) Make a variable static, move a function declaration to a header and remove unnecessary preprocessor magic

This commit is contained in:
tron 2005-03-28 08:48:41 +00:00
parent 51eeea477b
commit e4cb9dbb77
3 changed files with 4 additions and 7 deletions

2
hal.h
View File

@ -141,6 +141,8 @@ void FiosDelete(const char *name);
// Make a filename from a name // Make a filename from a name
void FiosMakeSavegameName(char *buf, const char *name); void FiosMakeSavegameName(char *buf, const char *name);
int CDECL compare_FiosItems(const void *a, const void *b);
void CreateConsole(void); void CreateConsole(void);
#endif /* HAL_H */ #endif /* HAL_H */

View File

@ -20,6 +20,8 @@
#include "hal.h" // for file list #include "hal.h" // for file list
static bool _savegame_sort_dirty;
bool _query_string_active; bool _query_string_active;
typedef struct LandInfoData { typedef struct LandInfoData {
@ -1142,12 +1144,6 @@ static void DrawFiosTexts(void)
DoDrawString(path, 2, 27, 16); DoDrawString(path, 2, 27, 16);
} }
#if defined(_WIN32)
extern int CDECL compare_FiosItems (const void *a, const void *b);
#else
extern int compare_FiosItems (const void *a, const void *b);
#endif
static void MakeSortedSaveGameList(void) static void MakeSortedSaveGameList(void)
{ {

1
ttd.h
View File

@ -507,7 +507,6 @@ enum SpecialStrings {
typedef void PlaceProc(uint tile); typedef void PlaceProc(uint tile);
VARDEF bool _savegame_sort_dirty;
VARDEF byte _savegame_sort_order; VARDEF byte _savegame_sort_order;
#define INVALID_UINT_TILE (uint)0xFFFFFFFF #define INVALID_UINT_TILE (uint)0xFFFFFFFF