diff --git a/src/error.c b/src/error.c
index 8c8eee9d4890a3f8956a73224b3ab117ee4bc53e..46e5c43cea014cab78405de663aa4c6c7f03958f 100644 (file)
--- a/src/error.c
+++ b/src/error.c
#include "glob.h"
#include <stdio.h>
#include <string.h>
#include "glob.h"
#include <stdio.h>
#include <string.h>
-//#include <conio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdlib.h>
-#include <malloc.h>
#include "keyb.h"
#include "sound.h"
#include "keyb.h"
#include "sound.h"
-#include "vga.h"
+#include "render.h"
#include "memory.h"
#include "memory.h"
-#include "files.h"
#include "error.h"
#include "config.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();
S_done();
S_donemusic();
K_done();
- V_done();
+ R_done();
M_shutdown();
}
M_shutdown();
}
-void ERR_failinit(char *s,...) {
+void ERR_failinit (char *s, ...) {
va_list ap;
va_list ap;
-
close_all();
close_all();
- va_start(ap,s);
- vprintf(s,ap);
+ va_start(ap, s);
+ vprintf(s, ap);
va_end(ap);
puts("");
exit(1);
va_end(ap);
puts("");
exit(1);
void ERR_fatal(char *s,...) {
va_list ap;
void ERR_fatal(char *s,...) {
va_list ap;
-
close_all();
puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
close_all();
puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
- va_start(ap,s);
- vprintf(s,ap);
+ va_start(ap, s);
+ vprintf(s, ap);
va_end(ap);
puts("");
exit(2);
}
va_end(ap);
puts("");
exit(2);
}
-void ERR_quit(void) {
+void ERR_quit (void) {
void *p;
//V_done();
//if(!(p=malloc(4000)))
void *p;
//V_done();
//if(!(p=malloc(4000)))