X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ffiles.c;h=deac9e3e2898da9726eeb48a4bc84d8d36b59ec8;hb=65130d9f6581e4bd39ceae50d820c9774e4972a9;hp=1141c3b308e41a06dc9c9e7e4665d33c811b41db;hpb=10bdd396f0cd0ff1fc0a504cd41949ff39937b30;p=flatwaifu.git diff --git a/src/files.c b/src/files.c index 1141c3b..deac9e3 100644 --- a/src/files.c +++ b/src/files.c @@ -40,9 +40,9 @@ void F_startup (void) { void F_addwad (const char *fn) { static int i = 0; - static FILE_Reader wadh[MAX_WADS]; + static FILE_Stream wadh[MAX_WADS]; if (i < MAX_WADS) { - if (FILE_OpenReader(&wadh[i], fn)) { + if (FILE_Open(&wadh[i], fn, "rb")) { if (WADRES_addwad(&wadh[i].base)) { i += 1; } else { @@ -149,9 +149,9 @@ void F_randmus (char *s) { void F_loadmap (char n[8]) { int id = F_getresid(n); if (id != -1) { - Reader *r = WADRES_getbasereader(id); + Stream *r = WADRES_getbasereader(id); long offset = WADRES_getoffset(id); - r->setpos(r, offset); + stream_setpos(r, offset); if (!MAP_load(r)) { ERR_fatal("Failed to load map"); }