summaryrefslogtreecommitdiff
blob: bf03ff424e2fdb27a1d5d409668f68ea85936bc9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
--- a/bot.c
+++ b/bot.c
@@ -104,7 +104,7 @@
 
 /* objects */
 struct object_list objects;
-struct object_list *last_obj;
+extern struct object_list *last_obj;
 struct it* hero;
 
 unsigned long_long game_start_offset; /* time difference between game start on this machine and on server */
--- a/client.c
+++ b/client.c
@@ -97,7 +97,7 @@
 
 /* objects */
 struct object_list objects;
-struct object_list *last_obj;
+extern struct object_list *last_obj;
 struct it* hero;
 
 /* important sprites */
--- a/data.c
+++ b/data.c
@@ -13,6 +13,9 @@
 #include "md5.h"
 #include "error.h"
 
+unsigned char *weapon_name[ARMS];
+struct obj_attr_type obj_attr[N_TYPES];
+struct weapon_type weapon[ARMS];
 
 #ifdef TRI_D
 int tri_d=0;
--- a/data.h
+++ b/data.h
@@ -62,7 +62,7 @@
 
 #define ARMS 5
 
-unsigned char *weapon_name[ARMS];
+extern unsigned char *weapon_name[ARMS];
 
 /* STATUS
 0: walk
@@ -91,7 +91,8 @@
 		      bit 1=server updates
 		      bit 2=server sends updates to clients
 		      */
-}obj_attr[N_TYPES];
+};
+extern struct obj_attr_type obj_attr[N_TYPES];
 
 
 /* weapon attribut table */
@@ -107,7 +108,8 @@
 	unsigned char add_ammo;
 	unsigned char max_ammo;
 	my_double shell_xspeed,shell_yspeed;
-}weapon[ARMS];
+};
+extern struct weapon_type weapon[ARMS];
 
 
 /* object in the game */
--- a/editor.c
+++ b/editor.c
@@ -26,7 +26,7 @@
 int oldx=0,oldy=0;  /* old cursor position */
 
 struct object_list objects;
-struct object_list *last_obj;
+extern struct object_list *last_obj;
 int level_number;
 
 
--- a/server.c
+++ b/server.c
@@ -100,7 +100,7 @@
 struct object_list objects;
 
 struct player_list *last_player;
-struct object_list *last_obj;
+extern struct object_list *last_obj;
 
 
 #ifdef WIN32