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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
--- a/src/hedlite.c 2006-01-28 14:05:05.000000000 -0700
+++ b/src/hedlite.c 2006-01-28 14:07:20.000000000 -0700
@@ -45,7 +45,7 @@
#include "dirname.h"
static a_pcx_image heditrsc;
-static a_pcx_image tile_set_img;
+static a_pcx_image tile_set_img_local;
unsigned short int xdalles = 0;
unsigned short int ydalles = 0;
@@ -144,9 +144,9 @@
static void
copy_tile (int src_, a_pixel *dest)
{
- int i = tile_set_img.width;
+ int i = tile_set_img_local.width;
int j;
- a_pixel *src = tile_set_img.buffer + src_;
+ a_pixel *src = tile_set_img_local.buffer + src_;
for (j = 20; j > 0; j--) {
fastmem4 (src, dest, 24 >> 2);
src += i;
@@ -157,9 +157,9 @@
static void
copy_tile_pcx (int src_, a_pixel *dest)
{
- int i = tile_set_img.width;
+ int i = tile_set_img_local.width;
int j;
- a_pixel *src = tile_set_img.buffer + src_;
+ a_pixel *src = tile_set_img_local.buffer + src_;
for (j = 20; j > 0; j--) {
fastmem4 (src, dest, 24 >> 2);
src += i;
@@ -170,9 +170,9 @@
static void
copy_tile_transp (int src_, a_pixel *dest)
{
- int i = tile_set_img.width;
+ int i = tile_set_img_local.width;
int j, k;
- a_pixel *src = tile_set_img.buffer + src_;
+ a_pixel *src = tile_set_img_local.buffer + src_;
for (j = 20; j > 0; j--) {
for (k = 24; k > 0; k--) {
if (*src != 0)
@@ -188,9 +188,9 @@
static void
copy_tile_transp_pcx (int src_, a_pixel *dest)
{
- int i = tile_set_img.width;
+ int i = tile_set_img_local.width;
int j, k;
- a_pixel *src = tile_set_img.buffer + src_;
+ a_pixel *src = tile_set_img_local.buffer + src_;
for (j = 20; j > 0; j--) {
for (k = 24; k > 0; k--) {
if (*src != 0)
@@ -555,7 +555,7 @@
static void
update_middle_panel (void)
{
- rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img);
+ rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img_local);
frame (145 + xdallesdec, ydalles, 23, 19, 15);
rectangle_copy (0, 64, 30, 6, 290, 64, &heditrsc);
sprintf (nombre, "%u", (xdalles + xdallesdec) / 24);
@@ -670,7 +670,7 @@
curdalled (void)
{
int i =
- (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img.width / 24);
+ (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img_local.width / 24);
return i;
}
@@ -894,7 +894,7 @@
free (tempc);
putc (0xC, fpcx);
for (i1 = 0; i1 < 768; i1++)
- putc (tile_set_img.palette.global[i1] << 2, fpcx);
+ putc (tile_set_img_local.palette.global[i1] << 2, fpcx);
fclose (fpcx);
}
@@ -1225,7 +1225,7 @@
}
} else if (i == HK_End) {
if (mod & HK_MOD_Ctrl) {
- xdalles = (tile_set_img.width / 24) * 24 - 144;
+ xdalles = (tile_set_img_local.width / 24) * 24 - 144;
update_middle_panel ();
}
} else if (i == HK_PageDown) {
@@ -1250,7 +1250,7 @@
}
} else if (i == HK_Right) {
if (mod & HK_MOD_Ctrl) {
- if (xdalles + 168U < tile_set_img.width) {
+ if (xdalles + 168U < tile_set_img_local.width) {
xdalles += 24;
update_middle_panel ();
} else if (xdallesdec < 120) {
@@ -1337,7 +1337,7 @@
} else if (i == HK_Space) {
j = curdallep ();
level_map[j].number =
- xdalles + xdallesdec + ydalles * (tile_set_img.width);
+ xdalles + xdallesdec + ydalles * (tile_set_img_local.width);
level_map[j].type = ddef[curdalled ()].type;
level_map[j].info = ddef[curdalled ()].info;
gestclav (HK_i, HK_MOD_None);
@@ -1351,9 +1351,9 @@
level_map[j].collision[3] = 0;
}
for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) {
- k = (((level_map[j].number % tile_set_img.width) / 24) +
- (level_map[j].number / (tile_set_img.width * 20)) *
- (tile_set_img.width / 24));
+ k = (((level_map[j].number % tile_set_img_local.width) / 24) +
+ (level_map[j].number / (tile_set_img_local.width * 20)) *
+ (tile_set_img_local.width / 24));
level_map[j].type = ddef[k].type;
if (level_map[j].type != t_tunnel) {
if (level_map[j].type == t_anim || i == 0x1749)
@@ -1404,7 +1404,7 @@
if (mod & HK_MOD_Ctrl) {
for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) {
level_map[j].number = xdalles + xdallesdec +
- ydalles * (tile_set_img.width);
+ ydalles * (tile_set_img_local.width);
level_map[j].type = ddef[curdalled ()].type;
level_map[j].info = ddef[curdalled ()].info;
}
@@ -1414,7 +1414,7 @@
level_map[j].number =
(((j % hplaninfo.xt) + (j / hplaninfo.xt)) & 1) * 20 *
- tile_set_img.width;
+ tile_set_img_local.width;
update_left_panel ();
}
} else if (i == HK_F3) {
@@ -1427,7 +1427,7 @@
if (level_map[curdallep ()].sprite == 0)
level_map[curdallep ()].sprite =
- (short int) (xdalles + xdallesdec + ydalles * (tile_set_img.width));
+ (short int) (xdalles + xdallesdec + ydalles * (tile_set_img_local.width));
else
level_map[curdallep ()].sprite = 0;
update_left_panel ();
@@ -1707,17 +1707,17 @@
hplaninfo.tile_set_name), ".pie");
pcx_load_from_rsc ("editor-img", &heditrsc);
- pcx_load (tile_set_name, &tile_set_img);
+ pcx_load (tile_set_name, &tile_set_img_local);
/* read the tileset definition */
- XCALLOC_ARRAY (ddef, (tile_set_img.width / 24) * 10);
+ XCALLOC_ARRAY (ddef, (tile_set_img_local.width / 24) * 10);
if (!((ftmp = fopen (dallepie, "rb")) == NULL))
- fread (ddef, sizeof (a_tile_info), (tile_set_img.width / 24) * 10, ftmp);
+ fread (ddef, sizeof (a_tile_info), (tile_set_img_local.width / 24) * 10, ftmp);
fclose (ftmp);
outwayinit ();
XCALLOC_ARRAY (hedit_buffer, xbuf * 200);
- set_pal (tile_set_img.palette.global, 0, 256 * 3);
+ set_pal (tile_set_img_local.palette.global, 0, 256 * 3);
rectangle_copy (0, 0, 30, 200, 290, 0, &heditrsc);
strupr (levelnomshort);
draw_text (levelnomshort, 305, 29, 8, 1);
@@ -1767,7 +1767,7 @@
free (ddef);
free (level_map);
img_free (&heditrsc);
- img_free (&tile_set_img);
+ img_free (&tile_set_img_local);
}
free (dallepie);
|
GitWeb