X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ferror.c;h=ef9c388774b7c453b30ffb65dd63be6bb80edfc4;hb=584adc9c1911a6941ef07443a6fc6ff922d7c8ea;hp=0e3e2afebbe0c5978cf3bbbc931fd52a1f7e3b72;hpb=8fb3d3f767b8e5d094e8bcbee350f4d16ab17c5a;p=flatwaifu.git diff --git a/src/error.c b/src/error.c index 0e3e2af..ef9c388 100644 --- a/src/error.c +++ b/src/error.c @@ -27,25 +27,24 @@ #include #include "keyb.h" #include "sound.h" -#include "vga.h" +#include "render.h" #include "memory.h" #include "error.h" #include "config.h" -void close_all(void) { +static void close_all (void) { S_done(); S_donemusic(); K_done(); - V_done(); + R_done(); M_shutdown(); } -void ERR_failinit(char *s,...) { +void ERR_failinit (char *s, ...) { va_list ap; - close_all(); - va_start(ap,s); - vprintf(s,ap); + va_start(ap, s); + vprintf(s, ap); va_end(ap); puts(""); exit(1); @@ -53,17 +52,16 @@ void ERR_failinit(char *s,...) { void ERR_fatal(char *s,...) { va_list ap; - close_all(); puts("\nКРИТИЧЕСКАЯ ОШИБКА:"); - va_start(ap,s); - vprintf(s,ap); + va_start(ap, s); + vprintf(s, ap); va_end(ap); puts(""); exit(2); } -void ERR_quit(void) { +void ERR_quit (void) { void *p; //V_done(); //if(!(p=malloc(4000)))