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.153 by root, Tue Sep 19 22:02:38 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
7#endif 9#endif
8 10
9#include "EXTERN.h" 11#include "EXTERN.h"
10#include "perl.h" 12#include "perl.h"
11#include "XSUB.h" 13#include "XSUB.h"
12 14
13#ifdef _WIN32 15#ifdef _WIN32
14# undef pipe 16# undef pipe
15#endif 17#endif
16 18
19#include <assert.h>
17#include <math.h> 20#include <math.h>
18#include <string.h> 21#include <string.h>
19#include <stdio.h> 22#include <stdio.h>
20#include <stdlib.h> 23#include <stdlib.h>
21 24
… …
36# include <sys/types.h> 39# include <sys/types.h>
37# include <sys/socket.h> 40# include <sys/socket.h>
38# include <netinet/in.h> 41# include <netinet/in.h>
39# include <netinet/tcp.h> 42# include <netinet/tcp.h>
40# include <inttypes.h> 43# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 44#endif
49 45
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 47
52#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
53 49
54#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
159 155
160 *w = rect.width; 156 *w = rect.width;
161 *h = rect.height; 157 *h = rect.height;
162} 158}
163 159
160typedef uint16_t tileid;
164typedef uint16_t mapface; 161typedef uint16_t faceid;
165 162
166typedef struct { 163typedef struct {
167 GLint name; 164 int name;
168 int w, h; 165 int w, h;
169 float s, t; 166 float s, t;
170 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
171} maptex; 168} maptex;
172 169
173typedef struct { 170typedef struct {
174 uint32_t player; 171 uint32_t player;
175 mapface face[3]; 172 tileid tile[3];
176 uint16_t darkness; 173 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 174 uint8_t stat_width, stat_hp, flags;
178} mapcell; 175} mapcell;
179 176
180typedef struct { 177typedef struct {
… …
183} maprow; 180} maprow;
184 181
185typedef struct map { 182typedef struct map {
186 int x, y, w, h; 183 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 185 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 186 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 187
194 int32_t rows; 188 int32_t rows;
195 maprow *row; 189 maprow *row;
196} *CFPlus__Map; 190} *CFPlus__Map;
197 191
… …
217 return ptr; 211 return ptr;
218} 212}
219 213
220#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))
221#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}
222 236
223static maprow * 237static maprow *
224map_get_row (CFPlus__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
225{ 239{
226 if (0 > y) 240 if (0 > y)
… …
315 329
316 cell = row->col + x - row->c0; 330 cell = row->col + x - row->c0;
317 331
318 cell->darkness = 0; 332 cell->darkness = 0;
319 cell->stat_hp = 0; 333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
320 } 336 }
321 } 337 }
322} 338}
323 339
324static void 340static void
… …
361 n |= n >> 8; 377 n |= n >> 8;
362 n |= n >> 16; 378 n |= n >> 16;
363 379
364 return n + 1; 380 return n + 1;
365} 381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
366 386
367MODULE = CFPlus PACKAGE = CFPlus 387MODULE = CFPlus PACKAGE = CFPlus
368 388
369PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
370 390
… …
374 static const struct { 394 static const struct {
375 const char *name; 395 const char *name;
376 IV iv; 396 IV iv;
377 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
378# 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
379 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
380 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
381 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
382 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
383 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
392 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
393 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
394 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
395 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
396 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
397 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
398 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
399 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
400 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
401 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
456 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
457 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
458 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
459 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
460 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
461 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
463 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
464 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
465 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
466 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
467 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
468 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
469 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
470 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
471 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
472 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
473 const_iv (KMOD_CTRL),
474 const_iv (KMOD_SHIFT),
475 const_iv (KMOD_ALT),
476 const_iv (KMOD_META)
477# undef const_iv 506# undef const_iv
478 }; 507 };
479 508
480 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; )
481 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);
482} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
483 521
484int 522int
485in_destruct () 523in_destruct ()
486 CODE: 524 CODE:
487 RETVAL = PL_main_cv == Nullcv; 525 RETVAL = PL_main_cv == Nullcv;
… …
590 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
591 case SDL_KEYUP: 629 case SDL_KEYUP:
592 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
593 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
594 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 */
595 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
596 break; 635 break;
597 636
598 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
599 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
647lowdelay (int fd, int val = 1) 686lowdelay (int fd, int val = 1)
648 CODE: 687 CODE:
649#ifndef _WIN32 688#ifndef _WIN32
650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
651#endif 690#endif
691
692void
693win32_proxy_info ()
694 PPCODE:
695{
696#ifdef _WIN32
697 char buffer[2048];
698 DWORD buflen;
699
700 EXTEND (SP, 3);
701
702 buflen = sizeof (buffer);
703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
707
708 buflen = sizeof (buffer);
709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
710 {
711 PUSHs (newSVpv (buffer, 0));
712
713 buflen = sizeof (buffer);
714 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
715 PUSHs (newSVpv (buffer, 0));
716 }
717 }
718#endif
719}
652 720
653void 721void
654add_font (char *file) 722add_font (char *file)
655 CODE: 723 CODE:
656 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
761#endif 829#endif
762 _exit (1); 830 _exit (1);
763 831
764void 832void
765_exit (int retval) 833_exit (int retval = 0)
766 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
767 _exit (retval); 838 _exit (retval);
839#endif
768 840
769MODULE = CFPlus PACKAGE = CFPlus::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
770 842
771CFPlus::Font 843CFPlus::Font
772new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
… …
1019xy_to_index (CFPlus::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
1020 CODE: 1092 CODE:
1021{ 1093{
1022 int index, trailing; 1094 int index, trailing;
1023 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);
1024 RETVAL = index; 1096 RETVAL = index + trailing;
1025} 1097}
1026 OUTPUT: 1098 OUTPUT:
1027 RETVAL 1099 RETVAL
1028 1100
1029void 1101void
… …
1035 1107
1036 EXTEND (SP, 3); 1108 EXTEND (SP, 3);
1037 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1109 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1039 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 }
1040} 1151}
1041 1152
1042void 1153void
1043render (CFPlus::Layout self, float x, float y, int flags = 0) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1044 PPCODE: 1155 PPCODE:
… …
1138} 1249}
1139 1250
1140MODULE = CFPlus PACKAGE = CFPlus::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1141 1252
1142CFPlus::Map 1253CFPlus::Map
1143new (SV *class, int map_width, int map_height) 1254new (SV *class)
1144 CODE: 1255 CODE:
1145 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1146 RETVAL->x = 0; 1257 RETVAL->x = 0;
1147 RETVAL->y = 0; 1258 RETVAL->y = 0;
1148 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1149 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1150 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1151 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1152 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1153 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1154 RETVAL->texs = 8192;
1155 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1156 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1157 RETVAL->row = 0; 1266 RETVAL->row = 0;
1158 OUTPUT: 1267 OUTPUT:
1159 RETVAL 1268 RETVAL
1160 1269
1161void 1270void
1162DESTROY (CFPlus::Map self) 1271DESTROY (CFPlus::Map self)
1163 CODE: 1272 CODE:
1164{ 1273{
1165 map_clear (self); 1274 map_clear (self);
1166 Safefree (self->face); 1275 Safefree (self->face2tile);
1167 Safefree (self->tex); 1276 Safefree (self->tex);
1168 Safefree (self); 1277 Safefree (self);
1169} 1278}
1170 1279
1171void 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
1172clear (CFPlus::Map self) 1287clear (CFPlus::Map self)
1173 CODE: 1288 CODE:
1174 map_clear (self); 1289 map_clear (self);
1175 1290
1176void 1291void
1177set_face (CFPlus::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1178 CODE: 1293 CODE:
1179{ 1294{
1180 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1181 { 1296 need_texid (self, tile);
1182 Append (mapface, self->face, self->faces, self->faces);
1183 self->faces *= 2;
1184 }
1185
1186 self->face [face] = texid;
1187} 1297}
1188 1298
1189void 1299void
1190set_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)
1191 CODE: 1301 CODE:
1192{ 1302{
1193 while (self->texs <= texid) 1303 need_texid (self, texid);
1194 {
1195 Append (maptex, self->tex, self->texs, self->texs);
1196 self->texs *= 2;
1197 }
1198 1304
1199 { 1305 {
1200 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1201 1307
1202 tex->name = name; 1308 tex->name = name;
… …
1244void 1350void
1245scroll (CFPlus::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1246 CODE: 1352 CODE:
1247{ 1353{
1248 if (dx > 0) 1354 if (dx > 0)
1249 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1250 else if (dx < 0) 1356 else if (dx < 0)
1251 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1252 1358
1253 if (dy > 0) 1359 if (dy > 0)
1254 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1255 else if (dy < 0) 1361 else if (dy < 0)
1256 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1257 1363
1258 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1259 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1260 1366
1261 while (self->y < 0) 1367 while (self->y < 0)
… …
1287 1393
1288 if (flags & 15) 1394 if (flags & 15)
1289 { 1395 {
1290 if (!cell->darkness) 1396 if (!cell->darkness)
1291 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1292 cell->darkness = 256; 1399 cell->darkness = 256;
1293 cell->face [0] = 0;
1294 cell->face [1] = 0;
1295 cell->face [2] = 0;
1296 } 1400 }
1297 1401
1298 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1299 1403
1300 if (flags & 8) 1404 if (flags & 8)
… …
1315 cell->stat_width = 1; 1419 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1420 cell->stat_hp = *data++;
1317 } 1421 }
1318 else if (cmd == 6) // monster width 1422 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1423 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1424 else if (cmd == 0x47)
1321 { 1425 {
1322 if (*data == 4) 1426 if (*data == 8)
1323 ; // decode player tag 1427 ; // decode player uuid
1324 1428
1325 data += *data + 1; 1429 data += *data + 1;
1326 } 1430 }
1327 else if (cmd == 8) // cell flags 1431 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1432 cell->flags = *data++;
… …
1337 cell->darkness = *data++ + 1; 1441 cell->darkness = *data++ + 1;
1338 } 1442 }
1339 1443
1340 if (flags & 4) 1444 if (flags & 4)
1341 { 1445 {
1342 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];
1343 } 1449 }
1344 1450
1345 if (flags & 2) 1451 if (flags & 2)
1346 { 1452 {
1347 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];
1348 } 1456 }
1349 1457
1350 if (flags & 1) 1458 if (flags & 1)
1351 { 1459 {
1352 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];
1353 } 1463 }
1354 } 1464 }
1355 else 1465 else
1356 {
1357 cell->darkness = 0; 1466 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1360 } 1467 }
1361} 1468}
1362 1469
1363SV * 1470SV *
1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1390 { 1497 {
1391 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1392 1499
1393 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1394 { 1501 {
1395 mapface face = cell->face [z];
1396
1397 if (face)
1398 {
1399 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1400 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1401 int a1 = tex.a; 1504 int a1 = tex.a;
1402 1505
1403 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1404 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1405 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1406 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1407 }
1408 } 1510 }
1409 } 1511 }
1410 1512
1411 *map++ = (r ) 1513 *map++ = (r )
1412 | (g << 8) 1514 | (g << 8)
… …
1419} 1521}
1420 OUTPUT: 1522 OUTPUT:
1421 RETVAL 1523 RETVAL
1422 1524
1423void 1525void
1424draw (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)
1425 CODE: 1527 CODE:
1426{ 1528{
1427 int vx, vy;
1428 int x, y, z; 1529 int x, y, z;
1429 int last_name; 1530 int last_name;
1430 mapface face;
1431
1432 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1433 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1434
1435 /*
1436 int vx = self->vx = self->w >= sw
1437 ? self->x + (self->w - sw) / 2
1438 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1439
1440 int vy = self->vy = self->h >= sh
1441 ? self->y + (self->h - sh) / 2
1442 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1443 */
1444 1531
1445 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1446 1533
1447 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1451 1538
1452 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1453 1540
1454 last_name = 0; 1541 last_name = 0;
1455 1542
1543 mx += self->x;
1544 my += self->y;
1545
1456 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1457 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1458 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1459 { 1549 {
1460 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1461 1551
1462 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1463 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1464 { 1554 {
1465 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1466
1467 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1468 1557
1469 if (face && face < self->texs) 1558 if (tile)
1470 { 1559 {
1471 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1472 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1473 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1474 1563
1475 if (last_name != tex.name) 1564 if (last_name != tex.name)
1476 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1477 glEnd (); 1569 glEnd ();
1478 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1479 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1480 } 1572 }
1481 1573
1482 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1483 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1484 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);
1485 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1486 }
1487 1578
1488 if (cell->flags && z == 2) 1579 if (cell->flags && z == 2)
1489 {
1490 if (cell->flags & 1)
1491 { 1580 {
1581 if (cell->flags & 1)
1582 {
1492 maptex tex = self->tex [1]; 1583 maptex tex = self->tex [1];
1493 int px = (x + 1) * 32 - tex.w + 2; 1584 int px = x * T + T * 2 / 32;
1494 int py = (y + 1) * 32 - tex.h - 6; 1585 int py = y * T - T * 6 / 32;
1495 1586
1496 glEnd (); 1587 glEnd ();
1497 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1498 glBegin (GL_QUADS); 1589 glBegin (GL_QUADS);
1499 1590
1500 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1501 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1502 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1503 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1504 } 1596 }
1505 } 1597 }
1506 } 1598 }
1507 } 1599 }
1508 1600
… …
1511 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1512 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1513 1605
1514 // top layer: overlays such as the health bar 1606 // top layer: overlays such as the health bar
1515 for (y = 0; y < sh; y++) 1607 for (y = 0; y < sh; y++)
1516 if (0 <= y + vy && y + vy < self->rows) 1608 if (0 <= y + my && y + my < self->rows)
1517 { 1609 {
1518 maprow *row = self->row + (y + vy); 1610 maprow *row = self->row + (y + my);
1519 1611
1520 for (x = 0; x < sw; x++) 1612 for (x = 0; x < sw; x++)
1521 if (row->c0 <= x + vx && x + vx < row->c1) 1613 if (row->c0 <= x + mx && x + mx < row->c1)
1522 { 1614 {
1523 mapcell *cell = row->col + (x + vx - row->c0); 1615 mapcell *cell = row->col + (x + mx - row->c0);
1524 1616
1525 int px = x * 32; 1617 int px = x * T;
1526 int py = y * 32; 1618 int py = y * T;
1527 1619
1528 if (cell->stat_hp) 1620 if (cell->stat_hp)
1529 { 1621 {
1530 int width = cell->stat_width * 32; 1622 int width = cell->stat_width * T;
1531 int thick = sh / 28 + 1 + cell->stat_width; 1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1532 1624
1533 glColor3ub (0, 0, 0); 1625 glColor3ub (0, 0, 0);
1534 glRectf (px + 1, py - thick - 2, 1626 glRectf (px + 1, py - thick - 2,
1535 px + width - 1, py); 1627 px + width - 1, py);
1536 1628
… …
1602 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1603 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1604} 1696}
1605 1697
1606void 1698void
1607fow_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)
1608 PPCODE: 1700 PPCODE:
1609{ 1701{
1610 int vx, vy;
1611 int x, y; 1702 int x, y;
1612 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1613 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1614 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1615 1706
1616 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1617 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1618 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1619 1710
1620 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1621 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1622 1713
1623 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1624 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1625 { 1716 {
1626 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1627 1718
1628 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1629 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1630 { 1721 {
1631 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1632 1723
1633 darkness[y * sw4 + x] = cell->darkness 1724 darkness[y * sw4 + x] = cell->darkness
1634 ? 255 - (cell->darkness - 1) 1725 ? 255 - (cell->darkness - 1)
1635 : 255 - FOW_DARKNESS; 1726 : 255 - FOW_DARKNESS;
1636 } 1727 }
… …
1676 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1677 { 1768 {
1678 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1679 uint8_t flags = 0; 1770 uint8_t flags = 0;
1680 1771
1681 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1682 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1683 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1684 1775
1685 *data++ = flags; 1776 *data++ = flags;
1686 1777
1687 if (flags & 1) 1778 if (flags & 1)
1688 { 1779 {
1780 tileid tile = cell->tile [0];
1689 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1690 *data++ = cell->face [0]; 1782 *data++ = tile;
1691 } 1783 }
1692 1784
1693 if (flags & 2) 1785 if (flags & 2)
1694 { 1786 {
1787 tileid tile = cell->tile [1];
1695 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1696 *data++ = cell->face [1]; 1789 *data++ = tile;
1697 } 1790 }
1698 1791
1699 if (flags & 4) 1792 if (flags & 4)
1700 { 1793 {
1794 tileid tile = cell->tile [2];
1701 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1702 *data++ = cell->face [2]; 1796 *data++ = tile;
1703 } 1797 }
1704 } 1798 }
1705 else 1799 else
1706 *data++ = 0; 1800 *data++ = 0;
1707 } 1801 }
… …
1747 { 1841 {
1748 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1749 1843
1750 if (flags) 1844 if (flags)
1751 { 1845 {
1752 mapface face[3] = { 0, 0, 0 };
1753
1754 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1755 1848
1756 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1757 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1758 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1759 1852
1760 if (cell->darkness == 0) 1853 if (cell->darkness == 0)
1761 { 1854 {
1762 cell->darkness = 0; 1855 cell->darkness = 0;
1763 1856
1764 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1765 { 1858 {
1766 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1767 1860
1768 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1769 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1770 } 1868 }
1771 } 1869 }
1772 } 1870 }
1773 } 1871 }
1774 } 1872 }

Diff Legend

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