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.127 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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