X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ffx.c;h=2b81fd652610230a8331ca015dc1e86be90ccc92;hb=c46b82f5794be555af272740e67ead316b9b1f90;hp=8a38050cf9bfc7789bae981efaa0e6791fe09298;hpb=8fb3d3f767b8e5d094e8bcbee350f4d16ab17c5a;p=flatwaifu.git

diff --git a/src/fx.c b/src/fx.c
index 8a38050..2b81fd6 100644
--- a/src/fx.c
+++ b/src/fx.c
@@ -27,6 +27,7 @@
 #include "view.h"
 #include "fx.h"
 #include "misc.h"
+#include "my.h"
 
 enum{NONE,TFOG,IFOG,BUBL};
 
@@ -104,19 +105,37 @@ static void init_fx1sin(void) {
   }
 }
 
-void FX_savegame(FILE* h) {
-  int i,n;
-
-  for(i=n=0;i<MAXFX;++i) if(fx[i].t) ++n;
-  myfwrite(&n,1,4,h);
-  for(i=0;i<MAXFX;++i) if(fx[i].t) myfwrite(&fx[i],1,sizeof(fx_t),h);
+void FX_savegame (FILE *h) {
+  int i, n;
+  for (i = n = 0; i < MAXFX; ++i) {
+    if (fx[i].t) {
+      ++n;
+    }
+  }
+  myfwrite32(n, h);
+  for (i = 0; i < MAXFX; ++i) {
+    if (fx[i].t) {
+      myfwrite32(fx[i].x, h);
+      myfwrite32(fx[i].y, h);
+      myfwrite32(fx[i].xv, h);
+      myfwrite32(fx[i].yv, h);
+      myfwrite8(fx[i].t, h);
+      myfwrite8(fx[i].s, h);
+    }
+  }
 }
 
-void FX_loadgame(FILE* h) {
-  int n;
-
-  myfread(&n,1,4,h);
-  myfread(fx,1,n*sizeof(fx_t),h);
+void FX_loadgame (FILE *h) {
+  int i, n;
+  n = myfread32(h);
+  for (i = 0; i < n; i++) {
+    fx[i].x = myfread32(h);
+    fx[i].y = myfread32(h);
+    fx[i].xv = myfread32(h);
+    fx[i].yv = myfread32(h);
+    fx[i].t = myfread8(h);
+    fx[i].s = myfread8(h);
+  }
 }
 
 void FX_alloc(void) {