X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ferror.c;h=46e5c43cea014cab78405de663aa4c6c7f03958f;hb=2bb81ea2565c3627c954b5c37326db89b0048472;hp=26a8f123890d1467c39b8f92cf8837e9c4d4f957;hpb=ea7819e2f4224e9a5c9be063f9524c8e67a94c36;p=flatwaifu.git

diff --git a/src/error.c b/src/error.c
index 26a8f12..46e5c43 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,34 +23,42 @@
 #include "glob.h"
 #include <stdio.h>
 #include <string.h>
-//#include <conio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "keyb.h"
 #include "sound.h"
-#include "vga.h"
+#include "render.h"
 #include "memory.h"
-#include "files.h"
 #include "error.h"
 #include "config.h"
+#include "music.h"
 
-#include <SDL.h>
+void logo (const char *s, ...) {
+  va_list ap;
+  int x, y;
+  va_start(ap, s);
+  vprintf(s, ap);
+  va_end(ap);
+  fflush(stdout);
+}
 
+void logo_gas (int cur, int all) {
+  // stub
+}
 
-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);
@@ -58,17 +66,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)))