portability: remove pragma pack

diff --git a/src/dots.h b/src/dots.h
index 5a8b75204934b086549e8a4bea4848de82bae1ce..c3a930aa1529840656def5f12405e6f7e2663d90 100644 (file)
--- a/src/dots.h
+++ b/src/dots.h
@@ -28,12 +28,10 @@
 
 #define MAXDOT 400
 
-#pragma pack(1)
 typedef struct {
   obj_t o;
   byte c, t;
 } dot_t;
-#pragma pack()
 
 extern dot_t dot[MAXDOT];
 

diff --git a/src/fx.h b/src/fx.h
index 5d2e4a7d6e44613c3ee2ea729db328001aa1bfa1..2ec7ff468a0ad15a93341f03dba25063b093980b 100644 (file)
--- a/src/fx.h
+++ b/src/fx.h
@@ -26,12 +26,10 @@
 
 #define MAXFX 300
 
-#pragma pack(1)
 typedef struct {
   int x, y, xv, yv;
   char t, s;
 } fx_t;
-#pragma pack()
 
 extern fx_t fx[MAXFX];
 

diff --git a/src/items.h b/src/items.h
index bf3bb8a1f6c5e6df034701a6bd68ad5d47c023e4..c2be467f83556b6fe20478c32424c37a2bf2075d 100644 (file)
--- a/src/items.h
+++ b/src/items.h
@@ -34,13 +34,11 @@ enum {
   I_RTORCH, I_GTORCH, I_BTORCH, I_GOR1, I_FCAN, I_GUN2
 };
 
-#pragma pack(1)
 typedef struct {
   obj_t o;
   int t;
   int s;
 } item_t;
-#pragma pack()
 
 extern item_t it[MAXITEM];
 extern int itm_rtime;

diff --git a/src/map.h b/src/map.h
index e0afb717c85072f27cc39ef43eabc7d8caed93d9..e630ff023afc993c6114e9adb45661c2ddd47b39 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -38,8 +38,6 @@
 #ifndef MAP_H_INCLUDED
 #define MAP_H_INCLUDED
 
-#pragma pack(1)
-
 /* Старый формат - версия 1.04 alpha (и раньше)
 
   названия текстур (old_wall_t)
@@ -174,6 +172,4 @@ typedef struct{
 
 #define LAST_MAP_VER 2 // Самая последняя версия карты
 
-#pragma pack()
-
 #endif /* MAP_H_INCLUDED */

diff --git a/src/monster.h b/src/monster.h
index 98534b3f21739ac530842ab720573435d055617c..022962f9bf042c9ed6cf411a4028e0a68904745a 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -38,7 +38,6 @@ enum {
 
 #define MN_TN (MN__LAST-MN_DEMON)
 
-#pragma pack(1)
 typedef struct {
   obj_t o;
   byte t, d, st, ftime;
@@ -48,7 +47,6 @@ typedef struct {
   int aim, life, pain, ac, tx, ty, ammo;
   short atm;
 } mn_t;
-#pragma pack(0)
 
 extern byte nomon;
 extern int hit_xv, hit_yv;

diff --git a/src/player.c b/src/player.c
index ecb8b9eb7da879cff18036d1d3850c1b278a147c..2d781a33716c1c36f7fb29154749b485fb3698bd 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -68,13 +68,6 @@ byte plr_goanim[]="BDACDA";
 byte plr_dieanim[]="HHHHIIIIJJJJKKKKLLLLMMMM";
 byte plr_slopanim[]="OOPPQQRRSSTTUUVVWW";
 
-
-#pragma pack(1)
-struct {
-    int ku,kd,kl,kr,kf,kj,kwl,kwr,kp;
-} _keys;
-#pragma pack()
-
 static void PL_save_player (player_t *p, FILE *h) {
   myfwrite32(p->o.x, h);
   myfwrite32(p->o.y, h);

diff --git a/src/player.h b/src/player.h
index db4f992250f10d0e141008a150fb383ab1e7cc5e..48c49abd25f7d7b88b53e79b34f9488f8419e6b2 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -54,7 +54,6 @@
 #define PL_AIR 360
 #define PL_POWERUP_TIME 546
 
-#pragma pack(1)
 typedef struct {
   obj_t o;
   int looky;
@@ -76,7 +75,6 @@ typedef struct {
   char lives;
   int ku, kd, kl, kr, kf, kj, kwl, kwr, kp;
 } player_t;
-#pragma pack()
 
 extern byte p_immortal;
 extern byte p_fly;

diff --git a/src/smoke.h b/src/smoke.h
index 8ba0a0f36de8351e9b8ed259ff7a3f75a43178ec..f68ae94f5da30edf14a992f6e104de17647af1bf 100644 (file)
--- a/src/smoke.h
+++ b/src/smoke.h
@@ -30,13 +30,11 @@
 #define SMSN 10
 #define FLSN 8
 
-#pragma pack(1)
 typedef struct {
   int x, y, xv, yv;
   byte t, s;
   short o;
 } smoke_t;
-#pragma pack()
 
 extern smoke_t sm[MAXSMOK];
 

diff --git a/src/switch.c b/src/switch.c
index b04c3033119b5c81ba7480b07829fe21f69a125c..5eebc2d7d5af164406fd0ef6af2784fe194783d8 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -35,14 +35,12 @@
 
 #define MAXSW 100
 
-#pragma pack(1)
 typedef struct {
   byte x, y;
   byte t, tm;
   byte a, b, c, d;
   byte f;
 } sw_t;
-#pragma pack()
 
 int sw_secrets;
 

diff --git a/src/view.h b/src/view.h
index 33eacd2f4a717ffbada6dc51653297c6f5d763de..6b70fdd1dce3f9a9cf8c56f614bda1a70b24b0d6 100644 (file)
--- a/src/view.h
+++ b/src/view.h
@@ -42,7 +42,6 @@ enum {
   GS_BVIDEO, GS_EVIDEO, GS_END3ANIM
 };
 
-#pragma pack(1)
 typedef struct {
   int x, y;            // coordinates
   int xv, yv;          // velocity
@@ -59,7 +58,6 @@ typedef struct {
   char n[8];
   char t;
 } wall_t;
-#pragma pack()
 
 extern byte w_horiz;
 extern int sky_type;

diff --git a/src/weapons.h b/src/weapons.h
index 0939b317becccc2184ce4c0cf63591cb386b65c2..fc4f7a3cec3603640374181b7bc4695a8d9fef24 100644 (file)
--- a/src/weapons.h
+++ b/src/weapons.h
@@ -26,14 +26,12 @@
 
 #define MAXWPN 300
 
-#pragma pack(1)
 typedef struct {
   obj_t o;
   byte t, s;
   int own;
   short target;
 } weapon_t;
-#pragma pack()
 
 extern weapon_t wp[MAXWPN];