ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2long _ftol (double); /* defined by VC6 C libs */
3long _ftol2 (double dblSource) { return _ftol (dblSource); }
4# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
5# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
6# include <malloc.h> 4# include <malloc.h>
7# include <windows.h> 5# include <windows.h>
8# include <wininet.h> 6# include <wininet.h>
9# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
10#endif 9#endif
11 10
12#include "EXTERN.h" 11#include "EXTERN.h"
13#include "perl.h" 12#include "perl.h"
14#include "XSUB.h" 13#include "XSUB.h"
15 14
16#ifdef _WIN32 15#ifdef _WIN32
17# undef pipe 16# undef pipe
18#endif 17#endif
19 18
19#include <assert.h>
20#include <math.h> 20#include <math.h>
21#include <string.h> 21#include <string.h>
22#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h> 23#include <stdlib.h>
24 24
… …
39# include <sys/types.h> 39# include <sys/types.h>
40# include <sys/socket.h> 40# include <sys/socket.h>
41# include <netinet/in.h> 41# include <netinet/in.h>
42# include <netinet/tcp.h> 42# include <netinet/tcp.h>
43# include <inttypes.h> 43# include <inttypes.h>
44#else
45 typedef unsigned char uint8_t;
46 typedef unsigned short uint16_t;
47 typedef unsigned int uint32_t;
48 typedef signed char int8_t;
49 typedef signed short int16_t;
50 typedef signed int int32_t;
51#endif 44#endif
52 45
53#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
54 47
55#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
56 49
57#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
58#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
162 155
163 *w = rect.width; 156 *w = rect.width;
164 *h = rect.height; 157 *h = rect.height;
165} 158}
166 159
160typedef uint16_t tileid;
167typedef uint16_t mapface; 161typedef uint16_t faceid;
168 162
169typedef struct { 163typedef struct {
170 GLint name; 164 int name;
171 int w, h; 165 int w, h;
172 float s, t; 166 float s, t;
173 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
174} maptex; 168} maptex;
175 169
176typedef struct { 170typedef struct {
177 uint32_t player; 171 uint32_t player;
178 mapface face[3]; 172 tileid tile[3];
179 uint16_t darkness; 173 uint16_t darkness;
180 uint8_t stat_width, stat_hp, flags; 174 uint8_t stat_width, stat_hp, flags;
181} mapcell; 175} mapcell;
182 176
183typedef struct { 177typedef struct {
… …
186} maprow; 180} maprow;
187 181
188typedef struct map { 182typedef struct map {
189 int x, y, w, h; 183 int x, y, w, h;
190 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
191 int faces; 185 int faces; tileid *face2tile; // [faceid]
192 mapface *face; 186 int texs; maptex *tex; // [tileid]
193
194 int texs;
195 maptex *tex;
196 187
197 int32_t rows; 188 int32_t rows;
198 maprow *row; 189 maprow *row;
199} *CFPlus__Map; 190} *CFPlus__Map;
200 191
… …
220 return ptr; 211 return ptr;
221} 212}
222 213
223#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 214#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
224#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216
217static void
218need_facenum (struct map *self, faceid face)
219{
220 while (self->faces <= face)
221 {
222 Append (tileid, self->face2tile, self->faces, self->faces);
223 self->faces *= 2;
224 }
225}
226
227static void
228need_texid (struct map *self, int texid)
229{
230 while (self->texs <= texid)
231 {
232 Append (maptex, self->tex, self->texs, self->texs);
233 self->texs *= 2;
234 }
235}
225 236
226static maprow * 237static maprow *
227map_get_row (CFPlus__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
228{ 239{
229 if (0 > y) 240 if (0 > y)
… …
367 n |= n >> 16; 378 n |= n >> 16;
368 379
369 return n + 1; 380 return n + 1;
370} 381}
371 382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
372MODULE = CFPlus PACKAGE = CFPlus 387MODULE = CFPlus PACKAGE = CFPlus
373 388
374PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
375 390
376BOOT: 391BOOT:
… …
379 static const struct { 394 static const struct {
380 const char *name; 395 const char *name;
381 IV iv; 396 IV iv;
382 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
383# define const_iv(name) { # name, (IV)name } 398# define const_iv(name) { # name, (IV)name }
399 const_iv (SDLK_MODIFIER_MIN),
400 const_iv (SDLK_MODIFIER_MAX),
401
384 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
385 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
386 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
387 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
388 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
397 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
398 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
399 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
400 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
401 const_iv (SDL_USEREVENT), 419 const_iv (SDL_USEREVENT),
420
421 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE),
424
402 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
403 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
404 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
405 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
406 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
461 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
462 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
463 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
464 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
465 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
466 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
467 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
468 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
469 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
470 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
471 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
472 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
473 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
474 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
475 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
476 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
477 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
478 const_iv (KMOD_CTRL),
479 const_iv (KMOD_SHIFT),
480 const_iv (KMOD_ALT),
481 const_iv (KMOD_META)
482# undef const_iv 506# undef const_iv
483 }; 507 };
484 508
485 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 509 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
486 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
511
512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
487} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
488 521
489int 522int
490in_destruct () 523in_destruct ()
491 CODE: 524 CODE:
492 RETVAL = PL_main_cv == Nullcv; 525 RETVAL = PL_main_cv == Nullcv;
… …
595 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
596 case SDL_KEYUP: 629 case SDL_KEYUP:
597 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
598 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
599 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 632 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
633 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
600 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
601 break; 635 break;
602 636
603 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
604 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
796 _exit (1); 830 _exit (1);
797 831
798void 832void
799_exit (int retval = 0) 833_exit (int retval = 0)
800 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
801 _exit (retval); 838 _exit (retval);
839#endif
802 840
803MODULE = CFPlus PACKAGE = CFPlus::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
804 842
805CFPlus::Font 843CFPlus::Font
806new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
… …
1053xy_to_index (CFPlus::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
1054 CODE: 1092 CODE:
1055{ 1093{
1056 int index, trailing; 1094 int index, trailing;
1057 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1058 RETVAL = index; 1096 RETVAL = index + trailing;
1059} 1097}
1060 OUTPUT: 1098 OUTPUT:
1061 RETVAL 1099 RETVAL
1062 1100
1063void 1101void
… …
1069 1107
1070 EXTEND (SP, 3); 1108 EXTEND (SP, 3);
1071 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1109 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1072 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1073 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1112}
1113
1114void
1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1116 PPCODE:
1117{
1118 int line, x;
1119
1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1122
1123 EXTEND (SP, 2);
1124 PUSHs (sv_2mortal (newSViv (line - 1)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126}
1127
1128void
1129line_x_to_index (CFPlus::Layout self, int line, int x)
1130 PPCODE:
1131{
1132 PangoLayoutLine *lp;
1133 int index, trailing;
1134
1135 if (line < 0)
1136 XSRETURN_EMPTY;
1137
1138 if (!(lp = pango_layout_get_line (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */
1140
1141 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1142
1143 EXTEND (SP, 2);
1144 if (GIMME_V == G_SCALAR)
1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
1146 else
1147 {
1148 PUSHs (sv_2mortal (newSViv (index)));
1149 PUSHs (sv_2mortal (newSViv (trailing)));
1150 }
1074} 1151}
1075 1152
1076void 1153void
1077render (CFPlus::Layout self, float x, float y, int flags = 0) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1078 PPCODE: 1155 PPCODE:
… …
1172} 1249}
1173 1250
1174MODULE = CFPlus PACKAGE = CFPlus::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1175 1252
1176CFPlus::Map 1253CFPlus::Map
1177new (SV *class, int map_width, int map_height) 1254new (SV *class)
1178 CODE: 1255 CODE:
1179 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1180 RETVAL->x = 0; 1257 RETVAL->x = 0;
1181 RETVAL->y = 0; 1258 RETVAL->y = 0;
1182 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1183 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1184 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1185 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1186 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1187 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1188 RETVAL->texs = 8192;
1189 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1190 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1191 RETVAL->row = 0; 1266 RETVAL->row = 0;
1192 OUTPUT: 1267 OUTPUT:
1193 RETVAL 1268 RETVAL
1194 1269
1195void 1270void
1196DESTROY (CFPlus::Map self) 1271DESTROY (CFPlus::Map self)
1197 CODE: 1272 CODE:
1198{ 1273{
1199 map_clear (self); 1274 map_clear (self);
1200 Safefree (self->face); 1275 Safefree (self->face2tile);
1201 Safefree (self->tex); 1276 Safefree (self->tex);
1202 Safefree (self); 1277 Safefree (self);
1203} 1278}
1204 1279
1205void 1280void
1281resize (CFPlus::Map self, int map_width, int map_height)
1282 CODE:
1283 self->w = map_width;
1284 self->h = map_height;
1285
1286void
1206clear (CFPlus::Map self) 1287clear (CFPlus::Map self)
1207 CODE: 1288 CODE:
1208 map_clear (self); 1289 map_clear (self);
1209 1290
1210void 1291void
1211set_face (CFPlus::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1212 CODE: 1293 CODE:
1213{ 1294{
1214 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1215 { 1296 need_texid (self, tile);
1216 Append (mapface, self->face, self->faces, self->faces);
1217 self->faces *= 2;
1218 }
1219
1220 self->face [face] = texid;
1221} 1297}
1222 1298
1223void 1299void
1224set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1300set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1225 CODE: 1301 CODE:
1226{ 1302{
1227 while (self->texs <= texid) 1303 need_texid (self, texid);
1228 {
1229 Append (maptex, self->tex, self->texs, self->texs);
1230 self->texs *= 2;
1231 }
1232 1304
1233 { 1305 {
1234 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1235 1307
1236 tex->name = name; 1308 tex->name = name;
… …
1347 cell->stat_width = 1; 1419 cell->stat_width = 1;
1348 cell->stat_hp = *data++; 1420 cell->stat_hp = *data++;
1349 } 1421 }
1350 else if (cmd == 6) // monster width 1422 else if (cmd == 6) // monster width
1351 cell->stat_width = *data++ + 1; 1423 cell->stat_width = *data++ + 1;
1352 else if (cmd == 0x47) // monster width 1424 else if (cmd == 0x47)
1353 { 1425 {
1354 if (*data == 4) 1426 if (*data == 8)
1355 ; // decode player tag 1427 ; // decode player uuid
1356 1428
1357 data += *data + 1; 1429 data += *data + 1;
1358 } 1430 }
1359 else if (cmd == 8) // cell flags 1431 else if (cmd == 8) // cell flags
1360 cell->flags = *data++; 1432 cell->flags = *data++;
… …
1369 cell->darkness = *data++ + 1; 1441 cell->darkness = *data++ + 1;
1370 } 1442 }
1371 1443
1372 if (flags & 4) 1444 if (flags & 4)
1373 { 1445 {
1374 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1446 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face);
1448 cell->tile [0] = self->face2tile [face];
1375 } 1449 }
1376 1450
1377 if (flags & 2) 1451 if (flags & 2)
1378 { 1452 {
1379 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
1380 } 1456 }
1381 1457
1382 if (flags & 1) 1458 if (flags & 1)
1383 { 1459 {
1384 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
1385 } 1463 }
1386 } 1464 }
1387 else 1465 else
1388 cell->darkness = 0; 1466 cell->darkness = 0;
1389 } 1467 }
… …
1419 { 1497 {
1420 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1421 1499
1422 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1423 { 1501 {
1424 mapface face = cell->face [z];
1425
1426 if (face)
1427 {
1428 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1429 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1430 int a1 = tex.a; 1504 int a1 = tex.a;
1431 1505
1432 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1433 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1434 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1435 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1436 }
1437 } 1510 }
1438 } 1511 }
1439 1512
1440 *map++ = (r ) 1513 *map++ = (r )
1441 | (g << 8) 1514 | (g << 8)
… …
1448} 1521}
1449 OUTPUT: 1522 OUTPUT:
1450 RETVAL 1523 RETVAL
1451 1524
1452void 1525void
1453draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1526draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1454 CODE: 1527 CODE:
1455{ 1528{
1456 int vx, vy;
1457 int x, y, z; 1529 int x, y, z;
1458 int last_name; 1530 int last_name;
1459 mapface face;
1460
1461 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1462 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1463
1464 /*
1465 int vx = self->vx = self->w >= sw
1466 ? self->x + (self->w - sw) / 2
1467 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1468
1469 int vy = self->vy = self->h >= sh
1470 ? self->y + (self->h - sh) / 2
1471 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1472 */
1473 1531
1474 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1475 1533
1476 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1477 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1480 1538
1481 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1482 1540
1483 last_name = 0; 1541 last_name = 0;
1484 1542
1543 mx += self->x;
1544 my += self->y;
1545
1485 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1486 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1487 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1488 { 1549 {
1489 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1490 1551
1491 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1492 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1493 { 1554 {
1494 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1495
1496 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1497 1557
1498 if (face && face < self->texs) 1558 if (tile)
1499 { 1559 {
1500 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1501 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1502 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1503 1563
1504 if (last_name != tex.name) 1564 if (last_name != tex.name)
1505 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1506 glEnd (); 1569 glEnd ();
1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1508 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1509 } 1572 }
1510 1573
1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1513 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1515 }
1516 1578
1517 if (cell->flags && z == 2) 1579 if (cell->flags && z == 2)
1518 {
1519 if (cell->flags & 1)
1520 { 1580 {
1581 if (cell->flags & 1)
1582 {
1521 maptex tex = self->tex [1]; 1583 maptex tex = self->tex [1];
1522 int px = (x + 1) * 32 - tex.w + 2; 1584 int px = x * T + T * 2 / 32;
1523 int py = (y + 1) * 32 - tex.h - 6; 1585 int py = y * T - T * 6 / 32;
1524 1586
1525 glEnd (); 1587 glEnd ();
1526 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1527 glBegin (GL_QUADS); 1589 glBegin (GL_QUADS);
1528 1590
1529 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1530 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1531 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1532 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1533 } 1596 }
1534 } 1597 }
1535 } 1598 }
1536 } 1599 }
1537 1600
… …
1540 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1541 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1542 1605
1543 // top layer: overlays such as the health bar 1606 // top layer: overlays such as the health bar
1544 for (y = 0; y < sh; y++) 1607 for (y = 0; y < sh; y++)
1545 if (0 <= y + vy && y + vy < self->rows) 1608 if (0 <= y + my && y + my < self->rows)
1546 { 1609 {
1547 maprow *row = self->row + (y + vy); 1610 maprow *row = self->row + (y + my);
1548 1611
1549 for (x = 0; x < sw; x++) 1612 for (x = 0; x < sw; x++)
1550 if (row->c0 <= x + vx && x + vx < row->c1) 1613 if (row->c0 <= x + mx && x + mx < row->c1)
1551 { 1614 {
1552 mapcell *cell = row->col + (x + vx - row->c0); 1615 mapcell *cell = row->col + (x + mx - row->c0);
1553 1616
1554 int px = x * 32; 1617 int px = x * T;
1555 int py = y * 32; 1618 int py = y * T;
1556 1619
1557 if (cell->stat_hp) 1620 if (cell->stat_hp)
1558 { 1621 {
1559 int width = cell->stat_width * 32; 1622 int width = cell->stat_width * T;
1560 int thick = sh / 28 + 1 + cell->stat_width; 1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1561 1624
1562 glColor3ub (0, 0, 0); 1625 glColor3ub (0, 0, 0);
1563 glRectf (px + 1, py - thick - 2, 1626 glRectf (px + 1, py - thick - 2,
1564 px + width - 1, py); 1627 px + width - 1, py);
1565 1628
… …
1631 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1632 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1633} 1696}
1634 1697
1635void 1698void
1636fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1699fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1637 PPCODE: 1700 PPCODE:
1638{ 1701{
1639 int vx, vy;
1640 int x, y; 1702 int x, y;
1641 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1642 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1643 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1644 1706
1645 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1646 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1647 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1648 1710
1649 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1650 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1651 1713
1652 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1653 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1654 { 1716 {
1655 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1656 1718
1657 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1658 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1659 { 1721 {
1660 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1661 1723
1662 darkness[y * sw4 + x] = cell->darkness 1724 darkness[y * sw4 + x] = cell->darkness
1663 ? 255 - (cell->darkness - 1) 1725 ? 255 - (cell->darkness - 1)
1664 : 255 - FOW_DARKNESS; 1726 : 255 - FOW_DARKNESS;
1665 } 1727 }
… …
1705 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1706 { 1768 {
1707 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1708 uint8_t flags = 0; 1770 uint8_t flags = 0;
1709 1771
1710 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1711 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1712 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1713 1775
1714 *data++ = flags; 1776 *data++ = flags;
1715 1777
1716 if (flags & 1) 1778 if (flags & 1)
1717 { 1779 {
1780 tileid tile = cell->tile [0];
1718 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1719 *data++ = cell->face [0]; 1782 *data++ = tile;
1720 } 1783 }
1721 1784
1722 if (flags & 2) 1785 if (flags & 2)
1723 { 1786 {
1787 tileid tile = cell->tile [1];
1724 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1725 *data++ = cell->face [1]; 1789 *data++ = tile;
1726 } 1790 }
1727 1791
1728 if (flags & 4) 1792 if (flags & 4)
1729 { 1793 {
1794 tileid tile = cell->tile [2];
1730 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1731 *data++ = cell->face [2]; 1796 *data++ = tile;
1732 } 1797 }
1733 } 1798 }
1734 else 1799 else
1735 *data++ = 0; 1800 *data++ = 0;
1736 } 1801 }
… …
1776 { 1841 {
1777 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1778 1843
1779 if (flags) 1844 if (flags)
1780 { 1845 {
1781 mapface face[3] = { 0, 0, 0 };
1782
1783 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1784 1848
1785 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1786 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1787 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1788 1852
1789 if (cell->darkness == 0) 1853 if (cell->darkness == 0)
1790 { 1854 {
1791 cell->darkness = 0; 1855 cell->darkness = 0;
1792 1856
1793 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1794 { 1858 {
1795 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1796 1860
1797 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1798 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1799 } 1868 }
1800 } 1869 }
1801 } 1870 }
1802 } 1871 }
1803 } 1872 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines