X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fsmoke.c;h=8512e482c6c3e8cca001d8436cd0cd44654517e2;hp=6ccb15a11511c6ad9297cd09d67cdd821ce3e927;hb=563dffaf02ff36da4054f937fcc9f99a072e15bf;hpb=584adc9c1911a6941ef07443a6fc6ff922d7c8ea

diff --git a/src/smoke.c b/src/smoke.c
index 6ccb15a..8512e48 100644
--- a/src/smoke.c
+++ b/src/smoke.c
@@ -24,9 +24,11 @@
 #include <stdlib.h>
 #include "view.h"
 #include "smoke.h"
+#include "game.h"
 #include "fx.h"
 #include "misc.h"
 #include "my.h"
+#include "monster.h"
 
 #define MAXSR 20
 
@@ -38,42 +40,7 @@ static int lsm;
 static void *burnsnd;
 static int burntm=0;
 
-void SMK_savegame (FILE *h) {
-  int i, n;
-  for (i = n = 0; i < MAXSMOK; ++i) {
-    if (sm[i].t) {
-      ++n;
-    }
-  }
-  myfwrite32(n, h);
-  for (i = 0; i < MAXSMOK; ++i) {
-    if (sm[i].t) {
-      myfwrite32(sm[i].x, h);
-      myfwrite32(sm[i].y, h);
-      myfwrite32(sm[i].xv, h);
-      myfwrite32(sm[i].xv, h);
-      myfwrite8(sm[i].t, h);
-      myfwrite8(sm[i].s, h);
-      myfwrite16(sm[i].o, h);
-    }
-  }
-}
-
-void SMK_loadgame (FILE *h) {
-  int i, n;
-  n = myfread32(h);
-  for (i = 0; i < n; ++i) {
-    sm[i].x = myfread32(h);
-    sm[i].y = myfread32(h);
-    sm[i].xv = myfread32(h);
-    sm[i].xv = myfread32(h);
-    sm[i].t = myfread8(h);
-    sm[i].s = myfread8(h);
-    sm[i].o = myfread16(h);
-  }
-}
-
-void SMK_init(void) {
+void SMK_init (void) {
   int i;
 
   for(i=0;i<MAXSMOK;++i) {sm[i].t=0;}
@@ -81,7 +48,7 @@ void SMK_init(void) {
   burntm=0;
 }
 
-void SMK_alloc(void) {
+void SMK_alloc (void) {
   int i;
   burnsnd=Z_getsnd("BURN");
   for(i=0;i<MAXSR;++i) {
@@ -95,7 +62,7 @@ static void inclast(void) {
   if(++lsm>=MAXSMOK) lsm=0;
 }
 
-void SMK_act(void) {
+void SMK_act (void) {
   int i,ox,oy;
   static obj_t o;
 
@@ -139,7 +106,7 @@ void SMK_act(void) {
   }
 }
 
-void SMK_add(int x,int y,int xv,int yv,byte t,byte s,short o) {
+static void SMK_add (int x, int y, int xv, int yv, byte t, byte s, short o) {
   int i;
 
   if(!Z_canfit(x>>8,(y>>8)+3,3,7)) return;
@@ -152,7 +119,7 @@ void SMK_add(int x,int y,int xv,int yv,byte t,byte s,short o) {
   inclast();
 }
 
-void SMK_gas(int x0,int y0,int xr,int yr,int xv,int yv,int k) {
+void SMK_gas (int x0, int y0, int xr, int yr, int xv, int yv, int k) {
   int i,x,y;
   static int sxv,syv;
 
@@ -168,7 +135,7 @@ void SMK_gas(int x0,int y0,int xr,int yr,int xv,int yv,int k) {
   }
 }
 
-void SMK_flame(int x0,int y0,int ox,int oy,int xr,int yr,int xv,int yv,int k,int o) {
+void SMK_flame (int x0, int y0, int ox, int oy, int xr, int yr, int xv, int yv, int k, int o) {
   int i,x,y;
   static int sxv,syv;