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.158 by root, Sun Oct 1 18:17:37 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 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048];
663 DWORD buflen;
664
665 EXTEND (SP, 3);
666
667 buflen = sizeof (buffer);
668 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
669 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
670 {
671 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
672
673 buflen = sizeof (buffer);
674 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
675 {
676 PUSHs (newSVpv (buffer, 0));
677
678 buflen = sizeof (buffer);
679 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
680 PUSHs (newSVpv (buffer, 0));
681 }
682 }
683#endif
684}
685
686void
627add_font (char *file) 687add_font (char *file)
628 CODE: 688 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 689 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 690
631void 691void
632load_image_inline (SV *image_) 692load_image_inline (SV *image_)
633 ALIAS: 693 ALIAS:
634 load_image_file = 1 694 load_image_file = 1
… …
676 736
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 737 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 738
679 assert (surface2->pitch == surface2->w * 4); 739 assert (surface2->pitch == surface2->w * 4);
680 740
741 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 742 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 743 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 744 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 745 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))); 746 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 747 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 748 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
749 SDL_UnlockSurface (surface2);
690 750
691 SDL_FreeSurface (surface); 751 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 752 SDL_FreeSurface (surface2);
693} 753}
694 754
… …
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 793 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 794#endif
735 _exit (1); 795 _exit (1);
736 796
737void 797void
738_exit (int retval) 798_exit (int retval = 0)
739 CODE: 799 CODE:
740 _exit (retval); 800 _exit (retval);
741 801
742MODULE = CFClient PACKAGE = CFClient::Font 802MODULE = CFPlus PACKAGE = CFPlus::Font
743 803
744CFClient::Font 804CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 805new_from_file (SV *class, char *path, int id = 0)
746 CODE: 806 CODE:
747{ 807{
748 int count; 808 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 809 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 812}
753 OUTPUT: 813 OUTPUT:
754 RETVAL 814 RETVAL
755 815
756void 816void
757DESTROY (CFClient::Font self) 817DESTROY (CFPlus::Font self)
758 CODE: 818 CODE:
759 pango_font_description_free (self); 819 pango_font_description_free (self);
760 820
761void 821void
762make_default (CFClient::Font self) 822make_default (CFPlus::Font self)
763 CODE: 823 CODE:
764 default_font = self; 824 default_font = self;
765 825
766MODULE = CFClient PACKAGE = CFClient::Layout 826MODULE = CFPlus PACKAGE = CFPlus::Layout
767 827
768void 828void
769clear_font_cache () 829reset_glyph_cache ()
770 CODE: 830 CODE:
771 tc_clear (); 831 tc_clear ();
772 832
773CFClient::Layout 833CFPlus::Layout
774new (SV *class, int type = 0) 834new (SV *class)
775 CODE: 835 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 836 New (0, RETVAL, 1, struct cf_layout);
777 837
778 RETVAL->pl = pango_layout_new (opengl_context); 838 RETVAL->pl = pango_layout_new (opengl_context);
779 RETVAL->r = 1.; 839 RETVAL->r = 1.;
… …
787 layout_update_font (RETVAL); 847 layout_update_font (RETVAL);
788 OUTPUT: 848 OUTPUT:
789 RETVAL 849 RETVAL
790 850
791void 851void
792DESTROY (CFClient::Layout self) 852DESTROY (CFPlus::Layout self)
793 CODE: 853 CODE:
794 g_object_unref (self->pl); 854 g_object_unref (self->pl);
795 Safefree (self); 855 Safefree (self);
796 856
797void 857void
798set_text (CFClient::Layout self, SV *text_) 858set_text (CFPlus::Layout self, SV *text_)
799 CODE: 859 CODE:
800{ 860{
801 STRLEN textlen; 861 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 862 char *text = SvPVutf8 (text_, textlen);
803 863
804 pango_layout_set_text (self->pl, text, textlen); 864 pango_layout_set_text (self->pl, text, textlen);
805} 865}
806 866
807void 867void
808set_markup (CFClient::Layout self, SV *text_) 868set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 869 CODE:
810{ 870{
811 STRLEN textlen; 871 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 872 char *text = SvPVutf8 (text_, textlen);
813 873
814 pango_layout_set_markup (self->pl, text, textlen); 874 pango_layout_set_markup (self->pl, text, textlen);
815} 875}
816 876
817void 877void
818set_shapes (CFClient::Layout self, ...) 878set_shapes (CFPlus::Layout self, ...)
819 CODE: 879 CODE:
820{ 880{
821 PangoAttrList *attrs = 0; 881 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 882 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 883 const char *pos = text;
… …
858 if (attrs) 918 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 919 pango_layout_set_attributes (self->pl, attrs);
860} 920}
861 921
862void 922void
863get_shapes (CFClient::Layout self) 923get_shapes (CFPlus::Layout self)
864 PPCODE: 924 PPCODE:
865{ 925{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 926 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 927
868 do 928 do
… …
872 if (run && shape_attr_p (run)) 932 if (run && shape_attr_p (run))
873 { 933 {
874 PangoRectangle extents; 934 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 935 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 936
937 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 939 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 940 }
880 } 941 }
881 while (pango_layout_iter_next_run (iter)); 942 while (pango_layout_iter_next_run (iter));
882 943
883 pango_layout_iter_free (iter); 944 pango_layout_iter_free (iter);
884} 945}
885 946
886int 947int
887has_wrapped (CFClient::Layout self) 948has_wrapped (CFPlus::Layout self)
888 CODE: 949 CODE:
889{ 950{
890 int lines = 1; 951 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 952 const char *text = pango_layout_get_text (self->pl);
892 953
… …
897} 958}
898 OUTPUT: 959 OUTPUT:
899 RETVAL 960 RETVAL
900 961
901SV * 962SV *
902get_text (CFClient::Layout self) 963get_text (CFPlus::Layout self)
903 CODE: 964 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 965 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 966 sv_utf8_decode (RETVAL);
906 OUTPUT: 967 OUTPUT:
907 RETVAL 968 RETVAL
908 969
909void 970void
910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 971set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
911 CODE: 972 CODE:
912 self->r = r; 973 self->r = r;
913 self->g = g; 974 self->g = g;
914 self->b = b; 975 self->b = b;
915 self->a = a; 976 self->a = a;
916 977
917void 978void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 979set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 980 CODE:
920 if (self->font != font) 981 if (self->font != font)
921 { 982 {
922 self->font = font; 983 self->font = font;
923 layout_update_font (self); 984 layout_update_font (self);
924 } 985 }
925 986
926void 987void
927set_height (CFClient::Layout self, int base_height) 988set_height (CFPlus::Layout self, int base_height)
928 CODE: 989 CODE:
929 if (self->base_height != base_height) 990 if (self->base_height != base_height)
930 { 991 {
931 self->base_height = base_height; 992 self->base_height = base_height;
932 layout_update_font (self); 993 layout_update_font (self);
933 } 994 }
934 995
935void 996void
936set_width (CFClient::Layout self, int max_width = -1) 997set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 998 CODE:
938 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 999 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939 1000
940void 1001void
941set_indent (CFClient::Layout self, int indent) 1002set_indent (CFPlus::Layout self, int indent)
942 CODE: 1003 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1004 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1005
945void 1006void
946set_spacing (CFClient::Layout self, int spacing) 1007set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1008 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1009 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1010
950void 1011void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1012set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1013 CODE:
953 pango_layout_set_ellipsize (self->pl, 1014 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1015 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1016 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1017 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1018 : PANGO_ELLIPSIZE_NONE
958 ); 1019 );
959 1020
960void 1021void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1022set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1023 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1024 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1025
965void 1026void
966size (CFClient::Layout self) 1027size (CFPlus::Layout self)
967 PPCODE: 1028 PPCODE:
968{ 1029{
969 int w, h; 1030 int w, h;
970 1031
971 layout_get_pixel_size (self, &w, &h); 1032 layout_get_pixel_size (self, &w, &h);
… …
974 PUSHs (sv_2mortal (newSViv (w))); 1035 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1036 PUSHs (sv_2mortal (newSViv (h)));
976} 1037}
977 1038
978int 1039int
979descent (CFClient::Layout self) 1040descent (CFPlus::Layout self)
980 CODE: 1041 CODE:
981{ 1042{
982 PangoRectangle rect; 1043 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1044 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1045 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
986} 1047}
987 OUTPUT: 1048 OUTPUT:
988 RETVAL 1049 RETVAL
989 1050
990int 1051int
991xy_to_index (CFClient::Layout self, int x, int y) 1052xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1053 CODE:
993{ 1054{
994 int index, trailing; 1055 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1056 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1057 RETVAL = index;
997} 1058}
998 OUTPUT: 1059 OUTPUT:
999 RETVAL 1060 RETVAL
1000 1061
1001void 1062void
1002cursor_pos (CFClient::Layout self, int index) 1063cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1064 PPCODE:
1004{ 1065{
1005 PangoRectangle strong_pos; 1066 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1067 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1068
… …
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1072 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1073}
1013 1074
1014void 1075void
1015render (CFClient::Layout self, float x, float y) 1076render (CFPlus::Layout self, float x, float y, int flags = 0)
1016 PPCODE: 1077 PPCODE:
1017 pango_opengl_render_layout_subpixel ( 1078 pango_opengl_render_layout_subpixel (
1018 self->pl, 1079 self->pl,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1080 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1081 self->r, self->g, self->b, self->a,
1082 flags
1021 ); 1083 );
1022 1084
1023MODULE = CFClient PACKAGE = CFClient::Texture 1085MODULE = CFPlus PACKAGE = CFPlus::Texture
1024 1086
1025void 1087void
1026pad2pot (SV *data_, SV *w_, SV *h_) 1088pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE: 1089 CODE:
1028{ 1090{
… …
1106 glDisable (GL_ALPHA_TEST); 1168 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1169 glDisable (GL_BLEND);
1108 } 1170 }
1109} 1171}
1110 1172
1111MODULE = CFClient PACKAGE = CFClient::Map 1173MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1174
1113CFClient::Map 1175CFPlus::Map
1114new (SV *class, int map_width, int map_height) 1176new (SV *class, int map_width, int map_height)
1115 CODE: 1177 CODE:
1116 New (0, RETVAL, 1, struct map); 1178 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1179 RETVAL->x = 0;
1118 RETVAL->y = 0; 1180 RETVAL->y = 0;
… …
1128 RETVAL->row = 0; 1190 RETVAL->row = 0;
1129 OUTPUT: 1191 OUTPUT:
1130 RETVAL 1192 RETVAL
1131 1193
1132void 1194void
1133DESTROY (CFClient::Map self) 1195DESTROY (CFPlus::Map self)
1134 CODE: 1196 CODE:
1135{ 1197{
1136 map_clear (self); 1198 map_clear (self);
1137 Safefree (self->face); 1199 Safefree (self->face);
1138 Safefree (self->tex); 1200 Safefree (self->tex);
1139 Safefree (self); 1201 Safefree (self);
1140} 1202}
1141 1203
1142void 1204void
1143clear (CFClient::Map self) 1205clear (CFPlus::Map self)
1144 CODE: 1206 CODE:
1145 map_clear (self); 1207 map_clear (self);
1146 1208
1147void 1209void
1148set_face (CFClient::Map self, int face, int texid) 1210set_face (CFPlus::Map self, int face, int texid)
1149 CODE: 1211 CODE:
1150{ 1212{
1151 while (self->faces <= face) 1213 while (self->faces <= face)
1152 { 1214 {
1153 Append (mapface, self->face, self->faces, self->faces); 1215 Append (mapface, self->face, self->faces, self->faces);
… …
1156 1218
1157 self->face [face] = texid; 1219 self->face [face] = texid;
1158} 1220}
1159 1221
1160void 1222void
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) 1223set_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: 1224 CODE:
1163{ 1225{
1164 while (self->texs <= texid) 1226 while (self->texs <= texid)
1165 { 1227 {
1166 Append (maptex, self->tex, self->texs, self->texs); 1228 Append (maptex, self->tex, self->texs, self->texs);
… …
1190 // from transparent color bleeding and ugly wrapping effects. 1252 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1253 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1254}
1193 1255
1194int 1256int
1195ox (CFClient::Map self) 1257ox (CFPlus::Map self)
1196 ALIAS: 1258 ALIAS:
1197 oy = 1 1259 oy = 1
1198 x = 2 1260 x = 2
1199 y = 3 1261 y = 3
1200 w = 4 1262 w = 4
… …
1211 } 1273 }
1212 OUTPUT: 1274 OUTPUT:
1213 RETVAL 1275 RETVAL
1214 1276
1215void 1277void
1216scroll (CFClient::Map self, int dx, int dy) 1278scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1279 CODE:
1218{ 1280{
1219 if (dx > 0) 1281 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1282 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1283 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1223 1285
1224 if (dy > 0) 1286 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1287 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1288 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1228 1290
1229 self->ox += dx; self->x += dx; 1291 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1292 self->oy += dy; self->y += dy;
1231 1293
1232 while (self->y < 0) 1294 while (self->y < 0)
… …
1237 self->y += MAP_EXTEND_Y; 1299 self->y += MAP_EXTEND_Y;
1238 } 1300 }
1239} 1301}
1240 1302
1241void 1303void
1242map1a_update (CFClient::Map self, SV *data_) 1304map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1305 CODE:
1244{ 1306{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1307 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1308 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1309 mapcell *cell;
1248 int x, y, flags; 1310 int x, y, flags;
1249 1311
1250 while (data < data_end) 1312 while (data < data_end - 1)
1251 { 1313 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1314 flags = (data [0] << 8) + data [1]; data += 2;
1253 1315
1254 x = self->x + ((flags >> 10) & 63); 1316 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1317 y = self->y + ((flags >> 4) & 63);
1256 1318
1257 cell = map_get_cell (self, x, y); 1319 cell = map_get_cell (self, x, y);
1258 1320
1259 if (flags & 15) 1321 if (flags & 15)
1260 { 1322 {
1261 if (cell->darkness < 0) 1323 if (!cell->darkness)
1262 { 1324 {
1325 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1326 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1327 }
1268 1328
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1329 //TODO: don't trust server data to be in-range(!)
1330
1331 if (flags & 8)
1332 {
1333 if (extmap)
1334 {
1335 uint8_t ext, cmd;
1336
1337 do
1338 {
1339 ext = *data++;
1340 cmd = ext & 0x3f;
1341
1342 if (cmd < 4)
1343 cell->darkness = 255 - ext * 64 + 1;
1344 else if (cmd == 5) // health
1345 {
1346 cell->stat_width = 1;
1347 cell->stat_hp = *data++;
1348 }
1349 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width
1352 {
1353 if (*data == 4)
1354 ; // decode player tag
1355
1356 data += *data + 1;
1357 }
1358 else if (cmd == 8) // cell flags
1359 cell->flags = *data++;
1360 else if (ext & 0x40) // unknown, multibyte => skip
1361 data += *data + 1;
1362 else
1363 data++;
1364 }
1365 while (ext & 0x80);
1366 }
1367 else
1368 cell->darkness = *data++ + 1;
1369 }
1272 1370
1273 if (flags & 4) 1371 if (flags & 4)
1274 { 1372 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1276 } 1374 }
… …
1284 { 1382 {
1285 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1286 } 1384 }
1287 } 1385 }
1288 else 1386 else
1289 cell->darkness = -1; 1387 cell->darkness = 0;
1290 } 1388 }
1291} 1389}
1292 1390
1293SV * 1391SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1392mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1393 CODE:
1296{ 1394{
1297 int x1, x; 1395 int x1, x;
1298 int y1, y; 1396 int y1, y;
1299 int z; 1397 int z;
… …
1349} 1447}
1350 OUTPUT: 1448 OUTPUT:
1351 RETVAL 1449 RETVAL
1352 1450
1353void 1451void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1452draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1355 CODE: 1453 CODE:
1356{ 1454{
1357 int vx, vy; 1455 int vx, vy;
1358 int x, y, z; 1456 int x, y, z;
1359 int last_name; 1457 int last_name;
… …
1394 { 1492 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1493 mapcell *cell = row->col + (x + vx - row->c0);
1396 1494
1397 face = cell->face [z]; 1495 face = cell->face [z];
1398 1496
1399 if (face) 1497 if (face && face < self->texs)
1400 { 1498 {
1401 maptex tex = self->tex [face]; 1499 maptex tex = self->tex [face];
1402
1403 int px = (x + 1) * 32 - tex.w; 1500 int px = (x + 1) * 32 - tex.w;
1404 int py = (y + 1) * 32 - tex.h; 1501 int py = (y + 1) * 32 - tex.h;
1405 1502
1406 if (last_name != tex.name) 1503 if (last_name != tex.name)
1407 { 1504 {
1408 glEnd (); 1505 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411 glBegin (GL_QUADS); 1507 glBegin (GL_QUADS);
1412 } 1508 }
1413 1509
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 }
1533 }
1419 } 1534 }
1420 } 1535 }
1421 1536
1422 glEnd (); 1537 glEnd ();
1423 1538
1424 glDisable (GL_TEXTURE_2D); 1539 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1540 glDisable (GL_BLEND);
1426}
1427 1541
1542 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows)
1545 {
1546 maprow *row = self->row + (y + vy);
1547
1548 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1)
1550 {
1551 mapcell *cell = row->col + (x + vx - row->c0);
1552
1553 int px = x * 32;
1554 int py = y * 32;
1555
1556 if (cell->stat_hp)
1557 {
1558 int width = cell->stat_width * 32;
1559 int thick = sh / 28 + 1 + cell->stat_width;
1560
1561 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py);
1564
1565 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1566 glRectf (px + 2,
1567 py - thick - 1,
1568 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1569 }
1570 }
1571 }
1572}
1573
1428void 1574void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1575draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 1576 CODE:
1431{ 1577{
1432 static float color[16][3] = { 1578 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 1579 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 1580 { 1.00F, 1.00F, 1.00F },
… …
1484 glDisable (GL_BLEND); 1630 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 1631 glDisable (GL_TEXTURE_2D);
1486} 1632}
1487 1633
1488void 1634void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1635fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1490 PPCODE: 1636 PPCODE:
1491{ 1637{
1492 int vx, vy; 1638 int vx, vy;
1493 int x, y; 1639 int x, y;
1494 int sw4 = (sw + 3) & ~3; 1640 int sw4 = (sw + 3) & ~3;
… …
1510 for (x = 0; x < sw; x++) 1656 for (x = 0; x < sw; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 1657 if (row->c0 <= x + vx && x + vx < row->c1)
1512 { 1658 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 1659 mapcell *cell = row->col + (x + vx - row->c0);
1514 1660
1515 darkness[y * sw4 + x] = cell->darkness < 0 1661 darkness[y * sw4 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 1663 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 1664 }
1519 } 1665 }
1520 1666
1521 EXTEND (SP, 3); 1667 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 1668 PUSHs (sv_2mortal (newSViv (sw4)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 1669 PUSHs (sv_2mortal (newSViv (sh)));
1524 PUSHs (darkness_sv); 1670 PUSHs (darkness_sv);
1525} 1671}
1526 1672
1527SV * 1673SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1674get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529 CODE: 1675 CODE:
1530{ 1676{
1531 int x, y, x1, y1; 1677 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 1678 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1679 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1595} 1741}
1596 OUTPUT: 1742 OUTPUT:
1597 RETVAL 1743 RETVAL
1598 1744
1599void 1745void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1746set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 1747 PPCODE:
1602{ 1748{
1603 int x, y, z; 1749 int x, y, z;
1604 int w, h; 1750 int w, h;
1605 int x1, y1; 1751 int x1, y1;
… …
1637 1783
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1641 1787
1642 if (cell->darkness <= 0) 1788 if (cell->darkness == 0)
1643 { 1789 {
1644 cell->darkness = -1; 1790 cell->darkness = 0;
1645 1791
1646 for (z = 0; z <= 2; z++) 1792 for (z = 0; z <= 2; z++)
1647 { 1793 {
1648 cell->face[z] = face[z]; 1794 cell->face[z] = face[z];
1649 1795
… …
1654 } 1800 }
1655 } 1801 }
1656 } 1802 }
1657} 1803}
1658 1804
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 1805MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660 1806
1661CFClient::MixChunk 1807CFPlus::MixChunk
1662new_from_file (SV *class, char *path) 1808new_from_file (SV *class, char *path)
1663 CODE: 1809 CODE:
1664 RETVAL = Mix_LoadWAV (path); 1810 RETVAL = Mix_LoadWAV (path);
1665 OUTPUT: 1811 OUTPUT:
1666 RETVAL 1812 RETVAL
1667 1813
1668void 1814void
1669DESTROY (CFClient::MixChunk self) 1815DESTROY (CFPlus::MixChunk self)
1670 CODE: 1816 CODE:
1671 Mix_FreeChunk (self); 1817 Mix_FreeChunk (self);
1672 1818
1673int 1819int
1674volume (CFClient::MixChunk self, int volume = -1) 1820volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 1821 CODE:
1676 RETVAL = Mix_VolumeChunk (self, volume); 1822 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 1823 OUTPUT:
1678 RETVAL 1824 RETVAL
1679 1825
1680int 1826int
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1827play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 1828 CODE:
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1829 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684 OUTPUT: 1830 OUTPUT:
1685 RETVAL 1831 RETVAL
1686 1832
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 1833MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 1834
1689int 1835int
1690volume (int volume = -1) 1836volume (int volume = -1)
1691 CODE: 1837 CODE:
1692 RETVAL = Mix_VolumeMusic (volume); 1838 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 1839 OUTPUT:
1694 RETVAL 1840 RETVAL
1695 1841
1696CFClient::MixMusic 1842CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 1843new_from_file (SV *class, char *path)
1698 CODE: 1844 CODE:
1699 RETVAL = Mix_LoadMUS (path); 1845 RETVAL = Mix_LoadMUS (path);
1700 OUTPUT: 1846 OUTPUT:
1701 RETVAL 1847 RETVAL
1702 1848
1703void 1849void
1704DESTROY (CFClient::MixMusic self) 1850DESTROY (CFPlus::MixMusic self)
1705 CODE: 1851 CODE:
1706 Mix_FreeMusic (self); 1852 Mix_FreeMusic (self);
1707 1853
1708int 1854int
1709play (CFClient::MixMusic self, int loops = -1) 1855play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 1856 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 1857 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 1858 OUTPUT:
1713 RETVAL 1859 RETVAL
1714 1860
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 1861MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1716 1862
1717BOOT: 1863BOOT:
1718{ 1864{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1865 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 1866 static const struct {
1721 const char *name; 1867 const char *name;
1722 IV iv; 1868 IV iv;
1723 } *civ, const_iv[] = { 1869 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 1870# define const_iv(name) { # name, (IV)name }
… …
1787 const_iv (GL_SEPARABLE_2D), 1933 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 1934 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 1935 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 1936 const_iv (GL_CONSTANT_BORDER),
1791 const_iv (GL_LINES), 1937 const_iv (GL_LINES),
1938 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 1939 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 1940 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 1941 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 1942 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 1943 const_iv (GL_TRIANGLE_STRIP),
… …
1906 r *= a; 2053 r *= a;
1907 g *= a; 2054 g *= a;
1908 b *= a; 2055 b *= a;
1909 } 2056 }
1910 // microsoft visual "c" rounds instead of truncating... 2057 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2058 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 2059
1916void glInterleavedArrays (int format, int stride, char *data) 2060void glInterleavedArrays (int format, int stride, char *data)
1917 2061
1918void glDrawElements (int mode, int count, int type, char *indices) 2062void glDrawElements (int mode, int count, int type, char *indices)
1919 2063
… …
1996 2140
1997void glEndList () 2141void glEndList ()
1998 2142
1999void glCallList (int list) 2143void glCallList (int list)
2000 2144
2001

Diff Legend

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