Rev 298 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 298 | Rev 333 | ||
|---|---|---|---|
| Line 30... | Line 30... | ||
| 30 | #include "doomdef.h" |
30 | #include "doomdef.h" |
| Line 31... | Line 31... | ||
| 31 | 31 | ||
| 32 | #include "z_zone.h" |
32 | #include "z_zone.h" |
| Line -... | Line 33... | ||
| - | 33 | #include "v_video.h" |
|
| - | 34 | ||
| 33 | #include "v_video.h" |
35 | #include "m_swap.h" |
| Line 34... | Line 36... | ||
| 34 | 36 | ||
| Line 35... | Line 37... | ||
| 35 | #include "i_system.h" |
37 | #include "i_system.h" |
| Line 92... | Line 94... | ||
| 92 | { |
94 | { |
| Line 93... | Line 95... | ||
| 93 | 95 | ||
| 94 | int numdigits = n->width; |
96 | int numdigits = n->width; |
| Line 95... | Line 97... | ||
| 95 | int num = *n->num; |
97 | int num = *n->num; |
| 96 | 98 | ||
| 97 | int w = (n->p[0]->width); |
99 | int w = SHORT(n->p[0]->width); |
| Line 98... | Line 100... | ||
| 98 | int h = (n->p[0]->height); |
100 | int h = SHORT(n->p[0]->height); |
| Line 99... | Line 101... | ||
| 99 | int x = n->x; |
101 | int x = n->x; |
| Line 220... | Line 222... | ||
| 220 | && (mi->oldinum != *mi->inum || refresh) |
222 | && (mi->oldinum != *mi->inum || refresh) |
| 221 | && (*mi->inum!=-1)) |
223 | && (*mi->inum!=-1)) |
| 222 | { |
224 | { |
| 223 | if (mi->oldinum != -1) |
225 | if (mi->oldinum != -1) |
| 224 | { |
226 | { |
| 225 | x = mi->x - (mi->p[mi->oldinum]->leftoffset); |
227 | x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset); |
| 226 | y = mi->y - (mi->p[mi->oldinum]->topoffset); |
228 | y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset); |
| 227 | w = (mi->p[mi->oldinum]->width); |
229 | w = SHORT(mi->p[mi->oldinum]->width); |
| 228 | h = (mi->p[mi->oldinum]->height); |
230 | h = SHORT(mi->p[mi->oldinum]->height); |
| Line 229... | Line 231... | ||
| 229 | 231 | ||
| 230 | if (y - ST_Y < 0) |
232 | if (y - ST_Y < 0) |
| Line 231... | Line 233... | ||
| 231 | I_Error("updateMultIcon: y - ST_Y < 0"); |
233 | I_Error("updateMultIcon: y - ST_Y < 0"); |
| Line 269... | Line 271... | ||
| 269 | int h; |
271 | int h; |
| Line 270... | Line 272... | ||
| 270 | 272 | ||
| 271 | if (*bi->on |
273 | if (*bi->on |
| 272 | && (bi->oldval != *bi->val || refresh)) |
274 | && (bi->oldval != *bi->val || refresh)) |
| 273 | { |
275 | { |
| 274 | x = bi->x - (bi->p->leftoffset); |
276 | x = bi->x - SHORT(bi->p->leftoffset); |
| 275 | y = bi->y - (bi->p->topoffset); |
277 | y = bi->y - SHORT(bi->p->topoffset); |
| 276 | w = (bi->p->width); |
278 | w = SHORT(bi->p->width); |
| Line 277... | Line 279... | ||
| 277 | h = (bi->p->height); |
279 | h = SHORT(bi->p->height); |
| 278 | 280 | ||
| Line 279... | Line 281... | ||
| 279 | if (y - ST_Y < 0) |
281 | if (y - ST_Y < 0) |