X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmy.c;h=a966eb8b697aab420f65e938f0d924865ec25497;hb=2bb81ea2565c3627c954b5c37326db89b0048472;hp=e4c2d459dd0b728dc02ea691e91942e1cb631990;hpb=da79be9b6a4134aa9cd19e6f5909fedb20d318cb;p=flatwaifu.git

diff --git a/src/my.c b/src/my.c
index e4c2d45..a966eb8 100644
--- a/src/my.c
+++ b/src/my.c
@@ -23,12 +23,12 @@
 #include <SDL.h>
 #include "glob.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 */
@@ -90,45 +90,47 @@ void myfread (void *ptr, size_t size, size_t n, FILE *f) {
   }
 }
 
-void myfread8 (uint8_t *x, FILE *f) {
-  myfread(x, 1, 1, f);
+int8_t myfread8 (FILE *f) {
+  int8_t x;
+  myfread(&x, 1, 1, f);
+  return x;
 }
 
-void myfread16 (uint16_t *x, FILE *f) {
-  myfread(x, 2, 1, f);
-  *x = short2host(*x);
+int16_t myfread16 (FILE *f) {
+  int16_t x;
+  myfread(&x, 2, 1, f);
+  return short2host(x);
 }
 
-void myfread32 (uint32_t *x, FILE *f) {
-  myfread(x, 4, 1, f);
-  *x = int2host(*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 (uint8_t x, FILE *f) {
+void myfwrite8 (int8_t x, FILE *f) {
   myfwrite(&x, 1, 1, f);
 }
 
-void myfwrite16 (uint16_t x, FILE *f) {
+void myfwrite16 (int16_t x, FILE *f) {
   x = short2host(x);
   myfwrite(&x, 2, 1, f);
 }
 
-void myfwrite32 (uint32_t x, FILE *f) {
+void myfwrite32 (int32_t x, FILE *f) {
   x = int2host(x);
   myfwrite(&x, 4, 1, f);
 }
 
-void myrandomize(void)
-{
+void myrandomize (void) {
     srand(SDL_GetTicks());
 }
 
-int fexists(char * filename)
-{
+int fexists (char *filename) {
     FILE *f;
     if ((f = fopen(filename, "r")))
     {
@@ -136,4 +138,4 @@ int fexists(char * filename)
         return 1;
     }
     return 0;
-}
\ No newline at end of file
+}