(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'

This commit is contained in:
rubidium
2007-12-25 11:26:07 +00:00
parent bf98e25e43
commit 429521a7d1
134 changed files with 180 additions and 169 deletions

View File

@@ -13,7 +13,6 @@
#include "openttd.h"
#include "table/strings.h"
#include "bridge_map.h"
#include "functions.h"
#include "mixer.h"
#include "spritecache.h"
#include "gfxinit.h"
@@ -120,34 +119,6 @@ void CDECL ShowInfoF(const char *str, ...)
}
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
{
FILE *in;
byte *mem;
size_t len;
in = fopen(filename, "rb");
if (in == NULL) return NULL;
fseek(in, 0, SEEK_END);
len = ftell(in);
fseek(in, 0, SEEK_SET);
if (len > maxsize || (mem = MallocT<byte>(len + 1)) == NULL) {
fclose(in);
return NULL;
}
mem[len] = 0;
if (fread(mem, len, 1, in) != 1) {
fclose(in);
free(mem);
return NULL;
}
fclose(in);
*lenp = len;
return mem;
}
extern const char _openttd_revision[];
static void showhelp()
{