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.131 by root, Thu Jul 13 01:54:18 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 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"
… …
36# include <sys/types.h> 38# include <sys/types.h>
37# include <sys/socket.h> 39# include <sys/socket.h>
38# include <netinet/in.h> 40# include <netinet/in.h>
39# include <netinet/tcp.h> 41# include <netinet/tcp.h>
40# include <inttypes.h> 42# 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 43#endif
49 44
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 46
52#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
53 48
54#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
83 78
84#include "pango-font.c" 79#include "pango-font.c"
85#include "pango-fontmap.c" 80#include "pango-fontmap.c"
86#include "pango-render.c" 81#include "pango-render.c"
87 82
88typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
89typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
90 85
91typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
92 87
93static int 88static int
94shape_attr_p (PangoLayoutRun *run) 89shape_attr_p (PangoLayoutRun *run)
95{ 90{
96 GSList *attrs = run->item->analysis.extra_attrs; 91 GSList *attrs = run->item->analysis.extra_attrs;
… …
110 105
111typedef struct cf_layout { 106typedef struct cf_layout {
112 PangoLayout *pl; 107 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
114 int base_height; 109 int base_height;
115 CFClient__Font font; 110 CFPlus__Font font;
116} *CFClient__Layout; 111} *CFPlus__Layout;
117 112
118static CFClient__Font default_font; 113static CFPlus__Font default_font;
119static PangoContext *opengl_context; 114static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap; 115static PangoFontMap *opengl_fontmap;
121 116
122static void 117static void
123substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
… …
128#endif 123#endif
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130} 125}
131 126
132static void 127static void
133layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
134{ 129{
135 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
136 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
137 */ 132 */
138 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
… …
142 137
143 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
144} 139}
145 140
146static void 141static void
147layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
150 148
151 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 151
154 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
155} 157}
156 158
157typedef uint16_t mapface; 159typedef uint16_t mapface;
158 160
159typedef struct { 161typedef struct {
… …
162 float s, t; 164 float s, t;
163 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
164} maptex; 166} maptex;
165 167
166typedef struct { 168typedef struct {
167 int16_t darkness; 169 uint32_t player;
168 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
169} mapcell; 173} mapcell;
170 174
171typedef struct { 175typedef struct {
172 int32_t c0, c1; 176 int32_t c0, c1;
173 mapcell *col; 177 mapcell *col;
… …
182 int texs; 186 int texs;
183 maptex *tex; 187 maptex *tex;
184 188
185 int32_t rows; 189 int32_t rows;
186 maprow *row; 190 maprow *row;
187} *CFClient__Map; 191} *CFPlus__Map;
188 192
189static char * 193static char *
190prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
191{ 195{
192 char *p; 196 char *p;
… …
210 214
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#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)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213 217
214static maprow * 218static maprow *
215map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
216{ 220{
217 if (0 > y) 221 if (0 > y)
218 { 222 {
219 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
220 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
… …
258 262
259 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
260} 264}
261 265
262static mapcell * 266static mapcell *
263map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
264{ 268{
265 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
266} 270}
267 271
268static void 272static void
269map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
270{ 274{
271 int r; 275 int r;
272 276
273 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
274 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
… …
282 self->row = 0; 286 self->row = 0;
283 self->rows = 0; 287 self->rows = 0;
284} 288}
285 289
286static void 290static void
287map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 292{
289 int x, y; 293 int x, y;
290 maprow *row; 294 maprow *row;
295 mapcell *cell;
291 296
292 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 298 if (y >= 0)
294 { 299 {
295 if (y >= self->rows) 300 if (y >= self->rows)
… …
301 if (x >= row->c0) 306 if (x >= row->c0)
302 { 307 {
303 if (x >= row->c1) 308 if (x >= row->c1)
304 break; 309 break;
305 310
306 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
307 } 317 }
308 } 318 }
309} 319}
310 320
311static void 321static void
… …
349 n |= n >> 16; 359 n |= n >> 16;
350 360
351 return n + 1; 361 return n + 1;
352} 362}
353 363
354MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
355 365
356PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
357 367
358BOOT: 368BOOT:
359{ 369{
360 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
361 static const struct { 371 static const struct {
362 const char *name; 372 const char *name;
363 IV iv; 373 IV iv;
364 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 525
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
519 531
520 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 534
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612 break; 624 break;
613 } 625 }
614 626
615 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616 } 628 }
617} 629}
618 630
619int 631int
620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
632lowdelay (int fd, int val = 1) 644lowdelay (int fd, int val = 1)
633 CODE: 645 CODE:
634#ifndef _WIN32 646#ifndef _WIN32
635 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
636#endif 648#endif
649
650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
637 678
638void 679void
639add_font (char *file) 680add_font (char *file)
640 CODE: 681 CODE:
641 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746#endif 787#endif
747 _exit (1); 788 _exit (1);
748 789
749void 790void
750_exit (int retval) 791_exit (int retval = 0)
751 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
752 _exit (retval); 796 _exit (retval);
797#endif
753 798
754MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
755 800
756CFClient::Font 801CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
758 CODE: 803 CODE:
759{ 804{
760 int count; 805 int count;
761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
764} 809}
765 OUTPUT: 810 OUTPUT:
766 RETVAL 811 RETVAL
767 812
768void 813void
769DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
770 CODE: 815 CODE:
771 pango_font_description_free (self); 816 pango_font_description_free (self);
772 817
773void 818void
774make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
775 CODE: 820 CODE:
776 default_font = self; 821 default_font = self;
777 822
778MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
779 824
780void 825void
781reset_glyph_cache () 826reset_glyph_cache ()
782 CODE: 827 CODE:
783 tc_clear (); 828 tc_clear ();
784 829
785CFClient::Layout 830CFPlus::Layout
786new (SV *class) 831new (SV *class)
787 CODE: 832 CODE:
788 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
789 834
790 RETVAL->pl = pango_layout_new (opengl_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
… …
799 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
800 OUTPUT: 845 OUTPUT:
801 RETVAL 846 RETVAL
802 847
803void 848void
804DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
805 CODE: 850 CODE:
806 g_object_unref (self->pl); 851 g_object_unref (self->pl);
807 Safefree (self); 852 Safefree (self);
808 853
809void 854void
810set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
811 CODE: 856 CODE:
812{ 857{
813 STRLEN textlen; 858 STRLEN textlen;
814 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
815 860
816 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
817} 862}
818 863
819void 864void
820set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
821 CODE: 866 CODE:
822{ 867{
823 STRLEN textlen; 868 STRLEN textlen;
824 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
825 870
826 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
827} 872}
828 873
829void 874void
830set_shapes (CFClient::Layout self, ...) 875set_shapes (CFPlus::Layout self, ...)
831 CODE: 876 CODE:
832{ 877{
833 PangoAttrList *attrs = 0; 878 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl); 879 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text; 880 const char *pos = text;
… …
870 if (attrs) 915 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 916 pango_layout_set_attributes (self->pl, attrs);
872} 917}
873 918
874void 919void
875get_shapes (CFClient::Layout self) 920get_shapes (CFPlus::Layout self)
876 PPCODE: 921 PPCODE:
877{ 922{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 924
880 do 925 do
… …
895 940
896 pango_layout_iter_free (iter); 941 pango_layout_iter_free (iter);
897} 942}
898 943
899int 944int
900has_wrapped (CFClient::Layout self) 945has_wrapped (CFPlus::Layout self)
901 CODE: 946 CODE:
902{ 947{
903 int lines = 1; 948 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl); 949 const char *text = pango_layout_get_text (self->pl);
905 950
… …
910} 955}
911 OUTPUT: 956 OUTPUT:
912 RETVAL 957 RETVAL
913 958
914SV * 959SV *
915get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
916 CODE: 961 CODE:
917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918 sv_utf8_decode (RETVAL); 963 sv_utf8_decode (RETVAL);
919 OUTPUT: 964 OUTPUT:
920 RETVAL 965 RETVAL
921 966
922void 967void
923set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924 CODE: 969 CODE:
925 self->r = r; 970 self->r = r;
926 self->g = g; 971 self->g = g;
927 self->b = b; 972 self->b = b;
928 self->a = a; 973 self->a = a;
929 974
930void 975void
931set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932 CODE: 977 CODE:
933 if (self->font != font) 978 if (self->font != font)
934 { 979 {
935 self->font = font; 980 self->font = font;
936 layout_update_font (self); 981 layout_update_font (self);
937 } 982 }
938 983
939void 984void
940set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
941 CODE: 986 CODE:
942 if (self->base_height != base_height) 987 if (self->base_height != base_height)
943 { 988 {
944 self->base_height = base_height; 989 self->base_height = base_height;
945 layout_update_font (self); 990 layout_update_font (self);
946 } 991 }
947 992
948void 993void
949set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
950 CODE: 995 CODE:
951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952 997
953void 998void
954set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
955 CODE: 1000 CODE:
956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957 1002
958void 1003void
959set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
960 CODE: 1005 CODE:
961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962 1007
963void 1008void
964set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
965 CODE: 1010 CODE:
966 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
967 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
970 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
971 ); 1016 );
972 1017
973void 1018void
974set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
975 CODE: 1020 CODE:
976 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977 1022
978void 1023void
979size (CFClient::Layout self) 1024size (CFPlus::Layout self)
980 PPCODE: 1025 PPCODE:
981{ 1026{
982 int w, h; 1027 int w, h;
983 1028
984 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
… …
987 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
988 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
989} 1034}
990 1035
991int 1036int
992descent (CFClient::Layout self) 1037descent (CFPlus::Layout self)
993 CODE: 1038 CODE:
994{ 1039{
995 PangoRectangle rect; 1040 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect); 1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
999} 1044}
1000 OUTPUT: 1045 OUTPUT:
1001 RETVAL 1046 RETVAL
1002 1047
1003int 1048int
1004xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1050 CODE:
1006{ 1051{
1007 int index, trailing; 1052 int index, trailing;
1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009 RETVAL = index; 1054 RETVAL = index + trailing;
1010} 1055}
1011 OUTPUT: 1056 OUTPUT:
1012 RETVAL 1057 RETVAL
1013 1058
1014void 1059void
1015cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
1016 PPCODE: 1061 PPCODE:
1017{ 1062{
1018 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020 1065
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1070}
1026 1071
1027void 1072void
1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1074 PPCODE:
1075{
1076 int line, x;
1077
1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1080
1081 EXTEND (SP, 2);
1082 PUSHs (sv_2mortal (newSViv (line - 1)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084}
1085
1086void
1087line_x_to_index (CFPlus::Layout self, int line, int x)
1088 PPCODE:
1089{
1090 PangoLayoutLine *lp;
1091 int index, trailing;
1092
1093 if (line < 0)
1094 XSRETURN_EMPTY;
1095
1096 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */
1098
1099 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100
1101 EXTEND (SP, 2);
1102 if (GIMME_V == G_SCALAR)
1103 PUSHs (sv_2mortal (newSViv (index + trailing)));
1104 else
1105 {
1106 PUSHs (sv_2mortal (newSViv (index)));
1107 PUSHs (sv_2mortal (newSViv (trailing)));
1108 }
1109}
1110
1111void
1028render (CFClient::Layout self, float x, float y) 1112render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1113 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1114 pango_opengl_render_layout_subpixel (
1031 self->pl, 1115 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1116 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1117 self->r, self->g, self->b, self->a,
1118 flags
1034 ); 1119 );
1035 1120
1036MODULE = CFClient PACKAGE = CFClient::Texture 1121MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1122
1038void 1123void
1039pad2pot (SV *data_, SV *w_, SV *h_) 1124pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE: 1125 CODE:
1041{ 1126{
… …
1119 glDisable (GL_ALPHA_TEST); 1204 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND); 1205 glDisable (GL_BLEND);
1121 } 1206 }
1122} 1207}
1123 1208
1124MODULE = CFClient PACKAGE = CFClient::Map 1209MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1210
1126CFClient::Map 1211CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1212new (SV *class)
1128 CODE: 1213 CODE:
1129 New (0, RETVAL, 1, struct map); 1214 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1215 RETVAL->x = 0;
1131 RETVAL->y = 0; 1216 RETVAL->y = 0;
1132 RETVAL->w = map_width; 1217 RETVAL->w = 0;
1133 RETVAL->h = map_height; 1218 RETVAL->h = 0;
1134 RETVAL->ox = 0; 1219 RETVAL->ox = 0;
1135 RETVAL->oy = 0; 1220 RETVAL->oy = 0;
1136 RETVAL->faces = 8192; 1221 RETVAL->faces = 8192;
1137 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1222 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1138 RETVAL->texs = 8192; 1223 RETVAL->texs = 8192;
… …
1141 RETVAL->row = 0; 1226 RETVAL->row = 0;
1142 OUTPUT: 1227 OUTPUT:
1143 RETVAL 1228 RETVAL
1144 1229
1145void 1230void
1146DESTROY (CFClient::Map self) 1231DESTROY (CFPlus::Map self)
1147 CODE: 1232 CODE:
1148{ 1233{
1149 map_clear (self); 1234 map_clear (self);
1150 Safefree (self->face); 1235 Safefree (self->face);
1151 Safefree (self->tex); 1236 Safefree (self->tex);
1152 Safefree (self); 1237 Safefree (self);
1153} 1238}
1154 1239
1155void 1240void
1241resize (CFPlus::Map self, int map_width, int map_height)
1242 CODE:
1243 self->w = map_width;
1244 self->h = map_height;
1245
1246void
1156clear (CFClient::Map self) 1247clear (CFPlus::Map self)
1157 CODE: 1248 CODE:
1158 map_clear (self); 1249 map_clear (self);
1159 1250
1160void 1251void
1161set_face (CFClient::Map self, int face, int texid) 1252set_face (CFPlus::Map self, int face, int texid)
1162 CODE: 1253 CODE:
1163{ 1254{
1164 while (self->faces <= face) 1255 while (self->faces <= face)
1165 { 1256 {
1166 Append (mapface, self->face, self->faces, self->faces); 1257 Append (mapface, self->face, self->faces, self->faces);
… …
1169 1260
1170 self->face [face] = texid; 1261 self->face [face] = texid;
1171} 1262}
1172 1263
1173void 1264void
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) 1265set_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: 1266 CODE:
1176{ 1267{
1177 while (self->texs <= texid) 1268 while (self->texs <= texid)
1178 { 1269 {
1179 Append (maptex, self->tex, self->texs, self->texs); 1270 Append (maptex, self->tex, self->texs, self->texs);
… …
1203 // from transparent color bleeding and ugly wrapping effects. 1294 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1295 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205} 1296}
1206 1297
1207int 1298int
1208ox (CFClient::Map self) 1299ox (CFPlus::Map self)
1209 ALIAS: 1300 ALIAS:
1210 oy = 1 1301 oy = 1
1211 x = 2 1302 x = 2
1212 y = 3 1303 y = 3
1213 w = 4 1304 w = 4
… …
1224 } 1315 }
1225 OUTPUT: 1316 OUTPUT:
1226 RETVAL 1317 RETVAL
1227 1318
1228void 1319void
1229scroll (CFClient::Map self, int dx, int dy) 1320scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1321 CODE:
1231{ 1322{
1232 if (dx > 0) 1323 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1324 map_blank (self, self->x, self->y, dx, self->h);
1234 else if (dx < 0) 1325 else if (dx < 0)
1235 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1326 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1236 1327
1237 if (dy > 0) 1328 if (dy > 0)
1238 map_blank (self, self->x, self->y, self->w, dy - 1); 1329 map_blank (self, self->x, self->y, self->w, dy);
1239 else if (dy < 0) 1330 else if (dy < 0)
1240 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1331 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1241 1332
1242 self->ox += dx; self->x += dx; 1333 self->ox += dx; self->x += dx;
1243 self->oy += dy; self->y += dy; 1334 self->oy += dy; self->y += dy;
1244 1335
1245 while (self->y < 0) 1336 while (self->y < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1341 self->y += MAP_EXTEND_Y;
1251 } 1342 }
1252} 1343}
1253 1344
1254void 1345void
1255map1a_update (CFClient::Map self, SV *data_) 1346map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1347 CODE:
1257{ 1348{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1349 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1350 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1351 mapcell *cell;
1261 int x, y, flags; 1352 int x, y, flags;
1262 1353
1263 while (data < data_end) 1354 while (data < data_end - 1)
1264 { 1355 {
1265 flags = (data [0] << 8) + data [1]; data += 2; 1356 flags = (data [0] << 8) + data [1]; data += 2;
1266 1357
1267 x = self->x + ((flags >> 10) & 63); 1358 x = self->x + ((flags >> 10) & 63);
1268 y = self->y + ((flags >> 4) & 63); 1359 y = self->y + ((flags >> 4) & 63);
1269 1360
1270 cell = map_get_cell (self, x, y); 1361 cell = map_get_cell (self, x, y);
1271 1362
1272 if (flags & 15) 1363 if (flags & 15)
1273 { 1364 {
1274 if (cell->darkness < 0) 1365 if (!cell->darkness)
1275 { 1366 {
1367 memset (cell, 0, sizeof (*cell));
1276 cell->darkness = 0; 1368 cell->darkness = 256;
1277 cell->face [0] = 0;
1278 cell->face [1] = 0;
1279 cell->face [2] = 0;
1280 } 1369 }
1281 1370
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //TODO: don't trust server data to be in-range(!) 1371 //TODO: don't trust server data to be in-range(!)
1372
1373 if (flags & 8)
1374 {
1375 if (extmap)
1376 {
1377 uint8_t ext, cmd;
1378
1379 do
1380 {
1381 ext = *data++;
1382 cmd = ext & 0x3f;
1383
1384 if (cmd < 4)
1385 cell->darkness = 255 - ext * 64 + 1;
1386 else if (cmd == 5) // health
1387 {
1388 cell->stat_width = 1;
1389 cell->stat_hp = *data++;
1390 }
1391 else if (cmd == 6) // monster width
1392 cell->stat_width = *data++ + 1;
1393 else if (cmd == 0x47) // monster width
1394 {
1395 if (*data == 4)
1396 ; // decode player tag
1397
1398 data += *data + 1;
1399 }
1400 else if (cmd == 8) // cell flags
1401 cell->flags = *data++;
1402 else if (ext & 0x40) // unknown, multibyte => skip
1403 data += *data + 1;
1404 else
1405 data++;
1406 }
1407 while (ext & 0x80);
1408 }
1409 else
1410 cell->darkness = *data++ + 1;
1411 }
1285 1412
1286 if (flags & 4) 1413 if (flags & 4)
1287 { 1414 {
1288 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1415 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1289 } 1416 }
… …
1297 { 1424 {
1298 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1425 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1299 } 1426 }
1300 } 1427 }
1301 else 1428 else
1302 cell->darkness = -1; 1429 cell->darkness = 0;
1303 } 1430 }
1304} 1431}
1305 1432
1306SV * 1433SV *
1307mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1434mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308 CODE: 1435 CODE:
1309{ 1436{
1310 int x1, x; 1437 int x1, x;
1311 int y1, y; 1438 int y1, y;
1312 int z; 1439 int z;
… …
1362} 1489}
1363 OUTPUT: 1490 OUTPUT:
1364 RETVAL 1491 RETVAL
1365 1492
1366void 1493void
1367draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1494draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1368 CODE: 1495 CODE:
1369{ 1496{
1370 int vx, vy;
1371 int x, y, z; 1497 int x, y, z;
1372 int last_name; 1498 int last_name;
1373 mapface face; 1499 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 1500
1388 glColor4ub (255, 255, 255, 255); 1501 glColor4ub (255, 255, 255, 255);
1389 1502
1390 glEnable (GL_BLEND); 1503 glEnable (GL_BLEND);
1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1504 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1394 1507
1395 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1396 1509
1397 last_name = 0; 1510 last_name = 0;
1398 1511
1512 mx += self->x;
1513 my += self->y;
1514
1399 for (z = 0; z < 3; z++) 1515 for (z = 0; z < 3; z++)
1400 for (y = 0; y < sh; y++) 1516 for (y = 0; y < sh; y++)
1401 if (0 <= y + vy && y + vy < self->rows) 1517 if (0 <= y + my && y + my < self->rows)
1402 { 1518 {
1403 maprow *row = self->row + (y + vy); 1519 maprow *row = self->row + (y + my);
1404 1520
1405 for (x = 0; x < sw; x++) 1521 for (x = 0; x < sw; x++)
1406 if (row->c0 <= x + vx && x + vx < row->c1) 1522 if (row->c0 <= x + mx && x + mx < row->c1)
1407 { 1523 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1524 mapcell *cell = row->col + (x + mx - row->c0);
1409 1525
1410 face = cell->face [z]; 1526 face = cell->face [z];
1411 1527
1412 if (face) 1528 if (face && face < self->texs)
1413 { 1529 {
1414 maptex tex = self->tex [face]; 1530 maptex tex = self->tex [face];
1415
1416 int px = (x + 1) * 32 - tex.w; 1531 int px = (x + 1) * 32 - tex.w;
1417 int py = (y + 1) * 32 - tex.h; 1532 int py = (y + 1) * 32 - tex.h;
1418 1533
1419 if (last_name != tex.name) 1534 if (last_name != tex.name)
1420 { 1535 {
1421 glEnd (); 1536 glEnd ();
1422 last_name = tex.name;
1423 glBindTexture (GL_TEXTURE_2D, last_name); 1537 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424 glBegin (GL_QUADS); 1538 glBegin (GL_QUADS);
1425 } 1539 }
1426 1540
1427 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1541 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1542 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1543 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1544 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431 } 1545 }
1546
1547 if (cell->flags && z == 2)
1548 {
1549 if (cell->flags & 1)
1550 {
1551 maptex tex = self->tex [1];
1552 int px = (x + 1) * 32 - tex.w + 2;
1553 int py = (y + 1) * 32 - tex.h - 6;
1554
1555 glEnd ();
1556 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1557 glBegin (GL_QUADS);
1558
1559 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1560 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1561 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1562 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1563 }
1564 }
1432 } 1565 }
1433 } 1566 }
1434 1567
1435 glEnd (); 1568 glEnd ();
1436 1569
1437 glDisable (GL_TEXTURE_2D); 1570 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1571 glDisable (GL_BLEND);
1439}
1440 1572
1573 // top layer: overlays such as the health bar
1574 for (y = 0; y < sh; y++)
1575 if (0 <= y + my && y + my < self->rows)
1576 {
1577 maprow *row = self->row + (y + my);
1578
1579 for (x = 0; x < sw; x++)
1580 if (row->c0 <= x + mx && x + mx < row->c1)
1581 {
1582 mapcell *cell = row->col + (x + mx - row->c0);
1583
1584 int px = x * 32;
1585 int py = y * 32;
1586
1587 if (cell->stat_hp)
1588 {
1589 int width = cell->stat_width * 32;
1590 int thick = sh / 28 + 1 + cell->stat_width;
1591
1592 glColor3ub (0, 0, 0);
1593 glRectf (px + 1, py - thick - 2,
1594 px + width - 1, py);
1595
1596 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1597 glRectf (px + 2,
1598 py - thick - 1,
1599 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1600 }
1601 }
1602 }
1603}
1604
1441void 1605void
1442draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1606draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1607 CODE:
1444{ 1608{
1445 static float color[16][3] = { 1609 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F }, 1610 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F }, 1611 { 1.00F, 1.00F, 1.00F },
… …
1497 glDisable (GL_BLEND); 1661 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1662 glDisable (GL_TEXTURE_2D);
1499} 1663}
1500 1664
1501void 1665void
1502fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1666fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503 PPCODE: 1667 PPCODE:
1504{ 1668{
1505 int vx, vy;
1506 int x, y; 1669 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1670 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1671 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1672 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510 1673
1511 memset (darkness, 255, sw4 * sh); 1674 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv); 1675 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh); 1676 SvCUR_set (darkness_sv, sw4 * sh);
1514 1677
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1678 mx += self->x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1679 my += self->y;
1517 1680
1518 for (y = 0; y < sh; y++) 1681 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1682 if (0 <= y + my && y + my < self->rows)
1520 { 1683 {
1521 maprow *row = self->row + (y + vy); 1684 maprow *row = self->row + (y + my);
1522 1685
1523 for (x = 0; x < sw; x++) 1686 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1687 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1688 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1689 mapcell *cell = row->col + (x + mx - row->c0);
1527 1690
1528 darkness[y * sw4 + x] = cell->darkness < 0 1691 darkness[y * sw4 + x] = cell->darkness
1692 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 1693 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 1694 }
1532 } 1695 }
1533 1696
1534 EXTEND (SP, 3); 1697 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 1698 PUSHs (sv_2mortal (newSViv (sw4)));
1536 PUSHs (sv_2mortal (newSViv (sh))); 1699 PUSHs (sv_2mortal (newSViv (sh)));
1537 PUSHs (darkness_sv); 1700 PUSHs (darkness_sv);
1538} 1701}
1539 1702
1540SV * 1703SV *
1541get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1704get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542 CODE: 1705 CODE:
1543{ 1706{
1544 int x, y, x1, y1; 1707 int x, y, x1, y1;
1545 SV *data_sv = newSV (w * h * 7 + 5); 1708 SV *data_sv = newSV (w * h * 7 + 5);
1546 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1709 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1608} 1771}
1609 OUTPUT: 1772 OUTPUT:
1610 RETVAL 1773 RETVAL
1611 1774
1612void 1775void
1613set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1776set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614 PPCODE: 1777 PPCODE:
1615{ 1778{
1616 int x, y, z; 1779 int x, y, z;
1617 int w, h; 1780 int w, h;
1618 int x1, y1; 1781 int x1, y1;
… …
1650 1813
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1814 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1815 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1816 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1654 1817
1655 if (cell->darkness <= 0) 1818 if (cell->darkness == 0)
1656 { 1819 {
1657 cell->darkness = -1; 1820 cell->darkness = 0;
1658 1821
1659 for (z = 0; z <= 2; z++) 1822 for (z = 0; z <= 2; z++)
1660 { 1823 {
1661 cell->face[z] = face[z]; 1824 cell->face[z] = face[z];
1662 1825
… …
1667 } 1830 }
1668 } 1831 }
1669 } 1832 }
1670} 1833}
1671 1834
1672MODULE = CFClient PACKAGE = CFClient::MixChunk 1835MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673 1836
1674CFClient::MixChunk 1837CFPlus::MixChunk
1675new_from_file (SV *class, char *path) 1838new_from_file (SV *class, char *path)
1676 CODE: 1839 CODE:
1677 RETVAL = Mix_LoadWAV (path); 1840 RETVAL = Mix_LoadWAV (path);
1678 OUTPUT: 1841 OUTPUT:
1679 RETVAL 1842 RETVAL
1680 1843
1681void 1844void
1682DESTROY (CFClient::MixChunk self) 1845DESTROY (CFPlus::MixChunk self)
1683 CODE: 1846 CODE:
1684 Mix_FreeChunk (self); 1847 Mix_FreeChunk (self);
1685 1848
1686int 1849int
1687volume (CFClient::MixChunk self, int volume = -1) 1850volume (CFPlus::MixChunk self, int volume = -1)
1688 CODE: 1851 CODE:
1689 RETVAL = Mix_VolumeChunk (self, volume); 1852 RETVAL = Mix_VolumeChunk (self, volume);
1690 OUTPUT: 1853 OUTPUT:
1691 RETVAL 1854 RETVAL
1692 1855
1693int 1856int
1694play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1857play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695 CODE: 1858 CODE:
1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1859 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697 OUTPUT: 1860 OUTPUT:
1698 RETVAL 1861 RETVAL
1699 1862
1700MODULE = CFClient PACKAGE = CFClient::MixMusic 1863MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701 1864
1702int 1865int
1703volume (int volume = -1) 1866volume (int volume = -1)
1704 CODE: 1867 CODE:
1705 RETVAL = Mix_VolumeMusic (volume); 1868 RETVAL = Mix_VolumeMusic (volume);
1706 OUTPUT: 1869 OUTPUT:
1707 RETVAL 1870 RETVAL
1708 1871
1709CFClient::MixMusic 1872CFPlus::MixMusic
1710new_from_file (SV *class, char *path) 1873new_from_file (SV *class, char *path)
1711 CODE: 1874 CODE:
1712 RETVAL = Mix_LoadMUS (path); 1875 RETVAL = Mix_LoadMUS (path);
1713 OUTPUT: 1876 OUTPUT:
1714 RETVAL 1877 RETVAL
1715 1878
1716void 1879void
1717DESTROY (CFClient::MixMusic self) 1880DESTROY (CFPlus::MixMusic self)
1718 CODE: 1881 CODE:
1719 Mix_FreeMusic (self); 1882 Mix_FreeMusic (self);
1720 1883
1721int 1884int
1722play (CFClient::MixMusic self, int loops = -1) 1885play (CFPlus::MixMusic self, int loops = -1)
1723 CODE: 1886 CODE:
1724 RETVAL = Mix_PlayMusic (self, loops); 1887 RETVAL = Mix_PlayMusic (self, loops);
1725 OUTPUT: 1888 OUTPUT:
1726 RETVAL 1889 RETVAL
1727 1890
1728MODULE = CFClient PACKAGE = CFClient::OpenGL 1891MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729 1892
1730BOOT: 1893BOOT:
1731{ 1894{
1732 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1895 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733 static const struct { 1896 static const struct {
1734 const char *name; 1897 const char *name;
1735 IV iv; 1898 IV iv;
1736 } *civ, const_iv[] = { 1899 } *civ, const_iv[] = {
1737# define const_iv(name) { # name, (IV)name } 1900# define const_iv(name) { # name, (IV)name }
… …
1800 const_iv (GL_SEPARABLE_2D), 1963 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 1964 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 1965 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 1966 const_iv (GL_CONSTANT_BORDER),
1804 const_iv (GL_LINES), 1967 const_iv (GL_LINES),
1968 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 1969 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 1970 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 1971 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 1972 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 1973 const_iv (GL_TRIANGLE_STRIP),
… …
2006 2170
2007void glEndList () 2171void glEndList ()
2008 2172
2009void glCallList (int list) 2173void glCallList (int list)
2010 2174
2011

Diff Legend

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