diff --git a/src/my.c b/src/my.c
index 72f444d98c7211b83dcdff5f702d8565141e6183..a966eb8b697aab420f65e938f0d924865ec25497 100644 (file)
--- a/src/my.c
+++ b/src/my.c
#include <SDL.h>
#include "glob.h"
-#include "keyb.h"
#include "error.h"
+#include "misc.h"
#include <stdio.h>
+#include <stdint.h>
+#include <assert.h>
-void mysplitpath(const char* path, char* drv, char* dir, char* name, char* ext)
-{
+void mysplitpath(const char* path, char* drv, char* dir, char* name, char* ext) {
const char* end; /* end of processed string */
const char* p; /* search pointer */
const char* s; /* copy pointer */
}
}
-void myfread(void *ptr, size_t n, size_t size, FILE *f) {
- if (fread(ptr,n,size,f) != size) ERR_fatal("File reading error\n");
+size_t myfreadc (void *ptr, size_t size, size_t n, FILE *f) {
+ return fread(ptr, size, n, f);
}
-size_t myfreadc(void *ptr, size_t n, size_t size, FILE *f) {
- return fread(ptr,n,size,f);
+void myfread (void *ptr, size_t size, size_t n, FILE *f) {
+ if (myfreadc(ptr, size, n, f) != n) {
+ ERR_fatal("File reading error\n");
+ }
}
-void myfwrite(void *ptr, size_t n, size_t size, FILE *f) {
- size_t s = fwrite(ptr,n,size,f);
+int8_t myfread8 (FILE *f) {
+ int8_t x;
+ myfread(&x, 1, 1, f);
+ return x;
}
-void myrandomize(void)
-{
+int16_t myfread16 (FILE *f) {
+ int16_t x;
+ myfread(&x, 2, 1, f);
+ return short2host(x);
+}
+
+int32_t myfread32 (FILE *f) {
+ int32_t x;
+ myfread(&x, 4, 1, f);
+ return int2host(x);
+}
+
+void myfwrite (void *ptr, size_t size, size_t n, FILE *f) {
+ assert(fwrite(ptr, size, n, f) == n);
+}
+
+void myfwrite8 (int8_t x, FILE *f) {
+ myfwrite(&x, 1, 1, f);
+}
+
+void myfwrite16 (int16_t x, FILE *f) {
+ x = short2host(x);
+ myfwrite(&x, 2, 1, f);
+}
+
+void myfwrite32 (int32_t x, FILE *f) {
+ x = int2host(x);
+ myfwrite(&x, 4, 1, f);
+}
+
+void myrandomize (void) {
srand(SDL_GetTicks());
}
+
+int fexists (char *filename) {
+ FILE *f;
+ if ((f = fopen(filename, "r")))
+ {
+ fclose(f);
+ return 1;
+ }
+ return 0;
+}