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.161 by root, Mon Oct 9 23:30:44 2006 UTC

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

Diff Legend

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