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.145 by root, Fri Aug 18 03:19:58 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 {
171 uint32_t player;
172 tileid tile[3];
174 uint16_t darkness; 173 uint16_t darkness;
175 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
177} mapcell; 175} mapcell;
178 176
179typedef struct { 177typedef struct {
180 int32_t c0, c1; 178 int32_t c0, c1;
181 mapcell *col; 179 mapcell *col;
182} maprow; 180} maprow;
183 181
184typedef struct map { 182typedef struct map {
185 int x, y, w, h; 183 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 185 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 186 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 187
193 int32_t rows; 188 int32_t rows;
194 maprow *row; 189 maprow *row;
195} *CFPlus__Map; 190} *CFPlus__Map;
196 191
… …
216 return ptr; 211 return ptr;
217} 212}
218 213
219#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))
220#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}
221 236
222static maprow * 237static maprow *
223map_get_row (CFPlus__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
224{ 239{
225 if (0 > y) 240 if (0 > y)
… …
294static void 309static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 310map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 311{
297 int x, y; 312 int x, y;
298 maprow *row; 313 maprow *row;
314 mapcell *cell;
299 315
300 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 317 if (y >= 0)
302 { 318 {
303 if (y >= self->rows) 319 if (y >= self->rows)
… …
309 if (x >= row->c0) 325 if (x >= row->c0)
310 { 326 {
311 if (x >= row->c1) 327 if (x >= row->c1)
312 break; 328 break;
313 329
314 row->col[x - row->c0].darkness = 0; 330 cell = row->col + x - row->c0;
331
332 cell->darkness = 0;
333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
315 } 336 }
316 } 337 }
317} 338}
318 339
319static void 340static void
… …
356 n |= n >> 8; 377 n |= n >> 8;
357 n |= n >> 16; 378 n |= n >> 16;
358 379
359 return n + 1; 380 return n + 1;
360} 381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
361 386
362MODULE = CFPlus PACKAGE = CFPlus 387MODULE = CFPlus PACKAGE = CFPlus
363 388
364PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
365 390
… …
369 static const struct { 394 static const struct {
370 const char *name; 395 const char *name;
371 IV iv; 396 IV iv;
372 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
373# 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
374 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
375 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
376 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
377 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
378 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
387 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
388 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
389 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
390 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
391 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
392 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
393 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
394 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
395 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
396 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
451 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
452 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
453 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
454 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
455 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
456 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
457 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
458 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
459 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
460 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
461 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
462 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
463 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
464 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
465 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
466 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
467 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
468 const_iv (KMOD_CTRL),
469 const_iv (KMOD_SHIFT),
470 const_iv (KMOD_ALT),
471 const_iv (KMOD_META)
472# undef const_iv 506# undef const_iv
473 }; 507 };
474 508
475 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; )
476 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);
477} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
478 521
479int 522int
480in_destruct () 523in_destruct ()
481 CODE: 524 CODE:
482 RETVAL = PL_main_cv == Nullcv; 525 RETVAL = PL_main_cv == Nullcv;
… …
585 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
586 case SDL_KEYUP: 629 case SDL_KEYUP:
587 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
588 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
589 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 */
590 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
591 break; 635 break;
592 636
593 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
642lowdelay (int fd, int val = 1) 686lowdelay (int fd, int val = 1)
643 CODE: 687 CODE:
644#ifndef _WIN32 688#ifndef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
646#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}
647 720
648void 721void
649add_font (char *file) 722add_font (char *file)
650 CODE: 723 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 829#endif
757 _exit (1); 830 _exit (1);
758 831
759void 832void
760_exit (int retval) 833_exit (int retval = 0)
761 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
762 _exit (retval); 838 _exit (retval);
839#endif
763 840
764MODULE = CFPlus PACKAGE = CFPlus::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
765 842
766CFPlus::Font 843CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
… …
1014xy_to_index (CFPlus::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
1015 CODE: 1092 CODE:
1016{ 1093{
1017 int index, trailing; 1094 int index, trailing;
1018 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);
1019 RETVAL = index; 1096 RETVAL = index + trailing;
1020} 1097}
1021 OUTPUT: 1098 OUTPUT:
1022 RETVAL 1099 RETVAL
1023 1100
1024void 1101void
… …
1030 1107
1031 EXTEND (SP, 3); 1108 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1109 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1034 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 }
1035} 1151}
1036 1152
1037void 1153void
1038render (CFPlus::Layout self, float x, float y, int flags = 0) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1039 PPCODE: 1155 PPCODE:
… …
1133} 1249}
1134 1250
1135MODULE = CFPlus PACKAGE = CFPlus::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1136 1252
1137CFPlus::Map 1253CFPlus::Map
1138new (SV *class, int map_width, int map_height) 1254new (SV *class)
1139 CODE: 1255 CODE:
1140 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1141 RETVAL->x = 0; 1257 RETVAL->x = 0;
1142 RETVAL->y = 0; 1258 RETVAL->y = 0;
1143 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1144 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1145 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1146 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1147 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1148 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1149 RETVAL->texs = 8192;
1150 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1151 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1152 RETVAL->row = 0; 1266 RETVAL->row = 0;
1153 OUTPUT: 1267 OUTPUT:
1154 RETVAL 1268 RETVAL
1155 1269
1156void 1270void
1157DESTROY (CFPlus::Map self) 1271DESTROY (CFPlus::Map self)
1158 CODE: 1272 CODE:
1159{ 1273{
1160 map_clear (self); 1274 map_clear (self);
1161 Safefree (self->face); 1275 Safefree (self->face2tile);
1162 Safefree (self->tex); 1276 Safefree (self->tex);
1163 Safefree (self); 1277 Safefree (self);
1164} 1278}
1165 1279
1166void 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
1167clear (CFPlus::Map self) 1287clear (CFPlus::Map self)
1168 CODE: 1288 CODE:
1169 map_clear (self); 1289 map_clear (self);
1170 1290
1171void 1291void
1172set_face (CFPlus::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1173 CODE: 1293 CODE:
1174{ 1294{
1175 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1176 { 1296 need_texid (self, tile);
1177 Append (mapface, self->face, self->faces, self->faces);
1178 self->faces *= 2;
1179 }
1180
1181 self->face [face] = texid;
1182} 1297}
1183 1298
1184void 1299void
1185set_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)
1186 CODE: 1301 CODE:
1187{ 1302{
1188 while (self->texs <= texid) 1303 need_texid (self, texid);
1189 {
1190 Append (maptex, self->tex, self->texs, self->texs);
1191 self->texs *= 2;
1192 }
1193 1304
1194 { 1305 {
1195 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1196 1307
1197 tex->name = name; 1308 tex->name = name;
… …
1239void 1350void
1240scroll (CFPlus::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1352 CODE:
1242{ 1353{
1243 if (dx > 0) 1354 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1356 else if (dx < 0)
1246 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);
1247 1358
1248 if (dy > 0) 1359 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1361 else if (dy < 0)
1251 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);
1252 1363
1253 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1255 1366
1256 while (self->y < 0) 1367 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1382 mapcell *cell;
1272 int x, y, flags; 1383 int x, y, flags;
1273 1384
1274 while (data < data_end) 1385 while (data < data_end - 1)
1275 { 1386 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1277 1388
1278 x = self->x + ((flags >> 10) & 63); 1389 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1390 y = self->y + ((flags >> 4) & 63);
… …
1282 1393
1283 if (flags & 15) 1394 if (flags & 15)
1284 { 1395 {
1285 if (!cell->darkness) 1396 if (!cell->darkness)
1286 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1399 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1400 }
1293 1401
1294 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1295 1403
1296 if (flags & 8) 1404 if (flags & 8)
… …
1302 do 1410 do
1303 { 1411 {
1304 ext = *data++; 1412 ext = *data++;
1305 cmd = ext & 0x3f; 1413 cmd = ext & 0x3f;
1306 1414
1307 if (ext < 4) 1415 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1416 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 1420 cell->stat_hp = *data++;
1421 }
1422 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47)
1425 {
1426 if (*data == 8)
1427 ; // decode player uuid
1428
1429 data += *data + 1;
1430 }
1431 else if (cmd == 8) // cell flags
1432 cell->flags = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip 1433 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1; 1434 data += *data + 1;
1435 else
1436 data++;
1313 } 1437 }
1314 while (cmd & 0x80); 1438 while (ext & 0x80);
1315 } 1439 }
1316 else 1440 else
1317 cell->darkness = *data++ + 1; 1441 cell->darkness = *data++ + 1;
1318 } 1442 }
1319 1443
1320 if (flags & 4) 1444 if (flags & 4)
1321 { 1445 {
1322 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];
1323 } 1449 }
1324 1450
1325 if (flags & 2) 1451 if (flags & 2)
1326 { 1452 {
1327 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];
1328 } 1456 }
1329 1457
1330 if (flags & 1) 1458 if (flags & 1)
1331 { 1459 {
1332 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];
1333 } 1463 }
1334 } 1464 }
1335 else 1465 else
1336 cell->darkness = 0; 1466 cell->darkness = 0;
1337 } 1467 }
… …
1367 { 1497 {
1368 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1369 1499
1370 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1371 { 1501 {
1372 mapface face = cell->face [z];
1373
1374 if (face)
1375 {
1376 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1377 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1378 int a1 = tex.a; 1504 int a1 = tex.a;
1379 1505
1380 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1381 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1382 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1383 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1384 }
1385 } 1510 }
1386 } 1511 }
1387 1512
1388 *map++ = (r ) 1513 *map++ = (r )
1389 | (g << 8) 1514 | (g << 8)
… …
1396} 1521}
1397 OUTPUT: 1522 OUTPUT:
1398 RETVAL 1523 RETVAL
1399 1524
1400void 1525void
1401draw (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)
1402 CODE: 1527 CODE:
1403{ 1528{
1404 int vx, vy;
1405 int x, y, z; 1529 int x, y, z;
1406 int last_name; 1530 int last_name;
1407 mapface face;
1408
1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1411
1412 /*
1413 int vx = self->vx = self->w >= sw
1414 ? self->x + (self->w - sw) / 2
1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1416
1417 int vy = self->vy = self->h >= sh
1418 ? self->y + (self->h - sh) / 2
1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1420 */
1421 1531
1422 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1423 1533
1424 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1428 1538
1429 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1430 1540
1431 last_name = 0; 1541 last_name = 0;
1432 1542
1543 mx += self->x;
1544 my += self->y;
1545
1433 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1434 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1435 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1436 { 1549 {
1437 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1438 1551
1439 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1440 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1441 { 1554 {
1442 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1443
1444 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1445 1557
1446 if (face && face < self->texs) 1558 if (tile)
1447 { 1559 {
1448 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1449
1450 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1451 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1452 1563
1453 if (last_name != tex.name) 1564 if (last_name != tex.name)
1454 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1455 glEnd (); 1569 glEnd ();
1456 last_name = tex.name;
1457 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1458 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1459 } 1572 }
1460 1573
1461 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1462 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1463 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);
1464 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 {
1583 maptex tex = self->tex [1];
1584 int px = x * T + T * 2 / 32;
1585 int py = y * T - T * 6 / 32;
1586
1587 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589 glBegin (GL_QUADS);
1590
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1596 }
1465 } 1597 }
1466 } 1598 }
1467 } 1599 }
1468 1600
1469 glEnd (); 1601 glEnd ();
… …
1471 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1472 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1473 1605
1474 // top layer: overlays such as the health bar 1606 // top layer: overlays such as the health bar
1475 for (y = 0; y < sh; y++) 1607 for (y = 0; y < sh; y++)
1476 if (0 <= y + vy && y + vy < self->rows) 1608 if (0 <= y + my && y + my < self->rows)
1477 { 1609 {
1478 maprow *row = self->row + (y + vy); 1610 maprow *row = self->row + (y + my);
1479 1611
1480 for (x = 0; x < sw; x++) 1612 for (x = 0; x < sw; x++)
1481 if (row->c0 <= x + vx && x + vx < row->c1) 1613 if (row->c0 <= x + mx && x + mx < row->c1)
1482 { 1614 {
1483 mapcell *cell = row->col + (x + vx - row->c0); 1615 mapcell *cell = row->col + (x + mx - row->c0);
1484 1616
1485 int px = x * 32; 1617 int px = x * T;
1486 int py = y * 32; 1618 int py = y * T;
1487 1619
1488 if (cell->stat_hp) 1620 if (cell->stat_hp)
1489 { 1621 {
1490 int width = sh / 28 + 1; 1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1491 1624
1492 glColor3ub (0, 0, 0); 1625 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2); 1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1494 1628
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1496 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1497 } 1633 }
1498 } 1634 }
1499 } 1635 }
1500} 1636}
1501 1637
… …
1558 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1560} 1696}
1561 1697
1562void 1698void
1563fow_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)
1564 PPCODE: 1700 PPCODE:
1565{ 1701{
1566 int vx, vy;
1567 int x, y; 1702 int x, y;
1568 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571 1706
1572 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1575 1710
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1578 1713
1579 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1581 { 1716 {
1582 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1583 1718
1584 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1586 { 1721 {
1587 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1588 1723
1589 darkness[y * sw4 + x] = cell->darkness 1724 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1) 1725 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS; 1726 : 255 - FOW_DARKNESS;
1592 } 1727 }
… …
1632 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1633 { 1768 {
1634 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1635 uint8_t flags = 0; 1770 uint8_t flags = 0;
1636 1771
1637 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1638 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1639 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1640 1775
1641 *data++ = flags; 1776 *data++ = flags;
1642 1777
1643 if (flags & 1) 1778 if (flags & 1)
1644 { 1779 {
1780 tileid tile = cell->tile [0];
1645 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1646 *data++ = cell->face [0]; 1782 *data++ = tile;
1647 } 1783 }
1648 1784
1649 if (flags & 2) 1785 if (flags & 2)
1650 { 1786 {
1787 tileid tile = cell->tile [1];
1651 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1652 *data++ = cell->face [1]; 1789 *data++ = tile;
1653 } 1790 }
1654 1791
1655 if (flags & 4) 1792 if (flags & 4)
1656 { 1793 {
1794 tileid tile = cell->tile [2];
1657 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1658 *data++ = cell->face [2]; 1796 *data++ = tile;
1659 } 1797 }
1660 } 1798 }
1661 else 1799 else
1662 *data++ = 0; 1800 *data++ = 0;
1663 } 1801 }
… …
1703 { 1841 {
1704 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1705 1843
1706 if (flags) 1844 if (flags)
1707 { 1845 {
1708 mapface face[3] = { 0, 0, 0 };
1709
1710 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1711 1848
1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1715 1852
1716 if (cell->darkness == 0) 1853 if (cell->darkness == 0)
1717 { 1854 {
1718 cell->darkness = 0; 1855 cell->darkness = 0;
1719 1856
1720 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1721 { 1858 {
1722 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1723 1860
1724 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1725 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1726 } 1868 }
1727 } 1869 }
1728 } 1870 }
1729 } 1871 }
1730 } 1872 }

Diff Legend

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