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

diff --git a/src/my.c b/src/my.c
index e4c2d45..b3eb964 100644
--- a/src/my.c
+++ b/src/my.c
@@ -1,34 +1,29 @@
-/*
-   Copyright (C) Prikol Software 1996-1997
-   Copyright (C) Aleksey Volynskov 1996-1997
-   Copyright (C) <ARembo@gmail.com> 2011
+/* Copyright (C) 1996-1997 Aleksey Volynskov
+ * Copyright (C) 2011 Rambo
+ * Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-   This file is part of the Doom2D:Rembo project.
 
-   Doom2D:Rembo is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-   Doom2D:Rembo is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/> or
-   write to the Free Software Foundation, Inc.,
-   51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-*/
-
-#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 */
@@ -85,50 +80,52 @@ size_t myfreadc (void *ptr, size_t size, size_t n, FILE *f) {
 }
 
 void myfread (void *ptr, size_t size, size_t n, FILE *f) {
+#if 1
+  myfreadc(ptr, size, n, f);
+#else
   if (myfreadc(ptr, size, n, f) != n) {
-    ERR_fatal("File reading error\n");
+    ERR_fatal("File reading error (readed %u, required %u)\n", m, n);
   }
+#endif
 }
 
-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)
-{
-    srand(SDL_GetTicks());
-}
-
-int fexists(char * filename)
-{
+int fexists (char *filename) {
     FILE *f;
     if ((f = fopen(filename, "r")))
     {
@@ -136,4 +133,4 @@ int fexists(char * filename)
         return 1;
     }
     return 0;
-}
\ No newline at end of file
+}