X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fdots.c;h=af54e3a612ad523d940533a34e636635f990164b;hb=584adc9c1911a6941ef07443a6fc6ff922d7c8ea;hp=4f52130d53b46eec45097304ad53a25c6b963373;hpb=da79be9b6a4134aa9cd19e6f5909fedb20d318cb;p=flatwaifu.git

diff --git a/src/dots.c b/src/dots.c
index 4f52130..af54e3a 100644
--- a/src/dots.c
+++ b/src/dots.c
@@ -22,10 +22,10 @@
 
 #include "glob.h"
 #include <stdlib.h>
-#include "vga.h"
 #include "view.h"
 #include "dots.h"
 #include "misc.h"
+#include "my.h"
 
 #define MAXINI 50
 #define MAXSR 20
@@ -41,19 +41,13 @@
 
 extern byte z_dot;
 
-#pragma pack(1)
-typedef struct{
-  obj_t o;
-  byte c,t;
-}dot_t;
-#pragma pack()
-
 typedef struct{
   int xv,yv;
   byte c,t;
 }init_t;
 
-static dot_t dot[MAXDOT];
+dot_t dot[MAXDOT];
+
 static init_t bl_ini[MAXINI],sp_ini[MAXINI];
 static int bl_r,sp_r,sr_r,sxr[MAXSR],syr[MAXSR];
 static int ldot;
@@ -84,18 +78,18 @@ void DOT_savegame (FILE *h) {
 
 void DOT_loadgame (FILE *h) {
   int i, n;
-  myfread32(&n, h);
+  n = myfread32(h);
   for (i = 0; i < n; i++) {
-    myfread32(&dot[i].o.x, h);
-    myfread32(&dot[i].o.y, h);
-    myfread32(&dot[i].o.xv, h);
-    myfread32(&dot[i].o.yv, h);
-    myfread32(&dot[i].o.vx, h);
-    myfread32(&dot[i].o.vy, h);
-    myfread32(&dot[i].o.r, h);
-    myfread32(&dot[i].o.h, h);
-    myfread8(&dot[i].c, h);
-    myfread8(&dot[i].t, h);
+    dot[i].o.x = myfread32(h);
+    dot[i].o.y = myfread32(h);
+    dot[i].o.xv = myfread32(h);
+    dot[i].o.yv = myfread32(h);
+    dot[i].o.vx = myfread32(h);
+    dot[i].o.vy = myfread32(h);
+    dot[i].o.r = myfread32(h);
+    dot[i].o.h = myfread32(h);
+    dot[i].c = myfread8(h);
+    dot[i].t = myfread8(h);
   }
 }
 
@@ -163,13 +157,6 @@ void DOT_act(void) {
   z_dot=0;
 }
 
-void DOT_draw(void) {
-  int i;
-
-  for(i=0;i<MAXDOT;++i)
-    if(dot[i].t) V_dot(dot[i].o.x-w_x+WD/2,dot[i].o.y-w_y+HT/2+1+w_o,dot[i].c);//if(dot[i].t) V_dot(dot[i].o.x-w_x+100,dot[i].o.y-w_y+50+w_o,dot[i].c);
-}
-
 void DOT_add(int x,int y,char xv,char yv,byte c,byte t) {
   int i;