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.128 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 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)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
15#include <stdlib.h> 22#include <stdlib.h>
… …
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 46
49#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
50 48
51#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
80 78
81#include "pango-font.c" 79#include "pango-font.c"
82#include "pango-fontmap.c" 80#include "pango-fontmap.c"
83#include "pango-render.c" 81#include "pango-render.c"
84 82
85typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
87 85
88typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
89 87
90static int 88static int
91shape_attr_p (PangoLayoutRun *run) 89shape_attr_p (PangoLayoutRun *run)
92{ 90{
93 GSList *attrs = run->item->analysis.extra_attrs; 91 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 105
108typedef struct cf_layout { 106typedef struct cf_layout {
109 PangoLayout *pl; 107 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
111 int base_height; 109 int base_height;
112 CFClient__Font font; 110 CFPlus__Font font;
113} *CFClient__Layout; 111} *CFPlus__Layout;
114 112
115static CFClient__Font default_font; 113static CFPlus__Font default_font;
116static PangoContext *opengl_context; 114static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 115static PangoFontMap *opengl_fontmap;
118 116
119static void 117static void
120substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
… …
125#endif 123#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 125}
128 126
129static void 127static void
130layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
131{ 129{
132 /* 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
133 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
134 */ 132 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
… …
139 137
140 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
141} 139}
142 140
143static void 141static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
147 148
148 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 151
151 *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;
152} 157}
153 158
154typedef uint16_t mapface; 159typedef uint16_t mapface;
155 160
156typedef struct { 161typedef struct {
… …
159 float s, t; 164 float s, t;
160 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
161} maptex; 166} maptex;
162 167
163typedef struct { 168typedef struct {
164 int16_t darkness; 169 uint32_t player;
165 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
166} mapcell; 173} mapcell;
167 174
168typedef struct { 175typedef struct {
169 int32_t c0, c1; 176 int32_t c0, c1;
170 mapcell *col; 177 mapcell *col;
… …
179 int texs; 186 int texs;
180 maptex *tex; 187 maptex *tex;
181 188
182 int32_t rows; 189 int32_t rows;
183 maprow *row; 190 maprow *row;
184} *CFClient__Map; 191} *CFPlus__Map;
185 192
186static char * 193static char *
187prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
188{ 195{
189 char *p; 196 char *p;
… …
207 214
208#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))
209#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))
210 217
211static maprow * 218static maprow *
212map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
213{ 220{
214 if (0 > y) 221 if (0 > y)
215 { 222 {
216 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
… …
255 262
256 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
257} 264}
258 265
259static mapcell * 266static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
261{ 268{
262 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
263} 270}
264 271
265static void 272static void
266map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
267{ 274{
268 int r; 275 int r;
269 276
270 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
… …
279 self->row = 0; 286 self->row = 0;
280 self->rows = 0; 287 self->rows = 0;
281} 288}
282 289
283static void 290static void
284map_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)
285{ 292{
286 int x, y; 293 int x, y;
287 maprow *row; 294 maprow *row;
295 mapcell *cell;
288 296
289 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 298 if (y >= 0)
291 { 299 {
292 if (y >= self->rows) 300 if (y >= self->rows)
… …
298 if (x >= row->c0) 306 if (x >= row->c0)
299 { 307 {
300 if (x >= row->c1) 308 if (x >= row->c1)
301 break; 309 break;
302 310
303 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;
304 } 317 }
305 } 318 }
306} 319}
307 320
308static void 321static void
… …
346 n |= n >> 16; 359 n |= n >> 16;
347 360
348 return n + 1; 361 return n + 1;
349} 362}
350 363
351MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
352 365
353PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
354 367
355BOOT: 368BOOT:
356{ 369{
357 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 371 static const struct {
359 const char *name; 372 const char *name;
360 IV iv; 373 IV iv;
361 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
… …
463 476
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
466} 479}
467 480
481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
468NV floor (NV x) 488NV floor (NV x)
469 489
470NV ceil (NV x) 490NV ceil (NV x)
471 491
472void 492void
… …
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 525
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
507 531
508 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 534
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 624 break;
601 } 625 }
602 626
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 628 }
605} 629}
606 630
607int 631int
608Mix_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)
… …
622#ifndef _WIN32 646#ifndef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
624#endif 648#endif
625 649
626void 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}
678
679void
627add_font (char *file) 680add_font (char *file)
628 CODE: 681 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 683
631void 684void
632load_image_inline (SV *image_) 685load_image_inline (SV *image_)
633 ALIAS: 686 ALIAS:
634 load_image_file = 1 687 load_image_file = 1
… …
676 729
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 731
679 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
680 733
734 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 735 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
690 743
691 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
693} 746}
694 747
… …
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 787#endif
735 _exit (1); 788 _exit (1);
736 789
737void 790void
738_exit (int retval) 791_exit (int retval = 0)
739 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
740 _exit (retval); 796 _exit (retval);
797#endif
741 798
742MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
743 800
744CFClient::Font 801CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
746 CODE: 803 CODE:
747{ 804{
748 int count; 805 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 809}
753 OUTPUT: 810 OUTPUT:
754 RETVAL 811 RETVAL
755 812
756void 813void
757DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
758 CODE: 815 CODE:
759 pango_font_description_free (self); 816 pango_font_description_free (self);
760 817
761void 818void
762make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
763 CODE: 820 CODE:
764 default_font = self; 821 default_font = self;
765 822
766MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
767 824
768void 825void
769clear_font_cache () 826reset_glyph_cache ()
770 CODE: 827 CODE:
771 tc_clear (); 828 tc_clear ();
772 829
773CFClient::Layout 830CFPlus::Layout
774new (SV *class) 831new (SV *class)
775 CODE: 832 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
777 834
778 RETVAL->pl = pango_layout_new (opengl_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
… …
787 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
788 OUTPUT: 845 OUTPUT:
789 RETVAL 846 RETVAL
790 847
791void 848void
792DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
793 CODE: 850 CODE:
794 g_object_unref (self->pl); 851 g_object_unref (self->pl);
795 Safefree (self); 852 Safefree (self);
796 853
797void 854void
798set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
799 CODE: 856 CODE:
800{ 857{
801 STRLEN textlen; 858 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
803 860
804 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
805} 862}
806 863
807void 864void
808set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 866 CODE:
810{ 867{
811 STRLEN textlen; 868 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
813 870
814 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
815} 872}
816 873
817void 874void
818set_shapes (CFClient::Layout self, ...) 875set_shapes (CFPlus::Layout self, ...)
819 CODE: 876 CODE:
820{ 877{
821 PangoAttrList *attrs = 0; 878 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 879 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 880 const char *pos = text;
… …
858 if (attrs) 915 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 916 pango_layout_set_attributes (self->pl, attrs);
860} 917}
861 918
862void 919void
863get_shapes (CFClient::Layout self) 920get_shapes (CFPlus::Layout self)
864 PPCODE: 921 PPCODE:
865{ 922{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 924
868 do 925 do
… …
872 if (run && shape_attr_p (run)) 929 if (run && shape_attr_p (run))
873 { 930 {
874 PangoRectangle extents; 931 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 932 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 933
934 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 937 }
880 } 938 }
881 while (pango_layout_iter_next_run (iter)); 939 while (pango_layout_iter_next_run (iter));
882 940
883 pango_layout_iter_free (iter); 941 pango_layout_iter_free (iter);
884} 942}
885 943
886int 944int
887has_wrapped (CFClient::Layout self) 945has_wrapped (CFPlus::Layout self)
888 CODE: 946 CODE:
889{ 947{
890 int lines = 1; 948 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 949 const char *text = pango_layout_get_text (self->pl);
892 950
… …
897} 955}
898 OUTPUT: 956 OUTPUT:
899 RETVAL 957 RETVAL
900 958
901SV * 959SV *
902get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
903 CODE: 961 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 963 sv_utf8_decode (RETVAL);
906 OUTPUT: 964 OUTPUT:
907 RETVAL 965 RETVAL
908 966
909void 967void
910set_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.)
911 CODE: 969 CODE:
912 self->r = r; 970 self->r = r;
913 self->g = g; 971 self->g = g;
914 self->b = b; 972 self->b = b;
915 self->a = a; 973 self->a = a;
916 974
917void 975void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 977 CODE:
920 if (self->font != font) 978 if (self->font != font)
921 { 979 {
922 self->font = font; 980 self->font = font;
923 layout_update_font (self); 981 layout_update_font (self);
924 } 982 }
925 983
926void 984void
927set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
928 CODE: 986 CODE:
929 if (self->base_height != base_height) 987 if (self->base_height != base_height)
930 { 988 {
931 self->base_height = base_height; 989 self->base_height = base_height;
932 layout_update_font (self); 990 layout_update_font (self);
933 } 991 }
934 992
935void 993void
936set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 995 CODE:
938 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);
939 997
940void 998void
941set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
942 CODE: 1000 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1002
945void 1003void
946set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1005 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1007
950void 1008void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1010 CODE:
953 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
958 ); 1016 );
959 1017
960void 1018void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1020 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1022
965void 1023void
966size (CFClient::Layout self) 1024size (CFPlus::Layout self)
967 PPCODE: 1025 PPCODE:
968{ 1026{
969 int w, h; 1027 int w, h;
970 1028
971 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
… …
974 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
976} 1034}
977 1035
978int 1036int
979descent (CFClient::Layout self) 1037descent (CFPlus::Layout self)
980 CODE: 1038 CODE:
981{ 1039{
982 PangoRectangle rect; 1040 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
986} 1044}
987 OUTPUT: 1045 OUTPUT:
988 RETVAL 1046 RETVAL
989 1047
990int 1048int
991xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1050 CODE:
993{ 1051{
994 int index, trailing; 1052 int index, trailing;
995 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);
996 RETVAL = index; 1054 RETVAL = index;
997} 1055}
998 OUTPUT: 1056 OUTPUT:
999 RETVAL 1057 RETVAL
1000 1058
1001void 1059void
1002cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1061 PPCODE:
1004{ 1062{
1005 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1065
… …
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1070}
1013 1071
1014void 1072void
1015render (CFClient::Layout self, float x, float y) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
1016 PPCODE: 1074 PPCODE:
1017 pango_opengl_render_layout_subpixel ( 1075 pango_opengl_render_layout_subpixel (
1018 self->pl, 1076 self->pl,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1077 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1078 self->r, self->g, self->b, self->a,
1079 flags
1021 ); 1080 );
1022 1081
1023MODULE = CFClient PACKAGE = CFClient::Texture 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
1024 1083
1025void 1084void
1026pad2pot (SV *data_, SV *w_, SV *h_) 1085pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE: 1086 CODE:
1028{ 1087{
… …
1106 glDisable (GL_ALPHA_TEST); 1165 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1108 } 1167 }
1109} 1168}
1110 1169
1111MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1171
1113CFClient::Map 1172CFPlus::Map
1114new (SV *class, int map_width, int map_height) 1173new (SV *class, int map_width, int map_height)
1115 CODE: 1174 CODE:
1116 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1176 RETVAL->x = 0;
1118 RETVAL->y = 0; 1177 RETVAL->y = 0;
… …
1128 RETVAL->row = 0; 1187 RETVAL->row = 0;
1129 OUTPUT: 1188 OUTPUT:
1130 RETVAL 1189 RETVAL
1131 1190
1132void 1191void
1133DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
1134 CODE: 1193 CODE:
1135{ 1194{
1136 map_clear (self); 1195 map_clear (self);
1137 Safefree (self->face); 1196 Safefree (self->face);
1138 Safefree (self->tex); 1197 Safefree (self->tex);
1139 Safefree (self); 1198 Safefree (self);
1140} 1199}
1141 1200
1142void 1201void
1143clear (CFClient::Map self) 1202clear (CFPlus::Map self)
1144 CODE: 1203 CODE:
1145 map_clear (self); 1204 map_clear (self);
1146 1205
1147void 1206void
1148set_face (CFClient::Map self, int face, int texid) 1207set_face (CFPlus::Map self, int face, int texid)
1149 CODE: 1208 CODE:
1150{ 1209{
1151 while (self->faces <= face) 1210 while (self->faces <= face)
1152 { 1211 {
1153 Append (mapface, self->face, self->faces, self->faces); 1212 Append (mapface, self->face, self->faces, self->faces);
… …
1156 1215
1157 self->face [face] = texid; 1216 self->face [face] = texid;
1158} 1217}
1159 1218
1160void 1219void
1161set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1220set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1162 CODE: 1221 CODE:
1163{ 1222{
1164 while (self->texs <= texid) 1223 while (self->texs <= texid)
1165 { 1224 {
1166 Append (maptex, self->tex, self->texs, self->texs); 1225 Append (maptex, self->tex, self->texs, self->texs);
… …
1190 // from transparent color bleeding and ugly wrapping effects. 1249 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1250 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1251}
1193 1252
1194int 1253int
1195ox (CFClient::Map self) 1254ox (CFPlus::Map self)
1196 ALIAS: 1255 ALIAS:
1197 oy = 1 1256 oy = 1
1198 x = 2 1257 x = 2
1199 y = 3 1258 y = 3
1200 w = 4 1259 w = 4
… …
1211 } 1270 }
1212 OUTPUT: 1271 OUTPUT:
1213 RETVAL 1272 RETVAL
1214 1273
1215void 1274void
1216scroll (CFClient::Map self, int dx, int dy) 1275scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1276 CODE:
1218{ 1277{
1219 if (dx > 0) 1278 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1279 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1280 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1281 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1223 1282
1224 if (dy > 0) 1283 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1284 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1285 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1286 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1228 1287
1229 self->ox += dx; self->x += dx; 1288 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1289 self->oy += dy; self->y += dy;
1231 1290
1232 while (self->y < 0) 1291 while (self->y < 0)
… …
1237 self->y += MAP_EXTEND_Y; 1296 self->y += MAP_EXTEND_Y;
1238 } 1297 }
1239} 1298}
1240 1299
1241void 1300void
1242map1a_update (CFClient::Map self, SV *data_) 1301map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1302 CODE:
1244{ 1303{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1304 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1305 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1306 mapcell *cell;
1248 int x, y, flags; 1307 int x, y, flags;
1249 1308
1250 while (data < data_end) 1309 while (data < data_end - 1)
1251 { 1310 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1311 flags = (data [0] << 8) + data [1]; data += 2;
1253 1312
1254 x = self->x + ((flags >> 10) & 63); 1313 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1314 y = self->y + ((flags >> 4) & 63);
1256 1315
1257 cell = map_get_cell (self, x, y); 1316 cell = map_get_cell (self, x, y);
1258 1317
1259 if (flags & 15) 1318 if (flags & 15)
1260 { 1319 {
1261 if (cell->darkness < 0) 1320 if (!cell->darkness)
1262 { 1321 {
1322 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1323 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1324 }
1268 1325
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1326 //TODO: don't trust server data to be in-range(!)
1327
1328 if (flags & 8)
1329 {
1330 if (extmap)
1331 {
1332 uint8_t ext, cmd;
1333
1334 do
1335 {
1336 ext = *data++;
1337 cmd = ext & 0x3f;
1338
1339 if (cmd < 4)
1340 cell->darkness = 255 - ext * 64 + 1;
1341 else if (cmd == 5) // health
1342 {
1343 cell->stat_width = 1;
1344 cell->stat_hp = *data++;
1345 }
1346 else if (cmd == 6) // monster width
1347 cell->stat_width = *data++ + 1;
1348 else if (cmd == 0x47) // monster width
1349 {
1350 if (*data == 4)
1351 ; // decode player tag
1352
1353 data += *data + 1;
1354 }
1355 else if (cmd == 8) // cell flags
1356 cell->flags = *data++;
1357 else if (ext & 0x40) // unknown, multibyte => skip
1358 data += *data + 1;
1359 else
1360 data++;
1361 }
1362 while (ext & 0x80);
1363 }
1364 else
1365 cell->darkness = *data++ + 1;
1366 }
1272 1367
1273 if (flags & 4) 1368 if (flags & 4)
1274 { 1369 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1370 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1276 } 1371 }
… …
1284 { 1379 {
1285 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1380 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1286 } 1381 }
1287 } 1382 }
1288 else 1383 else
1289 cell->darkness = -1; 1384 cell->darkness = 0;
1290 } 1385 }
1291} 1386}
1292 1387
1293SV * 1388SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1389mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1390 CODE:
1296{ 1391{
1297 int x1, x; 1392 int x1, x;
1298 int y1, y; 1393 int y1, y;
1299 int z; 1394 int z;
… …
1349} 1444}
1350 OUTPUT: 1445 OUTPUT:
1351 RETVAL 1446 RETVAL
1352 1447
1353void 1448void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1355 CODE: 1450 CODE:
1356{ 1451{
1357 int vx, vy; 1452 int vx, vy;
1358 int x, y, z; 1453 int x, y, z;
1359 int last_name; 1454 int last_name;
1360 mapface face; 1455 mapface face;
1361 1456
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1364 1459
1365 /* 1460 /*
1366 int vx = self->vx = self->w >= sw 1461 int vx = self->vx = self->w >= sw
1367 ? self->x + (self->w - sw) / 2 1462 ? self->x + (self->w - sw) / 2
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
… …
1394 { 1489 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1490 mapcell *cell = row->col + (x + vx - row->c0);
1396 1491
1397 face = cell->face [z]; 1492 face = cell->face [z];
1398 1493
1399 if (face) 1494 if (face && face < self->texs)
1400 { 1495 {
1401 maptex tex = self->tex [face]; 1496 maptex tex = self->tex [face];
1402
1403 int px = (x + 1) * 32 - tex.w; 1497 int px = (x + 1) * 32 - tex.w;
1404 int py = (y + 1) * 32 - tex.h; 1498 int py = (y + 1) * 32 - tex.h;
1405 1499
1406 if (last_name != tex.name) 1500 if (last_name != tex.name)
1407 { 1501 {
1408 glEnd (); 1502 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411 glBegin (GL_QUADS); 1504 glBegin (GL_QUADS);
1412 } 1505 }
1413 1506
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1509 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1511 }
1512
1513 if (cell->flags && z == 2)
1514 {
1515 if (cell->flags & 1)
1516 {
1517 maptex tex = self->tex [1];
1518 int px = (x + 1) * 32 - tex.w + 2;
1519 int py = (y + 1) * 32 - tex.h - 6;
1520
1521 glEnd ();
1522 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523 glBegin (GL_QUADS);
1524
1525 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529 }
1530 }
1419 } 1531 }
1420 } 1532 }
1421 1533
1422 glEnd (); 1534 glEnd ();
1423 1535
1424 glDisable (GL_TEXTURE_2D); 1536 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1537 glDisable (GL_BLEND);
1426}
1427 1538
1539 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows)
1542 {
1543 maprow *row = self->row + (y + vy);
1544
1545 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1)
1547 {
1548 mapcell *cell = row->col + (x + vx - row->c0);
1549
1550 int px = x * 32;
1551 int py = y * 32;
1552
1553 if (cell->stat_hp)
1554 {
1555 int width = cell->stat_width * 32;
1556 int thick = sh / 28 + 1 + cell->stat_width;
1557
1558 glColor3ub (0, 0, 0);
1559 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py);
1561
1562 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1563 glRectf (px + 2,
1564 py - thick - 1,
1565 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1566 }
1567 }
1568 }
1569}
1570
1428void 1571void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1572draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 1573 CODE:
1431{ 1574{
1432 static float color[16][3] = { 1575 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 1576 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 1577 { 1.00F, 1.00F, 1.00F },
… …
1484 glDisable (GL_BLEND); 1627 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 1628 glDisable (GL_TEXTURE_2D);
1486} 1629}
1487 1630
1488void 1631void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1490 PPCODE: 1633 PPCODE:
1491{ 1634{
1492 int vx, vy; 1635 int vx, vy;
1493 int x, y; 1636 int x, y;
1494 int sw4 = (sw + 3) & ~3; 1637 int sw4 = (sw + 3) & ~3;
… …
1510 for (x = 0; x < sw; x++) 1653 for (x = 0; x < sw; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 1654 if (row->c0 <= x + vx && x + vx < row->c1)
1512 { 1655 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 1656 mapcell *cell = row->col + (x + vx - row->c0);
1514 1657
1515 darkness[y * sw4 + x] = cell->darkness < 0 1658 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 1660 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 1661 }
1519 } 1662 }
1520 1663
1521 EXTEND (SP, 3); 1664 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 1665 PUSHs (sv_2mortal (newSViv (sw4)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 1666 PUSHs (sv_2mortal (newSViv (sh)));
1524 PUSHs (darkness_sv); 1667 PUSHs (darkness_sv);
1525} 1668}
1526 1669
1527SV * 1670SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1671get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529 CODE: 1672 CODE:
1530{ 1673{
1531 int x, y, x1, y1; 1674 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 1675 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1676 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1595} 1738}
1596 OUTPUT: 1739 OUTPUT:
1597 RETVAL 1740 RETVAL
1598 1741
1599void 1742void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1743set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 1744 PPCODE:
1602{ 1745{
1603 int x, y, z; 1746 int x, y, z;
1604 int w, h; 1747 int w, h;
1605 int x1, y1; 1748 int x1, y1;
… …
1637 1780
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1781 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1782 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1783 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1641 1784
1642 if (cell->darkness <= 0) 1785 if (cell->darkness == 0)
1643 { 1786 {
1644 cell->darkness = -1; 1787 cell->darkness = 0;
1645 1788
1646 for (z = 0; z <= 2; z++) 1789 for (z = 0; z <= 2; z++)
1647 { 1790 {
1648 cell->face[z] = face[z]; 1791 cell->face[z] = face[z];
1649 1792
… …
1654 } 1797 }
1655 } 1798 }
1656 } 1799 }
1657} 1800}
1658 1801
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 1802MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660 1803
1661CFClient::MixChunk 1804CFPlus::MixChunk
1662new_from_file (SV *class, char *path) 1805new_from_file (SV *class, char *path)
1663 CODE: 1806 CODE:
1664 RETVAL = Mix_LoadWAV (path); 1807 RETVAL = Mix_LoadWAV (path);
1665 OUTPUT: 1808 OUTPUT:
1666 RETVAL 1809 RETVAL
1667 1810
1668void 1811void
1669DESTROY (CFClient::MixChunk self) 1812DESTROY (CFPlus::MixChunk self)
1670 CODE: 1813 CODE:
1671 Mix_FreeChunk (self); 1814 Mix_FreeChunk (self);
1672 1815
1673int 1816int
1674volume (CFClient::MixChunk self, int volume = -1) 1817volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 1818 CODE:
1676 RETVAL = Mix_VolumeChunk (self, volume); 1819 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 1820 OUTPUT:
1678 RETVAL 1821 RETVAL
1679 1822
1680int 1823int
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1824play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 1825 CODE:
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1826 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684 OUTPUT: 1827 OUTPUT:
1685 RETVAL 1828 RETVAL
1686 1829
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 1830MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 1831
1689int 1832int
1690volume (int volume = -1) 1833volume (int volume = -1)
1691 CODE: 1834 CODE:
1692 RETVAL = Mix_VolumeMusic (volume); 1835 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 1836 OUTPUT:
1694 RETVAL 1837 RETVAL
1695 1838
1696CFClient::MixMusic 1839CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 1840new_from_file (SV *class, char *path)
1698 CODE: 1841 CODE:
1699 RETVAL = Mix_LoadMUS (path); 1842 RETVAL = Mix_LoadMUS (path);
1700 OUTPUT: 1843 OUTPUT:
1701 RETVAL 1844 RETVAL
1702 1845
1703void 1846void
1704DESTROY (CFClient::MixMusic self) 1847DESTROY (CFPlus::MixMusic self)
1705 CODE: 1848 CODE:
1706 Mix_FreeMusic (self); 1849 Mix_FreeMusic (self);
1707 1850
1708int 1851int
1709play (CFClient::MixMusic self, int loops = -1) 1852play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 1853 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 1854 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 1855 OUTPUT:
1713 RETVAL 1856 RETVAL
1714 1857
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 1858MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1716 1859
1717BOOT: 1860BOOT:
1718{ 1861{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1862 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 1863 static const struct {
1721 const char *name; 1864 const char *name;
1722 IV iv; 1865 IV iv;
1723 } *civ, const_iv[] = { 1866 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 1867# define const_iv(name) { # name, (IV)name }
… …
1787 const_iv (GL_SEPARABLE_2D), 1930 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 1931 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 1932 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 1933 const_iv (GL_CONSTANT_BORDER),
1791 const_iv (GL_LINES), 1934 const_iv (GL_LINES),
1935 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 1936 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 1937 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 1938 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 1939 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 1940 const_iv (GL_TRIANGLE_STRIP),
… …
1906 r *= a; 2050 r *= a;
1907 g *= a; 2051 g *= a;
1908 b *= a; 2052 b *= a;
1909 } 2053 }
1910 // microsoft visual "c" rounds instead of truncating... 2054 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2055 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915 2056
1916void glInterleavedArrays (int format, int stride, char *data) 2057void glInterleavedArrays (int format, int stride, char *data)
1917 2058
1918void glDrawElements (int mode, int count, int type, char *indices) 2059void glDrawElements (int mode, int count, int type, char *indices)
1919 2060
… …
1996 2137
1997void glEndList () 2138void glEndList ()
1998 2139
1999void glCallList (int list) 2140void glCallList (int list)
2000 2141
2001

Diff Legend

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