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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
6#endif 8#endif
7 9
8#include "EXTERN.h" 10#include "EXTERN.h"
9#include "perl.h" 11#include "perl.h"
10#include "XSUB.h" 12#include "XSUB.h"
13
14#ifdef _WIN32
15# undef pipe
16#endif
11 17
12#include <math.h> 18#include <math.h>
13#include <string.h> 19#include <string.h>
14#include <stdio.h> 20#include <stdio.h>
15#include <stdlib.h> 21#include <stdlib.h>
… …
40 typedef signed char int8_t; 46 typedef signed char int8_t;
41 typedef signed short int16_t; 47 typedef signed short int16_t;
42 typedef signed int int32_t; 48 typedef signed int int32_t;
43#endif 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
53 57
54#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
55 59
56#if 1 60#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 62#else
59# define PARACHUTE 0 63# define PARACHUTE 0
60#endif 64#endif
61 65
… …
80 84
81#include "pango-font.c" 85#include "pango-font.c"
82#include "pango-fontmap.c" 86#include "pango-fontmap.c"
83#include "pango-render.c" 87#include "pango-render.c"
84 88
85typedef Mix_Chunk *CFClient__MixChunk; 89typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 90typedef Mix_Music *CFPlus__MixMusic;
87 91
88typedef PangoFontDescription *CFClient__Font; 92typedef PangoFontDescription *CFPlus__Font;
89 93
90static int 94static int
91shape_attr_p (PangoLayoutRun *run) 95shape_attr_p (PangoLayoutRun *run)
92{ 96{
93 GSList *attrs = run->item->analysis.extra_attrs; 97 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 111
108typedef struct cf_layout { 112typedef struct cf_layout {
109 PangoLayout *pl; 113 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 114 float r, g, b, a; // default color for rgba mode
111 int base_height; 115 int base_height;
112 CFClient__Font font; 116 CFPlus__Font font;
113} *CFClient__Layout; 117} *CFPlus__Layout;
114 118
115static CFClient__Font default_font; 119static CFPlus__Font default_font;
116static PangoContext *opengl_context; 120static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 121static PangoFontMap *opengl_fontmap;
118 122
119static void 123static void
120substitute_func (FcPattern *pattern, gpointer data) 124substitute_func (FcPattern *pattern, gpointer data)
121{ 125{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 126 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 127#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 128 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 129#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 130 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 131}
132 132
133static void 133static void
134layout_update_font (CFClient__Layout self) 134layout_update_font (CFPlus__Layout self)
135{ 135{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 136 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 137 * reasonably well with bitstream vera
138 */ 138 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 139 PangoFontDescription *font = self->font ? self->font : default_font;
… …
143 143
144 pango_layout_set_font_description (self->pl, font); 144 pango_layout_set_font_description (self->pl, font);
145} 145}
146 146
147static void 147static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 149{
150 PangoRectangle rect;
151
152 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
151 154
152 if (!*w) *w = 1; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 157
155 *w = (*w + 3) & ~3; 158 if (!rect.width) rect.width = 1;
159 if (!rect.height) rect.height = 1;
160
161 *w = rect.width;
162 *h = rect.height;
156} 163}
157 164
158typedef uint16_t mapface; 165typedef uint16_t mapface;
159 166
160typedef struct { 167typedef struct {
… …
163 float s, t; 170 float s, t;
164 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
165} maptex; 172} maptex;
166 173
167typedef struct { 174typedef struct {
168 int16_t darkness; 175 uint32_t player;
169 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
170} mapcell; 179} mapcell;
171 180
172typedef struct { 181typedef struct {
173 int32_t c0, c1; 182 int32_t c0, c1;
174 mapcell *col; 183 mapcell *col;
… …
183 int texs; 192 int texs;
184 maptex *tex; 193 maptex *tex;
185 194
186 int32_t rows; 195 int32_t rows;
187 maprow *row; 196 maprow *row;
188} *CFClient__Map; 197} *CFPlus__Map;
189 198
190static char * 199static char *
191prepend (char *ptr, int sze, int inc) 200prepend (char *ptr, int sze, int inc)
192{ 201{
193 char *p; 202 char *p;
… …
211 220
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 222#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 223
215static maprow * 224static maprow *
216map_get_row (CFClient__Map self, int y) 225map_get_row (CFPlus__Map self, int y)
217{ 226{
218 if (0 > y) 227 if (0 > y)
219 { 228 {
220 int extend = - y + MAP_EXTEND_Y; 229 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 230 Prepend (maprow, self->row, self->rows, extend);
… …
259 268
260 return row->col + (x - row->c0); 269 return row->col + (x - row->c0);
261} 270}
262 271
263static mapcell * 272static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 273map_get_cell (CFPlus__Map self, int x, int y)
265{ 274{
266 return row_get_cell (map_get_row (self, y), x); 275 return row_get_cell (map_get_row (self, y), x);
267} 276}
268 277
269static void 278static void
270map_clear (CFClient__Map self) 279map_clear (CFPlus__Map self)
271{ 280{
272 int r; 281 int r;
273 282
274 for (r = 0; r < self->rows; r++) 283 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 284 Safefree (self->row[r].col);
… …
283 self->row = 0; 292 self->row = 0;
284 self->rows = 0; 293 self->rows = 0;
285} 294}
286 295
287static void 296static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 298{
290 int x, y; 299 int x, y;
291 maprow *row; 300 maprow *row;
301 mapcell *cell;
292 302
293 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 304 if (y >= 0)
295 { 305 {
296 if (y >= self->rows) 306 if (y >= self->rows)
… …
302 if (x >= row->c0) 312 if (x >= row->c0)
303 { 313 {
304 if (x >= row->c1) 314 if (x >= row->c1)
305 break; 315 break;
306 316
307 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
308 } 323 }
309 } 324 }
310} 325}
311 326
312static void 327static void
… …
350 n |= n >> 16; 365 n |= n >> 16;
351 366
352 return n + 1; 367 return n + 1;
353} 368}
354 369
355MODULE = CFClient PACKAGE = CFClient 370MODULE = CFPlus PACKAGE = CFPlus
356 371
357PROTOTYPES: ENABLE 372PROTOTYPES: ENABLE
358 373
359BOOT: 374BOOT:
360{ 375{
361 HV *stash = gv_stashpv ("CFClient", 1); 376 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 377 static const struct {
363 const char *name; 378 const char *name;
364 IV iv; 379 IV iv;
365 } *civ, const_iv[] = { 380 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 381# define const_iv(name) { # name, (IV)name }
… …
467 482
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
470} 485}
471 486
487int
488in_destruct ()
489 CODE:
490 RETVAL = PL_main_cv == Nullcv;
491 OUTPUT:
492 RETVAL
493
472NV floor (NV x) 494NV floor (NV x)
473 495
474NV ceil (NV x) 496NV ceil (NV x)
475 497
476void 498void
… …
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 531
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10)
534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif
511 537
512 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
514 540
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 630 break;
605 } 631 }
606 632
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 634 }
609} 635}
610 636
611int 637int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 638Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
626#ifndef _WIN32 652#ifndef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
628#endif 654#endif
629 655
630void 656void
657win32_proxy_info ()
658 PPCODE:
659{
660#ifdef _WIN32
661 char buffer[2048];
662 DWORD buflen;
663
664 EXTEND (SP, 3);
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
671
672 buflen = sizeof (buffer);
673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
674 {
675 PUSHs (newSVpv (buffer, 0));
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
679 PUSHs (newSVpv (buffer, 0));
680 }
681 }
682#endif
683}
684
685void
631add_font (char *file) 686add_font (char *file)
632 CODE: 687 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 689
635void 690void
636load_image_inline (SV *image_) 691load_image_inline (SV *image_)
637 ALIAS: 692 ALIAS:
638 load_image_file = 1 693 load_image_file = 1
… …
680 735
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 737
683 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
684 739
740 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 741 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
690 SDL_UnlockSurface (surface2);
691 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
694 749
695 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
697} 752}
698 753
… …
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 793#endif
739 _exit (1); 794 _exit (1);
740 795
741void 796void
742_exit (int retval) 797_exit (int retval = 0)
743 CODE: 798 CODE:
799#ifdef WIN32
800 ExitThread (retval); // unclean, please beam me up
801#else
744 _exit (retval); 802 _exit (retval);
803#endif
745 804
746MODULE = CFClient PACKAGE = CFClient::Font 805MODULE = CFPlus PACKAGE = CFPlus::Font
747 806
748CFClient::Font 807CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 808new_from_file (SV *class, char *path, int id = 0)
750 CODE: 809 CODE:
751{ 810{
752 int count; 811 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 812 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
756} 815}
757 OUTPUT: 816 OUTPUT:
758 RETVAL 817 RETVAL
759 818
760void 819void
761DESTROY (CFClient::Font self) 820DESTROY (CFPlus::Font self)
762 CODE: 821 CODE:
763 pango_font_description_free (self); 822 pango_font_description_free (self);
764 823
765void 824void
766make_default (CFClient::Font self) 825make_default (CFPlus::Font self)
767 CODE: 826 CODE:
768 default_font = self; 827 default_font = self;
769 828
770MODULE = CFClient PACKAGE = CFClient::Layout 829MODULE = CFPlus PACKAGE = CFPlus::Layout
771 830
772void 831void
773clear_font_cache () 832reset_glyph_cache ()
774 CODE: 833 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 834 tc_clear ();
777 835
778CFClient::Layout 836CFPlus::Layout
779new (SV *class, int type = 0) 837new (SV *class)
780 CODE: 838 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 839 New (0, RETVAL, 1, struct cf_layout);
782 840
783 RETVAL->pl = pango_layout_new (opengl_context); 841 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 842 RETVAL->r = 1.;
… …
792 layout_update_font (RETVAL); 850 layout_update_font (RETVAL);
793 OUTPUT: 851 OUTPUT:
794 RETVAL 852 RETVAL
795 853
796void 854void
797DESTROY (CFClient::Layout self) 855DESTROY (CFPlus::Layout self)
798 CODE: 856 CODE:
799 g_object_unref (self->pl); 857 g_object_unref (self->pl);
800 Safefree (self); 858 Safefree (self);
801 859
802void 860void
803set_text (CFClient::Layout self, SV *text_) 861set_text (CFPlus::Layout self, SV *text_)
804 CODE: 862 CODE:
805{ 863{
806 STRLEN textlen; 864 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 865 char *text = SvPVutf8 (text_, textlen);
808 866
809 pango_layout_set_text (self->pl, text, textlen); 867 pango_layout_set_text (self->pl, text, textlen);
810} 868}
811 869
812void 870void
813set_markup (CFClient::Layout self, SV *text_) 871set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 872 CODE:
815{ 873{
816 STRLEN textlen; 874 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 875 char *text = SvPVutf8 (text_, textlen);
818 876
819 pango_layout_set_markup (self->pl, text, textlen); 877 pango_layout_set_markup (self->pl, text, textlen);
820} 878}
821 879
822void 880void
823set_shapes (CFClient::Layout self, ...) 881set_shapes (CFPlus::Layout self, ...)
824 CODE: 882 CODE:
825{ 883{
826 PangoAttrList *attrs = 0; 884 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 885 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 886 const char *pos = text;
… …
863 if (attrs) 921 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 922 pango_layout_set_attributes (self->pl, attrs);
865} 923}
866 924
867void 925void
868get_shapes (CFClient::Layout self) 926get_shapes (CFPlus::Layout self)
869 PPCODE: 927 PPCODE:
870{ 928{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 929 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 930
873 do 931 do
… …
877 if (run && shape_attr_p (run)) 935 if (run && shape_attr_p (run))
878 { 936 {
879 PangoRectangle extents; 937 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 938 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 939
940 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 941 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 942 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 943 }
885 } 944 }
886 while (pango_layout_iter_next_run (iter)); 945 while (pango_layout_iter_next_run (iter));
887 946
888 pango_layout_iter_free (iter); 947 pango_layout_iter_free (iter);
889} 948}
890 949
891int 950int
892has_wrapped (CFClient::Layout self) 951has_wrapped (CFPlus::Layout self)
893 CODE: 952 CODE:
894{ 953{
895 int lines = 1; 954 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 955 const char *text = pango_layout_get_text (self->pl);
897 956
… …
902} 961}
903 OUTPUT: 962 OUTPUT:
904 RETVAL 963 RETVAL
905 964
906SV * 965SV *
907get_text (CFClient::Layout self) 966get_text (CFPlus::Layout self)
908 CODE: 967 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 968 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 969 sv_utf8_decode (RETVAL);
911 OUTPUT: 970 OUTPUT:
912 RETVAL 971 RETVAL
913 972
914void 973void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 974set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 975 CODE:
917 self->r = r; 976 self->r = r;
918 self->g = g; 977 self->g = g;
919 self->b = b; 978 self->b = b;
920 self->a = a; 979 self->a = a;
921 980
922void 981void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 982set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 983 CODE:
925 if (self->font != font) 984 if (self->font != font)
926 { 985 {
927 self->font = font; 986 self->font = font;
928 layout_update_font (self); 987 layout_update_font (self);
929 } 988 }
930 989
931void 990void
932set_height (CFClient::Layout self, int base_height) 991set_height (CFPlus::Layout self, int base_height)
933 CODE: 992 CODE:
934 if (self->base_height != base_height) 993 if (self->base_height != base_height)
935 { 994 {
936 self->base_height = base_height; 995 self->base_height = base_height;
937 layout_update_font (self); 996 layout_update_font (self);
938 } 997 }
939 998
940void 999void
941set_width (CFClient::Layout self, int max_width = -1) 1000set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1001 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1002 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1003
945void 1004void
946set_indent (CFClient::Layout self, int indent) 1005set_indent (CFPlus::Layout self, int indent)
947 CODE: 1006 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1007 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1008
950void 1009void
951set_spacing (CFClient::Layout self, int spacing) 1010set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1011 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1012 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1013
955void 1014void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1015set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1016 CODE:
958 pango_layout_set_ellipsize (self->pl, 1017 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1018 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1019 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1020 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1021 : PANGO_ELLIPSIZE_NONE
963 ); 1022 );
964 1023
965void 1024void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1025set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1026 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1027 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1028
970void 1029void
971size (CFClient::Layout self) 1030size (CFPlus::Layout self)
972 PPCODE: 1031 PPCODE:
973{ 1032{
974 int w, h; 1033 int w, h;
975 1034
976 layout_get_pixel_size (self, &w, &h); 1035 layout_get_pixel_size (self, &w, &h);
… …
979 PUSHs (sv_2mortal (newSViv (w))); 1038 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1039 PUSHs (sv_2mortal (newSViv (h)));
981} 1040}
982 1041
983int 1042int
984descent (CFClient::Layout self) 1043descent (CFPlus::Layout self)
985 CODE: 1044 CODE:
986{ 1045{
987 PangoRectangle rect; 1046 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1047 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1048 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
991} 1050}
992 OUTPUT: 1051 OUTPUT:
993 RETVAL 1052 RETVAL
994 1053
995int 1054int
996xy_to_index (CFClient::Layout self, int x, int y) 1055xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1056 CODE:
998{ 1057{
999 int index, trailing; 1058 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1059 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1060 RETVAL = index;
1002} 1061}
1003 OUTPUT: 1062 OUTPUT:
1004 RETVAL 1063 RETVAL
1005 1064
1006void 1065void
1007cursor_pos (CFClient::Layout self, int index) 1066cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1067 PPCODE:
1009{ 1068{
1010 PangoRectangle strong_pos; 1069 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1070 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1071
… …
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1074 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1075 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1076}
1018 1077
1019void 1078void
1020render (CFClient::Layout self, float x, float y) 1079render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1080 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1081 pango_opengl_render_layout_subpixel (
1023 self->pl, 1082 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1083 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1084 self->r, self->g, self->b, self->a,
1085 flags
1026 ); 1086 );
1027 1087
1028MODULE = CFClient PACKAGE = CFClient::Texture 1088MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1089
1030void 1090void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1091pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1092 CODE:
1033{ 1093{
… …
1111 glDisable (GL_ALPHA_TEST); 1171 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1172 glDisable (GL_BLEND);
1113 } 1173 }
1114} 1174}
1115 1175
1116MODULE = CFClient PACKAGE = CFClient::Map 1176MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1177
1118CFClient::Map 1178CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1179new (SV *class, int map_width, int map_height)
1120 CODE: 1180 CODE:
1121 New (0, RETVAL, 1, struct map); 1181 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1182 RETVAL->x = 0;
1123 RETVAL->y = 0; 1183 RETVAL->y = 0;
… …
1133 RETVAL->row = 0; 1193 RETVAL->row = 0;
1134 OUTPUT: 1194 OUTPUT:
1135 RETVAL 1195 RETVAL
1136 1196
1137void 1197void
1138DESTROY (CFClient::Map self) 1198DESTROY (CFPlus::Map self)
1139 CODE: 1199 CODE:
1140{ 1200{
1141 map_clear (self); 1201 map_clear (self);
1142 Safefree (self->face); 1202 Safefree (self->face);
1143 Safefree (self->tex); 1203 Safefree (self->tex);
1144 Safefree (self); 1204 Safefree (self);
1145} 1205}
1146 1206
1147void 1207void
1148clear (CFClient::Map self) 1208clear (CFPlus::Map self)
1149 CODE: 1209 CODE:
1150 map_clear (self); 1210 map_clear (self);
1151 1211
1152void 1212void
1153set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1154 CODE: 1214 CODE:
1155{ 1215{
1156 while (self->faces <= face) 1216 while (self->faces <= face)
1157 { 1217 {
1158 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
… …
1161 1221
1162 self->face [face] = texid; 1222 self->face [face] = texid;
1163} 1223}
1164 1224
1165void 1225void
1166set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1167 CODE: 1227 CODE:
1168{ 1228{
1169 while (self->texs <= texid) 1229 while (self->texs <= texid)
1170 { 1230 {
1171 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
… …
1195 // from transparent color bleeding and ugly wrapping effects. 1255 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1257}
1198 1258
1199int 1259int
1200ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1201 ALIAS: 1261 ALIAS:
1202 oy = 1 1262 oy = 1
1203 x = 2 1263 x = 2
1204 y = 3 1264 y = 3
1205 w = 4 1265 w = 4
… …
1216 } 1276 }
1217 OUTPUT: 1277 OUTPUT:
1218 RETVAL 1278 RETVAL
1219 1279
1220void 1280void
1221scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1282 CODE:
1223{ 1283{
1224 if (dx > 0) 1284 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1286 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1228 1288
1229 if (dy > 0) 1289 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1291 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1233 1293
1234 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1236 1296
1237 while (self->y < 0) 1297 while (self->y < 0)
… …
1242 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1243 } 1303 }
1244} 1304}
1245 1305
1246void 1306void
1247map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1308 CODE:
1249{ 1309{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1312 mapcell *cell;
1253 int x, y, flags; 1313 int x, y, flags;
1254 1314
1255 while (data < data_end) 1315 while (data < data_end - 1)
1256 { 1316 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1258 1318
1259 x = self->x + ((flags >> 10) & 63); 1319 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1320 y = self->y + ((flags >> 4) & 63);
1261 1321
1262 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1263 1323
1264 if (flags & 15) 1324 if (flags & 15)
1265 { 1325 {
1266 if (cell->darkness < 0) 1326 if (!cell->darkness)
1267 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1329 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1330 }
1273 1331
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1333
1334 if (flags & 8)
1335 {
1336 if (extmap)
1337 {
1338 uint8_t ext, cmd;
1339
1340 do
1341 {
1342 ext = *data++;
1343 cmd = ext & 0x3f;
1344
1345 if (cmd < 4)
1346 cell->darkness = 255 - ext * 64 + 1;
1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1363 else if (ext & 0x40) // unknown, multibyte => skip
1364 data += *data + 1;
1365 else
1366 data++;
1367 }
1368 while (ext & 0x80);
1369 }
1370 else
1371 cell->darkness = *data++ + 1;
1372 }
1277 1373
1278 if (flags & 4) 1374 if (flags & 4)
1279 { 1375 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1281 } 1377 }
… …
1289 { 1385 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1291 } 1387 }
1292 } 1388 }
1293 else 1389 else
1294 cell->darkness = -1; 1390 cell->darkness = 0;
1295 } 1391 }
1296} 1392}
1297 1393
1298SV * 1394SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1396 CODE:
1301{ 1397{
1302 int x1, x; 1398 int x1, x;
1303 int y1, y; 1399 int y1, y;
1304 int z; 1400 int z;
… …
1354} 1450}
1355 OUTPUT: 1451 OUTPUT:
1356 RETVAL 1452 RETVAL
1357 1453
1358void 1454void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1360 CODE: 1456 CODE:
1361{ 1457{
1362 int vx, vy; 1458 int vx, vy;
1363 int x, y, z; 1459 int x, y, z;
1364 int last_name; 1460 int last_name;
… …
1399 { 1495 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1496 mapcell *cell = row->col + (x + vx - row->c0);
1401 1497
1402 face = cell->face [z]; 1498 face = cell->face [z];
1403 1499
1404 if (face) 1500 if (face && face < self->texs)
1405 { 1501 {
1406 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [face];
1407
1408 int px = (x + 1) * 32 - tex.w; 1503 int px = (x + 1) * 32 - tex.w;
1409 int py = (y + 1) * 32 - tex.h; 1504 int py = (y + 1) * 32 - tex.h;
1410 1505
1411 if (last_name != tex.name) 1506 if (last_name != tex.name)
1412 { 1507 {
1413 glEnd (); 1508 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1509 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1510 glBegin (GL_QUADS);
1417 } 1511 }
1418 1512
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1513 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1514 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1515 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1516 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1423 } 1517 }
1518
1519 if (cell->flags && z == 2)
1520 {
1521 if (cell->flags & 1)
1522 {
1523 maptex tex = self->tex [1];
1524 int px = (x + 1) * 32 - tex.w + 2;
1525 int py = (y + 1) * 32 - tex.h - 6;
1526
1527 glEnd ();
1528 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1529 glBegin (GL_QUADS);
1530
1531 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1532 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1533 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1534 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1535 }
1536 }
1424 } 1537 }
1425 } 1538 }
1426 1539
1427 glEnd (); 1540 glEnd ();
1428 1541
1429 glDisable (GL_TEXTURE_2D); 1542 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1543 glDisable (GL_BLEND);
1431}
1432 1544
1545 // top layer: overlays such as the health bar
1546 for (y = 0; y < sh; y++)
1547 if (0 <= y + vy && y + vy < self->rows)
1548 {
1549 maprow *row = self->row + (y + vy);
1550
1551 for (x = 0; x < sw; x++)
1552 if (row->c0 <= x + vx && x + vx < row->c1)
1553 {
1554 mapcell *cell = row->col + (x + vx - row->c0);
1555
1556 int px = x * 32;
1557 int py = y * 32;
1558
1559 if (cell->stat_hp)
1560 {
1561 int width = cell->stat_width * 32;
1562 int thick = sh / 28 + 1 + cell->stat_width;
1563
1564 glColor3ub (0, 0, 0);
1565 glRectf (px + 1, py - thick - 2,
1566 px + width - 1, py);
1567
1568 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1569 glRectf (px + 2,
1570 py - thick - 1,
1571 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1572 }
1573 }
1574 }
1575}
1576
1433void 1577void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1578draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1579 CODE:
1436{ 1580{
1437 static float color[16][3] = { 1581 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1582 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1583 { 1.00F, 1.00F, 1.00F },
… …
1489 glDisable (GL_BLEND); 1633 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1634 glDisable (GL_TEXTURE_2D);
1491} 1635}
1492 1636
1493void 1637void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1638fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1495 PPCODE: 1639 PPCODE:
1496{ 1640{
1497 int vx, vy; 1641 int vx, vy;
1498 int x, y; 1642 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1643 int sw4 = (sw + 3) & ~3;
… …
1515 for (x = 0; x < sw; x++) 1659 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1660 if (row->c0 <= x + vx && x + vx < row->c1)
1517 { 1661 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1662 mapcell *cell = row->col + (x + vx - row->c0);
1519 1663
1520 darkness[y * sw4 + x] = cell->darkness < 0 1664 darkness[y * sw4 + x] = cell->darkness
1665 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1666 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1667 }
1524 } 1668 }
1525 1669
1526 EXTEND (SP, 3); 1670 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1671 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1672 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1673 PUSHs (darkness_sv);
1530} 1674}
1531 1675
1532SV * 1676SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1677get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1678 CODE:
1535{ 1679{
1536 int x, y, x1, y1; 1680 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1681 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1682 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1600} 1744}
1601 OUTPUT: 1745 OUTPUT:
1602 RETVAL 1746 RETVAL
1603 1747
1604void 1748void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1749set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 1750 PPCODE:
1607{ 1751{
1608 int x, y, z; 1752 int x, y, z;
1609 int w, h; 1753 int w, h;
1610 int x1, y1; 1754 int x1, y1;
… …
1642 1786
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1787 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1788 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1789 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1646 1790
1647 if (cell->darkness <= 0) 1791 if (cell->darkness == 0)
1648 { 1792 {
1649 cell->darkness = -1; 1793 cell->darkness = 0;
1650 1794
1651 for (z = 0; z <= 2; z++) 1795 for (z = 0; z <= 2; z++)
1652 { 1796 {
1653 cell->face[z] = face[z]; 1797 cell->face[z] = face[z];
1654 1798
… …
1659 } 1803 }
1660 } 1804 }
1661 } 1805 }
1662} 1806}
1663 1807
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 1808MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 1809
1666CFClient::MixChunk 1810CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 1811new_from_file (SV *class, char *path)
1668 CODE: 1812 CODE:
1669 RETVAL = Mix_LoadWAV (path); 1813 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 1814 OUTPUT:
1671 RETVAL 1815 RETVAL
1672 1816
1673void 1817void
1674DESTROY (CFClient::MixChunk self) 1818DESTROY (CFPlus::MixChunk self)
1675 CODE: 1819 CODE:
1676 Mix_FreeChunk (self); 1820 Mix_FreeChunk (self);
1677 1821
1678int 1822int
1679volume (CFClient::MixChunk self, int volume = -1) 1823volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 1824 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 1825 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 1826 OUTPUT:
1683 RETVAL 1827 RETVAL
1684 1828
1685int 1829int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1830play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 1831 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1832 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 1833 OUTPUT:
1690 RETVAL 1834 RETVAL
1691 1835
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 1836MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 1837
1694int 1838int
1695volume (int volume = -1) 1839volume (int volume = -1)
1696 CODE: 1840 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 1841 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 1842 OUTPUT:
1699 RETVAL 1843 RETVAL
1700 1844
1701CFClient::MixMusic 1845CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 1846new_from_file (SV *class, char *path)
1703 CODE: 1847 CODE:
1704 RETVAL = Mix_LoadMUS (path); 1848 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 1849 OUTPUT:
1706 RETVAL 1850 RETVAL
1707 1851
1708void 1852void
1709DESTROY (CFClient::MixMusic self) 1853DESTROY (CFPlus::MixMusic self)
1710 CODE: 1854 CODE:
1711 Mix_FreeMusic (self); 1855 Mix_FreeMusic (self);
1712 1856
1713int 1857int
1714play (CFClient::MixMusic self, int loops = -1) 1858play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 1859 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 1860 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 1861 OUTPUT:
1718 RETVAL 1862 RETVAL
1719 1863
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 1864MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 1865
1722BOOT: 1866BOOT:
1723{ 1867{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1868 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 1869 static const struct {
1726 const char *name; 1870 const char *name;
1727 IV iv; 1871 IV iv;
1728 } *civ, const_iv[] = { 1872 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 1873# define const_iv(name) { # name, (IV)name }
… …
1792 const_iv (GL_SEPARABLE_2D), 1936 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 1937 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 1938 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 1939 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 1940 const_iv (GL_LINES),
1941 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 1942 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 1943 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 1944 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 1945 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 1946 const_iv (GL_TRIANGLE_STRIP),
… …
1911 r *= a; 2056 r *= a;
1912 g *= a; 2057 g *= a;
1913 b *= a; 2058 b *= a;
1914 } 2059 }
1915 // microsoft visual "c" rounds instead of truncating... 2060 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2061 glColor4f (r, g, b, a);
1917 MIN ((int)(g * 256.f), 255),
1918 MIN ((int)(b * 256.f), 255),
1919 MIN ((int)(a * 256.f), 255));
1920 2062
1921void glInterleavedArrays (int format, int stride, char *data) 2063void glInterleavedArrays (int format, int stride, char *data)
1922 2064
1923void glDrawElements (int mode, int count, int type, char *indices) 2065void glDrawElements (int mode, int count, int type, char *indices)
1924 2066
… …
2001 2143
2002void glEndList () 2144void glEndList ()
2003 2145
2004void glCallList (int list) 2146void glCallList (int list)
2005 2147
2006

Diff Legend

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