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.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.168 by root, Sat Dec 9 21:26:45 2006 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 _WIN32_WINNT 0x0500 // 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
… …
83 79
84#include "pango-font.c" 80#include "pango-font.c"
85#include "pango-fontmap.c" 81#include "pango-fontmap.c"
86#include "pango-render.c" 82#include "pango-render.c"
87 83
88typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
89typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
90 86
91typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
92 88
93static int 89static int
94shape_attr_p (PangoLayoutRun *run) 90shape_attr_p (PangoLayoutRun *run)
95{ 91{
96 GSList *attrs = run->item->analysis.extra_attrs; 92 GSList *attrs = run->item->analysis.extra_attrs;
… …
110 106
111typedef struct cf_layout { 107typedef struct cf_layout {
112 PangoLayout *pl; 108 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
114 int base_height; 110 int base_height;
115 CFClient__Font font; 111 CFPlus__Font font;
116} *CFClient__Layout; 112} *CFPlus__Layout;
117 113
118static CFClient__Font default_font; 114static CFPlus__Font default_font;
119static PangoContext *opengl_context; 115static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap; 116static PangoFontMap *opengl_fontmap;
121 117
122static void 118static void
123substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
… …
128#endif 124#endif
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130} 126}
131 127
132static void 128static void
133layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
134{ 130{
135 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
136 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
137 */ 133 */
138 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
… …
142 138
143 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
144} 140}
145 141
146static void 142static void
147layout_get_pixel_size (CFClient__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;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
155} 158}
156 159
157typedef uint16_t mapface; 160typedef uint16_t mapface;
158 161
159typedef struct { 162typedef struct {
… …
162 float s, t; 165 float s, t;
163 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
164} maptex; 167} maptex;
165 168
166typedef struct { 169typedef struct {
167 int16_t darkness; 170 uint32_t player;
168 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
169} mapcell; 174} mapcell;
170 175
171typedef struct { 176typedef struct {
172 int32_t c0, c1; 177 int32_t c0, c1;
173 mapcell *col; 178 mapcell *col;
… …
182 int texs; 187 int texs;
183 maptex *tex; 188 maptex *tex;
184 189
185 int32_t rows; 190 int32_t rows;
186 maprow *row; 191 maprow *row;
187} *CFClient__Map; 192} *CFPlus__Map;
188 193
189static char * 194static char *
190prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
191{ 196{
192 char *p; 197 char *p;
… …
210 215
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#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)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213 218
214static maprow * 219static maprow *
215map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
216{ 221{
217 if (0 > y) 222 if (0 > y)
218 { 223 {
219 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
220 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
… …
258 263
259 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
260} 265}
261 266
262static mapcell * 267static mapcell *
263map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
264{ 269{
265 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
266} 271}
267 272
268static void 273static void
269map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
270{ 275{
271 int r; 276 int r;
272 277
273 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
274 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
… …
282 self->row = 0; 287 self->row = 0;
283 self->rows = 0; 288 self->rows = 0;
284} 289}
285 290
286static void 291static void
287map_blank (CFClient__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 293{
289 int x, y; 294 int x, y;
290 maprow *row; 295 maprow *row;
296 mapcell *cell;
291 297
292 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 299 if (y >= 0)
294 { 300 {
295 if (y >= self->rows) 301 if (y >= self->rows)
… …
301 if (x >= row->c0) 307 if (x >= row->c0)
302 { 308 {
303 if (x >= row->c1) 309 if (x >= row->c1)
304 break; 310 break;
305 311
306 row->col[x - row->c0].darkness = -1; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
307 } 318 }
308 } 319 }
309} 320}
310 321
311static void 322static void
… …
349 n |= n >> 16; 360 n |= n >> 16;
350 361
351 return n + 1; 362 return n + 1;
352} 363}
353 364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
354MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
355 370
356PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
357 372
358BOOT: 373BOOT:
359{ 374{
360 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
361 static const struct { 376 static const struct {
362 const char *name; 377 const char *name;
363 IV iv; 378 IV iv;
364 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
366 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
… …
379 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
383 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
384 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
… …
443 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
448 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 487 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 488# undef const_iv
465 }; 489 };
466 490
467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
470 503
471int 504int
472in_destruct () 505in_destruct ()
473 CODE: 506 CODE:
474 RETVAL = PL_main_cv == Nullcv; 507 RETVAL = PL_main_cv == Nullcv;
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 548
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
519 554
520 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 557
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
575 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
576 case SDL_KEYUP: 611 case SDL_KEYUP:
577 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
580 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581 break; 617 break;
582 618
583 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
584 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612 break; 648 break;
613 } 649 }
614 650
615 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1)))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616 } 652 }
617} 653}
618 654
619int 655int
620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
632lowdelay (int fd, int val = 1) 668lowdelay (int fd, int val = 1)
633 CODE: 669 CODE:
634#ifndef _WIN32 670#ifndef _WIN32
635 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
636#endif 672#endif
673
674void
675win32_proxy_info ()
676 PPCODE:
677{
678#ifdef _WIN32
679 char buffer[2048];
680 DWORD buflen;
681
682 EXTEND (SP, 3);
683
684 buflen = sizeof (buffer);
685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
687 {
688 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
689
690 buflen = sizeof (buffer);
691 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
692 {
693 PUSHs (newSVpv (buffer, 0));
694
695 buflen = sizeof (buffer);
696 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
697 PUSHs (newSVpv (buffer, 0));
698 }
699 }
700#endif
701}
637 702
638void 703void
639add_font (char *file) 704add_font (char *file)
640 CODE: 705 CODE:
641 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746#endif 811#endif
747 _exit (1); 812 _exit (1);
748 813
749void 814void
750_exit (int retval) 815_exit (int retval = 0)
751 CODE: 816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
752 _exit (retval); 820 _exit (retval);
821#endif
753 822
754MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
755 824
756CFClient::Font 825CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
758 CODE: 827 CODE:
759{ 828{
760 int count; 829 int count;
761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
764} 833}
765 OUTPUT: 834 OUTPUT:
766 RETVAL 835 RETVAL
767 836
768void 837void
769DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
770 CODE: 839 CODE:
771 pango_font_description_free (self); 840 pango_font_description_free (self);
772 841
773void 842void
774make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
775 CODE: 844 CODE:
776 default_font = self; 845 default_font = self;
777 846
778MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
779 848
780void 849void
781reset_glyph_cache () 850reset_glyph_cache ()
782 CODE: 851 CODE:
783 tc_clear (); 852 tc_clear ();
784 853
785CFClient::Layout 854CFPlus::Layout
786new (SV *class) 855new (SV *class)
787 CODE: 856 CODE:
788 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
789 858
790 RETVAL->pl = pango_layout_new (opengl_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
… …
799 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
800 OUTPUT: 869 OUTPUT:
801 RETVAL 870 RETVAL
802 871
803void 872void
804DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
805 CODE: 874 CODE:
806 g_object_unref (self->pl); 875 g_object_unref (self->pl);
807 Safefree (self); 876 Safefree (self);
808 877
809void 878void
810set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
811 CODE: 880 CODE:
812{ 881{
813 STRLEN textlen; 882 STRLEN textlen;
814 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
815 884
816 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
817} 886}
818 887
819void 888void
820set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
821 CODE: 890 CODE:
822{ 891{
823 STRLEN textlen; 892 STRLEN textlen;
824 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
825 894
826 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
827} 896}
828 897
829void 898void
830set_shapes (CFClient::Layout self, ...) 899set_shapes (CFPlus::Layout self, ...)
831 CODE: 900 CODE:
832{ 901{
833 PangoAttrList *attrs = 0; 902 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl); 903 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text; 904 const char *pos = text;
… …
870 if (attrs) 939 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 940 pango_layout_set_attributes (self->pl, attrs);
872} 941}
873 942
874void 943void
875get_shapes (CFClient::Layout self) 944get_shapes (CFPlus::Layout self)
876 PPCODE: 945 PPCODE:
877{ 946{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 947 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 948
880 do 949 do
… …
895 964
896 pango_layout_iter_free (iter); 965 pango_layout_iter_free (iter);
897} 966}
898 967
899int 968int
900has_wrapped (CFClient::Layout self) 969has_wrapped (CFPlus::Layout self)
901 CODE: 970 CODE:
902{ 971{
903 int lines = 1; 972 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl); 973 const char *text = pango_layout_get_text (self->pl);
905 974
… …
910} 979}
911 OUTPUT: 980 OUTPUT:
912 RETVAL 981 RETVAL
913 982
914SV * 983SV *
915get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
916 CODE: 985 CODE:
917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918 sv_utf8_decode (RETVAL); 987 sv_utf8_decode (RETVAL);
919 OUTPUT: 988 OUTPUT:
920 RETVAL 989 RETVAL
921 990
922void 991void
923set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924 CODE: 993 CODE:
925 self->r = r; 994 self->r = r;
926 self->g = g; 995 self->g = g;
927 self->b = b; 996 self->b = b;
928 self->a = a; 997 self->a = a;
929 998
930void 999void
931set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932 CODE: 1001 CODE:
933 if (self->font != font) 1002 if (self->font != font)
934 { 1003 {
935 self->font = font; 1004 self->font = font;
936 layout_update_font (self); 1005 layout_update_font (self);
937 } 1006 }
938 1007
939void 1008void
940set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
941 CODE: 1010 CODE:
942 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
943 { 1012 {
944 self->base_height = base_height; 1013 self->base_height = base_height;
945 layout_update_font (self); 1014 layout_update_font (self);
946 } 1015 }
947 1016
948void 1017void
949set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
950 CODE: 1019 CODE:
951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1020 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952 1021
953void 1022void
954set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
955 CODE: 1024 CODE:
956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957 1026
958void 1027void
959set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
960 CODE: 1029 CODE:
961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962 1031
963void 1032void
964set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
965 CODE: 1034 CODE:
966 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
967 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
970 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
971 ); 1040 );
972 1041
973void 1042void
974set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
975 CODE: 1044 CODE:
976 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977 1046
978void 1047void
979size (CFClient::Layout self) 1048size (CFPlus::Layout self)
980 PPCODE: 1049 PPCODE:
981{ 1050{
982 int w, h; 1051 int w, h;
983 1052
984 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
… …
987 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
988 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
989} 1058}
990 1059
991int 1060int
992descent (CFClient::Layout self) 1061descent (CFPlus::Layout self)
993 CODE: 1062 CODE:
994{ 1063{
995 PangoRectangle rect; 1064 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1065 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect); 1066 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
999} 1068}
1000 OUTPUT: 1069 OUTPUT:
1001 RETVAL 1070 RETVAL
1002 1071
1003int 1072int
1004xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1074 CODE:
1006{ 1075{
1007 int index, trailing; 1076 int index, trailing;
1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009 RETVAL = index; 1078 RETVAL = index + trailing;
1010} 1079}
1011 OUTPUT: 1080 OUTPUT:
1012 RETVAL 1081 RETVAL
1013 1082
1014void 1083void
1015cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
1016 PPCODE: 1085 PPCODE:
1017{ 1086{
1018 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020 1089
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1094}
1026 1095
1027void 1096void
1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1098 PPCODE:
1099{
1100 int line, x;
1101
1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1104
1105 EXTEND (SP, 2);
1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
1128 else
1129 {
1130 PUSHs (sv_2mortal (newSViv (index)));
1131 PUSHs (sv_2mortal (newSViv (trailing)));
1132 }
1133}
1134
1135void
1028render (CFClient::Layout self, float x, float y) 1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1137 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1138 pango_opengl_render_layout_subpixel (
1031 self->pl, 1139 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1140 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1141 self->r, self->g, self->b, self->a,
1142 flags
1034 ); 1143 );
1035 1144
1036MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1146
1038void 1147void
1039pad2pot (SV *data_, SV *w_, SV *h_) 1148pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE: 1149 CODE:
1041{ 1150{
… …
1119 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1121 } 1230 }
1122} 1231}
1123 1232
1124MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1234
1126CFClient::Map 1235CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1236new (SV *class)
1128 CODE: 1237 CODE:
1129 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1239 RETVAL->x = 0;
1131 RETVAL->y = 0; 1240 RETVAL->y = 0;
1132 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1133 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1134 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1135 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1136 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1137 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1138 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
… …
1141 RETVAL->row = 0; 1250 RETVAL->row = 0;
1142 OUTPUT: 1251 OUTPUT:
1143 RETVAL 1252 RETVAL
1144 1253
1145void 1254void
1146DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1147 CODE: 1256 CODE:
1148{ 1257{
1149 map_clear (self); 1258 map_clear (self);
1150 Safefree (self->face); 1259 Safefree (self->face);
1151 Safefree (self->tex); 1260 Safefree (self->tex);
1152 Safefree (self); 1261 Safefree (self);
1153} 1262}
1154 1263
1155void 1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1269
1270void
1156clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1157 CODE: 1272 CODE:
1158 map_clear (self); 1273 map_clear (self);
1159 1274
1160void 1275void
1161set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1162 CODE: 1277 CODE:
1163{ 1278{
1164 while (self->faces <= face) 1279 while (self->faces <= face)
1165 { 1280 {
1166 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
… …
1169 1284
1170 self->face [face] = texid; 1285 self->face [face] = texid;
1171} 1286}
1172 1287
1173void 1288void
1174set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1289set_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: 1290 CODE:
1176{ 1291{
1177 while (self->texs <= texid) 1292 while (self->texs <= texid)
1178 { 1293 {
1179 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
… …
1203 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205} 1320}
1206 1321
1207int 1322int
1208ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1209 ALIAS: 1324 ALIAS:
1210 oy = 1 1325 oy = 1
1211 x = 2 1326 x = 2
1212 y = 3 1327 y = 3
1213 w = 4 1328 w = 4
… …
1224 } 1339 }
1225 OUTPUT: 1340 OUTPUT:
1226 RETVAL 1341 RETVAL
1227 1342
1228void 1343void
1229scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1345 CODE:
1231{ 1346{
1232 if (dx > 0) 1347 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1234 else if (dx < 0) 1349 else if (dx < 0)
1235 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1350 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1236 1351
1237 if (dy > 0) 1352 if (dy > 0)
1238 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1239 else if (dy < 0) 1354 else if (dy < 0)
1240 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1355 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1241 1356
1242 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1243 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1244 1359
1245 while (self->y < 0) 1360 while (self->y < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1251 } 1366 }
1252} 1367}
1253 1368
1254void 1369void
1255map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1371 CODE:
1257{ 1372{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1375 mapcell *cell;
1261 int x, y, flags; 1376 int x, y, flags;
1262 1377
1263 while (data < data_end) 1378 while (data < data_end - 1)
1264 { 1379 {
1265 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1266 1381
1267 x = self->x + ((flags >> 10) & 63); 1382 x = self->x + ((flags >> 10) & 63);
1268 y = self->y + ((flags >> 4) & 63); 1383 y = self->y + ((flags >> 4) & 63);
1269 1384
1270 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1271 1386
1272 if (flags & 15) 1387 if (flags & 15)
1273 { 1388 {
1274 if (cell->darkness < 0) 1389 if (!cell->darkness)
1275 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1276 cell->darkness = 0; 1392 cell->darkness = 256;
1277 cell->face [0] = 0;
1278 cell->face [1] = 0;
1279 cell->face [2] = 0;
1280 } 1393 }
1281 1394
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1396
1397 if (flags & 8)
1398 {
1399 if (extmap)
1400 {
1401 uint8_t ext, cmd;
1402
1403 do
1404 {
1405 ext = *data++;
1406 cmd = ext & 0x3f;
1407
1408 if (cmd < 4)
1409 cell->darkness = 255 - ext * 64 + 1;
1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
1416 cell->stat_width = *data++ + 1;
1417 else if (cmd == 0x47) // monster width
1418 {
1419 if (*data == 4)
1420 ; // decode player tag
1421
1422 data += *data + 1;
1423 }
1424 else if (cmd == 8) // cell flags
1425 cell->flags = *data++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1430 }
1431 while (ext & 0x80);
1432 }
1433 else
1434 cell->darkness = *data++ + 1;
1435 }
1285 1436
1286 if (flags & 4) 1437 if (flags & 4)
1287 { 1438 {
1288 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1439 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1289 } 1440 }
… …
1297 { 1448 {
1298 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1449 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1299 } 1450 }
1300 } 1451 }
1301 else 1452 else
1302 cell->darkness = -1; 1453 cell->darkness = 0;
1303 } 1454 }
1304} 1455}
1305 1456
1306SV * 1457SV *
1307mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308 CODE: 1459 CODE:
1309{ 1460{
1310 int x1, x; 1461 int x1, x;
1311 int y1, y; 1462 int y1, y;
1312 int z; 1463 int z;
… …
1362} 1513}
1363 OUTPUT: 1514 OUTPUT:
1364 RETVAL 1515 RETVAL
1365 1516
1366void 1517void
1367draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1368 CODE: 1519 CODE:
1369{ 1520{
1370 int vx, vy;
1371 int x, y, z; 1521 int x, y, z;
1372 int last_name; 1522 int last_name;
1373 mapface face; 1523 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 1524
1388 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1389 1526
1390 glEnable (GL_BLEND); 1527 glEnable (GL_BLEND);
1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1394 1531
1395 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1396 1533
1397 last_name = 0; 1534 last_name = 0;
1398 1535
1536 mx += self->x;
1537 my += self->y;
1538
1399 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1400 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1401 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1402 { 1542 {
1403 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1404 1544
1405 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1406 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1407 { 1547 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1409 1549
1410 face = cell->face [z]; 1550 face = cell->face [z];
1411 1551
1412 if (face) 1552 if (face && face < self->texs)
1413 { 1553 {
1414 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1415
1416 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * 32 - tex.w;
1417 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * 32 - tex.h;
1418 1557
1419 if (last_name != tex.name) 1558 if (last_name != tex.name)
1420 { 1559 {
1421 glEnd (); 1560 glEnd ();
1422 last_name = tex.name;
1423 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1425 } 1563 }
1426 1564
1427 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1567 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431 } 1569 }
1570
1571 if (cell->flags && z == 2)
1572 {
1573 if (cell->flags & 1)
1574 {
1575 maptex tex = self->tex [1];
1576 int px = (x + 1) * 32 - tex.w + 2;
1577 int py = (y + 1) * 32 - tex.h - 6;
1578
1579 glEnd ();
1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581 glBegin (GL_QUADS);
1582
1583 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587 }
1588 }
1432 } 1589 }
1433 } 1590 }
1434 1591
1435 glEnd (); 1592 glEnd ();
1436 1593
1437 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1439}
1440 1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * 32;
1609 int py = y * 32;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * 32;
1614 int thick = sh / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1627}
1628
1441void 1629void
1442draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1630draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1631 CODE:
1444{ 1632{
1445 static float color[16][3] = { 1633 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F }, 1634 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F }, 1635 { 1.00F, 1.00F, 1.00F },
… …
1497 glDisable (GL_BLEND); 1685 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1686 glDisable (GL_TEXTURE_2D);
1499} 1687}
1500 1688
1501void 1689void
1502fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503 PPCODE: 1691 PPCODE:
1504{ 1692{
1505 int vx, vy;
1506 int x, y; 1693 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1694 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510 1697
1511 memset (darkness, 255, sw4 * sh); 1698 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv); 1699 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh); 1700 SvCUR_set (darkness_sv, sw4 * sh);
1514 1701
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1702 mx += self->x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1703 my += self->y;
1517 1704
1518 for (y = 0; y < sh; y++) 1705 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1706 if (0 <= y + my && y + my < self->rows)
1520 { 1707 {
1521 maprow *row = self->row + (y + vy); 1708 maprow *row = self->row + (y + my);
1522 1709
1523 for (x = 0; x < sw; x++) 1710 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1711 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1712 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1713 mapcell *cell = row->col + (x + mx - row->c0);
1527 1714
1528 darkness[y * sw4 + x] = cell->darkness < 0 1715 darkness[y * sw4 + x] = cell->darkness
1716 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 1717 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 1718 }
1532 } 1719 }
1533 1720
1534 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1536 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1537 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1538} 1725}
1539 1726
1540SV * 1727SV *
1541get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1728get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542 CODE: 1729 CODE:
1543{ 1730{
1544 int x, y, x1, y1; 1731 int x, y, x1, y1;
1545 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1546 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1608} 1795}
1609 OUTPUT: 1796 OUTPUT:
1610 RETVAL 1797 RETVAL
1611 1798
1612void 1799void
1613set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614 PPCODE: 1801 PPCODE:
1615{ 1802{
1616 int x, y, z; 1803 int x, y, z;
1617 int w, h; 1804 int w, h;
1618 int x1, y1; 1805 int x1, y1;
… …
1650 1837
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1654 1841
1655 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1656 { 1843 {
1657 cell->darkness = -1; 1844 cell->darkness = 0;
1658 1845
1659 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1660 { 1847 {
1661 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1662 1849
… …
1667 } 1854 }
1668 } 1855 }
1669 } 1856 }
1670} 1857}
1671 1858
1672MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673 1860
1674CFClient::MixChunk 1861CFPlus::MixChunk
1675new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1676 CODE: 1863 CODE:
1677 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1678 OUTPUT: 1865 OUTPUT:
1679 RETVAL 1866 RETVAL
1680 1867
1681void 1868void
1682DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1683 CODE: 1870 CODE:
1684 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1685 1872
1686int 1873int
1687volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1688 CODE: 1875 CODE:
1689 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1690 OUTPUT: 1877 OUTPUT:
1691 RETVAL 1878 RETVAL
1692 1879
1693int 1880int
1694play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1881play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695 CODE: 1882 CODE:
1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697 OUTPUT: 1884 OUTPUT:
1698 RETVAL 1885 RETVAL
1699 1886
1700MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701 1888
1702int 1889int
1703volume (int volume = -1) 1890volume (int volume = -1)
1704 CODE: 1891 CODE:
1705 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1706 OUTPUT: 1893 OUTPUT:
1707 RETVAL 1894 RETVAL
1708 1895
1709CFClient::MixMusic 1896CFPlus::MixMusic
1710new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1711 CODE: 1898 CODE:
1712 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1713 OUTPUT: 1900 OUTPUT:
1714 RETVAL 1901 RETVAL
1715 1902
1716void 1903void
1717DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1718 CODE: 1905 CODE:
1719 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1720 1907
1721int 1908int
1722play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1723 CODE: 1910 CODE:
1724 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1725 OUTPUT: 1912 OUTPUT:
1726 RETVAL 1913 RETVAL
1727 1914
1728MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729 1916
1730BOOT: 1917BOOT:
1731{ 1918{
1732 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733 static const struct { 1920 static const struct {
1734 const char *name; 1921 const char *name;
1735 IV iv; 1922 IV iv;
1736 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1737# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
… …
1800 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1804 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
… …
2006 2194
2007void glEndList () 2195void glEndList ()
2008 2196
2009void glCallList (int list) 2197void glCallList (int list)
2010 2198
2011

Diff Legend

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