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.133 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.175 by root, Fri Apr 6 08:09:42 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
… …
144} 140}
145 141
146static void 142static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
150 149
151 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 152
154 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
155} 154 if (!rect.height) rect.height = 1;
156 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
157typedef uint16_t mapface; 161typedef uint16_t faceid;
158 162
159typedef struct { 163typedef struct {
160 GLint name; 164 int name;
161 int w, h; 165 int w, h;
162 float s, t; 166 float s, t;
163 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
164} maptex; 168} maptex;
165 169
166typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
167 int16_t darkness; 173 uint16_t darkness;
168 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
169} mapcell; 175} mapcell;
170 176
171typedef struct { 177typedef struct {
172 int32_t c0, c1; 178 int32_t c0, c1;
173 mapcell *col; 179 mapcell *col;
174} maprow; 180} maprow;
175 181
176typedef struct map { 182typedef struct map {
177 int x, y, w, h; 183 int x, y, w, h;
178 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
179 int faces; 185 int faces; tileid *face2tile; // [faceid]
180 mapface *face; 186 int texs; maptex *tex; // [tileid]
181
182 int texs;
183 maptex *tex;
184 187
185 int32_t rows; 188 int32_t rows;
186 maprow *row; 189 maprow *row;
187} *CFPlus__Map; 190} *CFPlus__Map;
188 191
… …
208 return ptr; 211 return ptr;
209} 212}
210 213
211#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))
212#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}
213 236
214static maprow * 237static maprow *
215map_get_row (CFPlus__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
216{ 239{
217 if (0 > y) 240 if (0 > y)
… …
286static void 309static void
287map_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)
288{ 311{
289 int x, y; 312 int x, y;
290 maprow *row; 313 maprow *row;
314 mapcell *cell;
291 315
292 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 317 if (y >= 0)
294 { 318 {
295 if (y >= self->rows) 319 if (y >= self->rows)
… …
301 if (x >= row->c0) 325 if (x >= row->c0)
302 { 326 {
303 if (x >= row->c1) 327 if (x >= row->c1)
304 break; 328 break;
305 329
306 row->col[x - row->c0].darkness = -1; 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;
307 } 336 }
308 } 337 }
309} 338}
310 339
311static void 340static void
… …
348 n |= n >> 8; 377 n |= n >> 8;
349 n |= n >> 16; 378 n |= n >> 16;
350 379
351 return n + 1; 380 return n + 1;
352} 381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
353 386
354MODULE = CFPlus PACKAGE = CFPlus 387MODULE = CFPlus PACKAGE = CFPlus
355 388
356PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
357 390
… …
361 static const struct { 394 static const struct {
362 const char *name; 395 const char *name;
363 IV iv; 396 IV iv;
364 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
365# 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
366 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
379 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
383 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
384 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
443 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
448 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 506# undef const_iv
465 }; 507 };
466 508
467 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; )
468 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);
469} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
470 521
471int 522int
472in_destruct () 523in_destruct ()
473 CODE: 524 CODE:
474 RETVAL = PL_main_cv == Nullcv; 525 RETVAL = PL_main_cv == Nullcv;
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 566
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
519 572
520 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 575
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
575 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
576 case SDL_KEYUP: 629 case SDL_KEYUP:
577 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579 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 */
580 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581 break; 635 break;
582 636
583 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
584 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
632lowdelay (int fd, int val = 1) 686lowdelay (int fd, int val = 1)
633 CODE: 687 CODE:
634#ifndef _WIN32 688#ifndef _WIN32
635 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
636#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}
637 720
638void 721void
639add_font (char *file) 722add_font (char *file)
640 CODE: 723 CODE:
641 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746#endif 829#endif
747 _exit (1); 830 _exit (1);
748 831
749void 832void
750_exit (int retval) 833_exit (int retval = 0)
751 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
752 _exit (retval); 838 _exit (retval);
839#endif
753 840
754MODULE = CFPlus PACKAGE = CFPlus::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
755 842
756CFPlus::Font 843CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
… …
1004xy_to_index (CFPlus::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1092 CODE:
1006{ 1093{
1007 int index, trailing; 1094 int index, trailing;
1008 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);
1009 RETVAL = index; 1096 RETVAL = index + trailing;
1010} 1097}
1011 OUTPUT: 1098 OUTPUT:
1012 RETVAL 1099 RETVAL
1013 1100
1014void 1101void
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1112}
1026 1113
1027void 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 }
1151}
1152
1153void
1028render (CFPlus::Layout self, float x, float y) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1155 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1156 pango_opengl_render_layout_subpixel (
1031 self->pl, 1157 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1158 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1159 self->r, self->g, self->b, self->a,
1160 flags
1034 ); 1161 );
1035 1162
1036MODULE = CFPlus PACKAGE = CFPlus::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1164
1038void 1165void
… …
1122} 1249}
1123 1250
1124MODULE = CFPlus PACKAGE = CFPlus::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1252
1126CFPlus::Map 1253CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1254new (SV *class)
1128 CODE: 1255 CODE:
1129 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1257 RETVAL->x = 0;
1131 RETVAL->y = 0; 1258 RETVAL->y = 0;
1132 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1133 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1134 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1135 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1136 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1137 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1138 RETVAL->texs = 8192;
1139 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1140 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1141 RETVAL->row = 0; 1266 RETVAL->row = 0;
1142 OUTPUT: 1267 OUTPUT:
1143 RETVAL 1268 RETVAL
1144 1269
1145void 1270void
1146DESTROY (CFPlus::Map self) 1271DESTROY (CFPlus::Map self)
1147 CODE: 1272 CODE:
1148{ 1273{
1149 map_clear (self); 1274 map_clear (self);
1150 Safefree (self->face); 1275 Safefree (self->face2tile);
1151 Safefree (self->tex); 1276 Safefree (self->tex);
1152 Safefree (self); 1277 Safefree (self);
1153} 1278}
1154 1279
1155void 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
1156clear (CFPlus::Map self) 1287clear (CFPlus::Map self)
1157 CODE: 1288 CODE:
1158 map_clear (self); 1289 map_clear (self);
1159 1290
1160void 1291void
1161set_face (CFPlus::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1162 CODE: 1293 CODE:
1163{ 1294{
1164 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1165 { 1296 need_texid (self, tile);
1166 Append (mapface, self->face, self->faces, self->faces);
1167 self->faces *= 2;
1168 }
1169
1170 self->face [face] = texid;
1171} 1297}
1172 1298
1173void 1299void
1174set_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)
1175 CODE: 1301 CODE:
1176{ 1302{
1177 while (self->texs <= texid) 1303 need_texid (self, texid);
1178 {
1179 Append (maptex, self->tex, self->texs, self->texs);
1180 self->texs *= 2;
1181 }
1182 1304
1183 { 1305 {
1184 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1185 1307
1186 tex->name = name; 1308 tex->name = name;
… …
1228void 1350void
1229scroll (CFPlus::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1352 CODE:
1231{ 1353{
1232 if (dx > 0) 1354 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1234 else if (dx < 0) 1356 else if (dx < 0)
1235 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);
1236 1358
1237 if (dy > 0) 1359 if (dy > 0)
1238 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1239 else if (dy < 0) 1361 else if (dy < 0)
1240 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);
1241 1363
1242 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1243 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1244 1366
1245 while (self->y < 0) 1367 while (self->y < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1251 } 1373 }
1252} 1374}
1253 1375
1254void 1376void
1255map1a_update (CFPlus::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1378 CODE:
1257{ 1379{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1382 mapcell *cell;
1261 int x, y, flags; 1383 int x, y, flags;
1262 1384
1263 while (data < data_end) 1385 while (data < data_end - 1)
1264 { 1386 {
1265 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1266 1388
1267 x = self->x + ((flags >> 10) & 63); 1389 x = self->x + ((flags >> 10) & 63);
1268 y = self->y + ((flags >> 4) & 63); 1390 y = self->y + ((flags >> 4) & 63);
1269 1391
1270 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1271 1393
1272 if (flags & 15) 1394 if (flags & 15)
1273 { 1395 {
1274 if (cell->darkness < 0) 1396 if (!cell->darkness)
1275 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1276 cell->darkness = 0; 1399 cell->darkness = 256;
1277 cell->face [0] = 0;
1278 cell->face [1] = 0;
1279 cell->face [2] = 0;
1280 } 1400 }
1281 1401
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1403
1404 if (flags & 8)
1405 {
1406 if (extmap)
1407 {
1408 uint8_t ext, cmd;
1409
1410 do
1411 {
1412 ext = *data++;
1413 cmd = ext & 0x3f;
1414
1415 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
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++;
1433 else if (ext & 0x40) // unknown, multibyte => skip
1434 data += *data + 1;
1435 else
1436 data++;
1437 }
1438 while (ext & 0x80);
1439 }
1440 else
1441 cell->darkness = *data++ + 1;
1442 }
1285 1443
1286 if (flags & 4) 1444 if (flags & 4)
1287 { 1445 {
1288 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];
1289 } 1449 }
1290 1450
1291 if (flags & 2) 1451 if (flags & 2)
1292 { 1452 {
1293 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];
1294 } 1456 }
1295 1457
1296 if (flags & 1) 1458 if (flags & 1)
1297 { 1459 {
1298 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];
1299 } 1463 }
1300 } 1464 }
1301 else 1465 else
1302 cell->darkness = -1; 1466 cell->darkness = 0;
1303 } 1467 }
1304} 1468}
1305 1469
1306SV * 1470SV *
1307mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1333 { 1497 {
1334 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1335 1499
1336 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1337 { 1501 {
1338 mapface face = cell->face [z];
1339
1340 if (face)
1341 {
1342 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1343 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1344 int a1 = tex.a; 1504 int a1 = tex.a;
1345 1505
1346 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1347 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1348 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1349 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1350 }
1351 } 1510 }
1352 } 1511 }
1353 1512
1354 *map++ = (r ) 1513 *map++ = (r )
1355 | (g << 8) 1514 | (g << 8)
… …
1362} 1521}
1363 OUTPUT: 1522 OUTPUT:
1364 RETVAL 1523 RETVAL
1365 1524
1366void 1525void
1367draw (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)
1368 CODE: 1527 CODE:
1369{ 1528{
1370 int vx, vy;
1371 int x, y, z; 1529 int x, y, z;
1372 int last_name; 1530 int last_name;
1373 mapface face;
1374
1375 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1376 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1377
1378 /*
1379 int vx = self->vx = self->w >= sw
1380 ? self->x + (self->w - sw) / 2
1381 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1382
1383 int vy = self->vy = self->h >= sh
1384 ? self->y + (self->h - sh) / 2
1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1386 */
1387 1531
1388 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1389 1533
1390 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1394 1538
1395 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1396 1540
1397 last_name = 0; 1541 last_name = 0;
1398 1542
1543 mx += self->x;
1544 my += self->y;
1545
1399 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1400 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1401 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1402 { 1549 {
1403 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1404 1551
1405 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1406 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1407 { 1554 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1409
1410 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1411 1557
1412 if (face) 1558 if (tile)
1413 { 1559 {
1414 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1415
1416 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1417 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1418 1563
1419 if (last_name != tex.name) 1564 if (last_name != tex.name)
1420 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1421 glEnd (); 1569 glEnd ();
1422 last_name = tex.name;
1423 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1425 } 1572 }
1426 1573
1427 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429 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);
1430 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 }
1431 } 1597 }
1432 } 1598 }
1433 } 1599 }
1434 1600
1435 glEnd (); 1601 glEnd ();
1436 1602
1437 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1605
1606 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 int px = x * T;
1618 int py = y * T;
1619
1620 if (cell->stat_hp)
1621 {
1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1624
1625 glColor3ub (0, 0, 0);
1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1628
1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1633 }
1634 }
1635 }
1439} 1636}
1440 1637
1441void 1638void
1442draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1639draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1640 CODE:
… …
1497 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1499} 1696}
1500 1697
1501void 1698void
1502fow_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)
1503 PPCODE: 1700 PPCODE:
1504{ 1701{
1505 int vx, vy;
1506 int x, y; 1702 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510 1706
1511 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1514 1710
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1517 1713
1518 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1520 { 1716 {
1521 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1522 1718
1523 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1721 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1527 1723
1528 darkness[y * sw4 + x] = cell->darkness < 0 1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 1726 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 1727 }
1532 } 1728 }
1533 1729
1534 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1571 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1572 { 1768 {
1573 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1574 uint8_t flags = 0; 1770 uint8_t flags = 0;
1575 1771
1576 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1577 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1578 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1579 1775
1580 *data++ = flags; 1776 *data++ = flags;
1581 1777
1582 if (flags & 1) 1778 if (flags & 1)
1583 { 1779 {
1780 tileid tile = cell->tile [0];
1584 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1585 *data++ = cell->face [0]; 1782 *data++ = tile;
1586 } 1783 }
1587 1784
1588 if (flags & 2) 1785 if (flags & 2)
1589 { 1786 {
1787 tileid tile = cell->tile [1];
1590 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1591 *data++ = cell->face [1]; 1789 *data++ = tile;
1592 } 1790 }
1593 1791
1594 if (flags & 4) 1792 if (flags & 4)
1595 { 1793 {
1794 tileid tile = cell->tile [2];
1596 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1597 *data++ = cell->face [2]; 1796 *data++ = tile;
1598 } 1797 }
1599 } 1798 }
1600 else 1799 else
1601 *data++ = 0; 1800 *data++ = 0;
1602 } 1801 }
… …
1642 { 1841 {
1643 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1644 1843
1645 if (flags) 1844 if (flags)
1646 { 1845 {
1647 mapface face[3] = { 0, 0, 0 };
1648
1649 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1650 1848
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1654 1852
1655 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1656 { 1854 {
1657 cell->darkness = -1; 1855 cell->darkness = 0;
1658 1856
1659 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1660 { 1858 {
1661 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1662 1860
1663 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || (t && !self->tex [t].name))
1862 {
1664 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1665 } 1868 }
1666 } 1869 }
1667 } 1870 }
1668 } 1871 }
1669 } 1872 }
… …
1800 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1804 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
… …
2006 2210
2007void glEndList () 2211void glEndList ()
2008 2212
2009void glCallList (int list) 2213void glCallList (int list)
2010 2214
2011

Diff Legend

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