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.251 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 62# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 63# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 66#endif
57 67
58#ifndef _WIN32 68#ifndef _WIN32
59# include <sys/types.h> 69# include <sys/types.h>
60# include <sys/socket.h> 70# include <sys/socket.h>
61# include <netinet/in.h> 71# include <netinet/in.h>
62# include <netinet/tcp.h> 72# include <netinet/tcp.h>
63# include <inttypes.h> 73# include <inttypes.h>
64#endif 74#endif
65 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
68#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
69 91
70#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
72 94
73#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
74 96
75#if 0 97/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 99
78# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
79#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
80 123
81static AV *texture_av; 124static AV *texture_av;
82 125
83static struct 126static struct
84{ 127{
141{ 184{
142 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
143 186
144 while (attrs) 187 while (attrs)
145 { 188 {
146 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
147 190
148 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
149 return 1; 192 return 1;
150 193
151 attrs = attrs->next; 194 attrs = attrs->next;
169static void 212static void
170substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
171{ 214{
172 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
173#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
174 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
175#endif 218#endif
176 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
177} 220}
178 221
179static void 222static void
180layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
181{ 224{
182 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
183 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
184 */ 227 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
186 229
187 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
216 int w, h; 259 int w, h;
217 float s, t; 260 float s, t;
218 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
219 tileid smoothtile; 262 tileid smoothtile;
220 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
221} maptex; 265} maptex;
222 266
223typedef struct { 267typedef struct {
224 uint32_t player; 268 uint32_t player;
225 tileid tile[3]; 269 tileid tile[3];
357 self->oy = 0; 401 self->oy = 0;
358 self->row = 0; 402 self->row = 0;
359 self->rows = 0; 403 self->rows = 0;
360} 404}
361 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
362static void 416static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
364{ 418{
365 int x, y; 419 int x, y;
366 maprow *row; 420 maprow *row;
380 if (x >= row->c1) 434 if (x >= row->c1)
381 break; 435 break;
382 436
383 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
384 438
385 cell->darkness = 0; 439 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 440 }
390 } 441 }
391} 442}
392 443
393typedef struct { 444typedef struct {
428 ev.code = 1; 479 ev.code = 1;
429 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
430 ev.data2 = 0; 481 ev.data2 = 0;
431 482
432 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
433} 491}
434 492
435static unsigned int 493static unsigned int
436minpot (unsigned int n) 494minpot (unsigned int n)
437{ 495{
504 if (!svp || !SvTRUE (*svp)) 562 if (!svp || !SvTRUE (*svp))
505 return 0; 563 return 0;
506 564
507 return 1; 565 return 1;
508} 566}
567
568/******************************************************************************/
569
570/* process keyboard modifiers */
571static int
572mod_munge (int mod)
573{
574 mod &= MOD_MASK;
575
576 if (mod & (KMOD_META | KMOD_ALT))
577 mod |= KMOD_LRAM;
578
579 return mod;
580}
581
582static void
583deliantra_main (SV *real_main)
584{
585 dSP;
586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
589}
590
591#ifdef __MACOSX__
592 static SV *real_main;
593
594 /* to due surprising braindamage on the side of SDL design, we
595 * do some mind-boggling hack here: SDL requires a custom main()
596 * on OS X, so... we provide one and call the original main(), which,
597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
598 * and which calls our main (== SDL_main) back.
599 */
600 extern C_LINKAGE int
601 main (int argc, char *argv[])
602 {
603 deliantra_main (real_main);
604 }
605
606 #undef main
607
608 extern C_LINKAGE int main (int argc, char *argv[]);
609
610 static void
611 SDL_main_hack (SV *real_main_)
612 {
613 real_main = real_main_;
614
615 char *argv[] = { "deliantra client", 0 };
616 (main) (1, argv);
617 }
618#else
619 static void
620 SDL_main_hack (SV *real_main)
621 {
622 deliantra_main (real_main);
623 }
624#endif
509 625
510MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
511 627
512PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
513 629
542 const_iv (SDL_USEREVENT), 658 const_iv (SDL_USEREVENT),
543 659
544 const_iv (SDL_APPINPUTFOCUS), 660 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 661 const_iv (SDL_APPMOUSEFOCUS),
546 const_iv (SDL_APPACTIVE), 662 const_iv (SDL_APPACTIVE),
663
664
665 const_iv (SDLK_UNKNOWN),
666 const_iv (SDLK_FIRST),
667 const_iv (SDLK_BACKSPACE),
668 const_iv (SDLK_TAB),
669 const_iv (SDLK_CLEAR),
670 const_iv (SDLK_RETURN),
671 const_iv (SDLK_PAUSE),
672 const_iv (SDLK_ESCAPE),
673 const_iv (SDLK_SPACE),
674 const_iv (SDLK_EXCLAIM),
675 const_iv (SDLK_QUOTEDBL),
676 const_iv (SDLK_HASH),
677 const_iv (SDLK_DOLLAR),
678 const_iv (SDLK_AMPERSAND),
679 const_iv (SDLK_QUOTE),
680 const_iv (SDLK_LEFTPAREN),
681 const_iv (SDLK_RIGHTPAREN),
682 const_iv (SDLK_ASTERISK),
683 const_iv (SDLK_PLUS),
684 const_iv (SDLK_COMMA),
685 const_iv (SDLK_MINUS),
686 const_iv (SDLK_PERIOD),
687 const_iv (SDLK_SLASH),
688 const_iv (SDLK_0),
689 const_iv (SDLK_1),
690 const_iv (SDLK_2),
691 const_iv (SDLK_3),
692 const_iv (SDLK_4),
693 const_iv (SDLK_5),
694 const_iv (SDLK_6),
695 const_iv (SDLK_7),
696 const_iv (SDLK_8),
697 const_iv (SDLK_9),
698 const_iv (SDLK_COLON),
699 const_iv (SDLK_SEMICOLON),
700 const_iv (SDLK_LESS),
701 const_iv (SDLK_EQUALS),
702 const_iv (SDLK_GREATER),
703 const_iv (SDLK_QUESTION),
704 const_iv (SDLK_AT),
705
706 const_iv (SDLK_LEFTBRACKET),
707 const_iv (SDLK_BACKSLASH),
708 const_iv (SDLK_RIGHTBRACKET),
709 const_iv (SDLK_CARET),
710 const_iv (SDLK_UNDERSCORE),
711 const_iv (SDLK_BACKQUOTE),
712 const_iv (SDLK_DELETE),
547 713
548 const_iv (SDLK_FIRST), 714 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 715 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 716 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 717 const_iv (SDLK_KP1),
627 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
631 797
798 const_iv (KMOD_LRAM),
799
632 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
801
802 const_iv (SDL_INIT_TIMER),
803 const_iv (SDL_INIT_AUDIO),
804 const_iv (SDL_INIT_VIDEO),
805 const_iv (SDL_INIT_CDROM),
806 const_iv (SDL_INIT_JOYSTICK),
807 const_iv (SDL_INIT_EVERYTHING),
808 const_iv (SDL_INIT_NOPARACHUTE),
809 const_iv (SDL_INIT_EVENTTHREAD),
810
811 const_iv (SDL_GL_RED_SIZE),
812 const_iv (SDL_GL_GREEN_SIZE),
813 const_iv (SDL_GL_BLUE_SIZE),
814 const_iv (SDL_GL_ALPHA_SIZE),
815 const_iv (SDL_GL_DOUBLEBUFFER),
816 const_iv (SDL_GL_BUFFER_SIZE),
817 const_iv (SDL_GL_DEPTH_SIZE),
818 const_iv (SDL_GL_STENCIL_SIZE),
819 const_iv (SDL_GL_ACCUM_RED_SIZE),
820 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
821 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
822 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
823 const_iv (SDL_GL_STEREO),
824 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
825 const_iv (SDL_GL_MULTISAMPLESAMPLES),
826 const_iv (SDL_GL_ACCELERATED_VISUAL),
827 const_iv (SDL_GL_SWAP_CONTROL),
828
829 const_iv (FOW_DARKNESS)
633# undef const_iv 830# undef const_iv
634 }; 831 };
635 832
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 835
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 838}
642 839
658NV ceil (NV x) 855NV ceil (NV x)
659 856
660IV minpot (UV n) 857IV minpot (UV n)
661 858
662IV popcount (UV n) 859IV popcount (UV n)
860
861NV distance (NV dx, NV dy)
862 CODE:
863 RETVAL = pow (dx * dx + dy * dy, 0.5);
864 OUTPUT:
865 RETVAL
663 866
664void 867void
665pango_init () 868pango_init ()
666 CODE: 869 CODE:
667{ 870{
668 opengl_fontmap = pango_opengl_font_map_new (); 871 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 872 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 873 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 874 /*pango_context_set_font_description (opengl_context, default_font);*/
875#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 876 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 877 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 878#endif
675} 879}
676 880
677char *
678SDL_GetError () 881char *SDL_GetError ()
679 882
680int 883void SDL_main_hack (SV *real_main)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 884 PROTOTYPE: &
682 885
683void 886int SDL_Init (U32 flags)
887
888int SDL_InitSubSystem (U32 flags)
889
890void SDL_QuitSubSystem (U32 flags)
891
684SDL_Quit () 892void SDL_Quit ()
893
894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
896
897int SDL_GL_GetAttribute (int attr)
898 CODE:
899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
900 XSRETURN_UNDEF;
901 OUTPUT:
902 RETVAL
685 903
686void 904void
687SDL_ListModes (int rgb, int alpha) 905SDL_ListModes (int rgb, int alpha)
688 PPCODE: 906 PPCODE:
689{ 907{
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 921 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 922
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 923 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 924 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 925
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 926 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 927
713 if (m && m != (SDL_Rect **)-1) 928 if (m && m != (SDL_Rect **)-1)
714 while (*m) 929 while (*m)
715 { 930 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 931 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 932 {
718 AV *av = newAV (); 933 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 934 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 935 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 936 av_push (av, newSViv (rgb));
744 ); 959 );
745 960
746 if (RETVAL) 961 if (RETVAL)
747 { 962 {
748 av_clear (texture_av); 963 av_clear (texture_av);
749
750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 964#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752#include "glfunc.h" 965#include "glfunc.h"
753#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 969 }
755} 970}
756 OUTPUT: 971 OUTPUT:
757 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
758 976
759void 977void
760SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
761 979
762char * 980char *
763SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
764 983
765int 984int
766SDL_GetAppState () 985SDL_GetAppState ()
767 986
987int
988SDL_GetModState ()
989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
768void 994void
995SDL_PumpEvents ()
996
997void
769poll_events () 998peep_events ()
770 PPCODE: 999 PPCODE:
771{ 1000{
772 SDL_Event ev; 1001 SDL_Event ev;
773 1002
774 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
781 { 1010 {
782 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
783 case SDL_KEYUP: 1012 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1015 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1016 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1018 break;
790 1019
791 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
810 x = ev.motion.x; 1039 x = ev.motion.x;
811 y = ev.motion.y; 1040 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1042 }
814 1043
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1050 }
822 break; 1051 break;
823 1052
824 case SDL_MOUSEBUTTONDOWN: 1053 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1054 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1055 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1056
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1057 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1058 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1059 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1060 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
840 1069
841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1070 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
842 } 1071 }
843} 1072}
844 1073
1074char *
1075SDL_AudioDriverName ()
1076 CODE:
1077{
1078 char buf [256];
1079 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1080 XSRETURN_UNDEF;
1081
1082 RETVAL = buf;
1083}
1084 OUTPUT:
1085 RETVAL
1086
845int 1087int
846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1088Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
847 POSTCALL: 1089 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
849 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
850 1092
851void 1093void
852Mix_QuerySpec () 1094Mix_QuerySpec ()
905 } 1147 }
906 } 1148 }
907#endif 1149#endif
908} 1150}
909 1151
910void 1152int
911add_font (char *file) 1153add_font (char *file)
912 CODE: 1154 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1156 OUTPUT:
1157 RETVAL
1158
1159void
1160IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1161
1162# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1163void
1164Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
914 1165
915void 1166void
916load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
917 ALIAS: 1168 ALIAS:
918 load_image_file = 1 1169 load_image_file = 1
964 1215
965 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
966 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
967 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
968 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
969 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
970 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1221 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
971 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
974 1225
1034#if DEBUG 1285#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1036#endif 1287#endif
1037} 1288}
1038 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1298
1041PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1042 1300
1043DC::Font 1301DC::Font
1044new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1045 CODE: 1303 CODE:
1046{ 1304{
1047 int count; 1305 int count;
1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1078 PROTOTYPE: 1336 PROTOTYPE:
1079 CODE: 1337 CODE:
1080 tc_restore (); 1338 tc_restore ();
1081 1339
1082DC::Layout 1340DC::Layout
1083new (SV *class) 1341new (SV *klass)
1084 CODE: 1342 CODE:
1085 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1086 1344
1087 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1088 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1237 1495
1238void 1496void
1239set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1240 CODE: 1498 CODE:
1241 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1242 { 1500 {
1243 self->base_height = base_height; 1501 self->base_height = base_height;
1244 layout_update_font (self); 1502 layout_update_font (self);
1245 } 1503 }
1246 1504
1247void 1505void
1313void 1571void
1314cursor_pos (DC::Layout self, int index) 1572cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1573 PPCODE:
1316{ 1574{
1317 PangoRectangle pos; 1575 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, 0, &pos); 1576 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1577
1320 EXTEND (SP, 3); 1578 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE))); 1581 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1328 PPCODE: 1586 PPCODE:
1329{ 1587{
1330 int line, x; 1588 int line, x;
1331 1589
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1590 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1591#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1592 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1593 --line;
1336#endif 1594#endif
1337 EXTEND (SP, 2); 1595 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1596 PUSHs (sv_2mortal (newSViv (line)));
1474 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1476 } 1734 }
1477} 1735}
1478 1736
1737void
1738draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1739 PROTOTYPE: @
1740 CODE:
1741{
1742 glEnable (GL_BLEND);
1743 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1744 glEnable (GL_TEXTURE_2D);
1745 glBindTexture (GL_TEXTURE_2D, name1);
1746
1747 glColor3f (intensity, intensity, intensity);
1748 glPushMatrix ();
1749 glScalef (1./3, 1./3, 1.);
1750
1751 if (blend > 0.f)
1752 {
1753 float dx3 = dx * -3.f / w;
1754 float dy3 = dy * -3.f / h;
1755 GLfloat env_color[4] = { 0., 0., 0., blend };
1756
1757 /* interpolate the two shadow textures */
1758 /* stage 0 == rgb(glcolor) + alpha(t0) */
1759 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1760
1761 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1762 gl.ActiveTexture (GL_TEXTURE1);
1763 glEnable (GL_TEXTURE_2D);
1764 glBindTexture (GL_TEXTURE_2D, name2);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1766
1767 /* rgb == rgb(glcolor) */
1768 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1771
1772 /* alpha = interpolate t0, t1 by env_alpha */
1773 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1774
1775 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1781
1782 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1784
1785 glBegin (GL_QUADS);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1789 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1790 glEnd ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 gl.ActiveTexture (GL_TEXTURE0);
1794 }
1795 else
1796 {
1797 /* simple blending of one texture, also opengl <1.3 path */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1799
1800 glBegin (GL_QUADS);
1801 glTexCoord2f (0, 0); glVertex2f (0, 0);
1802 glTexCoord2f (0, t); glVertex2f (0, h);
1803 glTexCoord2f (s, t); glVertex2f (w, h);
1804 glTexCoord2f (s, 0); glVertex2f (w, 0);
1805 glEnd ();
1806 }
1807
1808 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1809 {
1810 int x, y;
1811 int dx3 = dx * 3;
1812 int dy3 = dy * 3;
1813
1814 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1815 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1816 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1817 glTranslatef (-1., -1., 0);
1818 glBegin (GL_QUADS);
1819
1820 for (y = 1; y < h; y += 3)
1821 {
1822 int y1 = y - dy3;
1823 int y1valid = y1 >= 0 && y1 < h;
1824
1825 for (x = 1; x < w; x += 3)
1826 {
1827 int x1 = x - dx3;
1828 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1829 uint8_t h2;
1830
1831 if (y1valid && x1 >= 0 && x1 < w)
1832 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1833 else
1834 h2 = 1; /* out of range == invisible */
1835
1836 if (h1 || h2)
1837 {
1838 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1839 glColor4f (1., 1., 1., alpha);
1840
1841 glTexCoord2f (0, 0.); glVertex2i (x , y );
1842 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1843 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1844 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1845 }
1846 }
1847 }
1848 }
1849
1850 glEnd ();
1851
1852 glPopMatrix ();
1853
1854 glDisable (GL_TEXTURE_2D);
1855 glDisable (GL_BLEND);
1856}
1857
1479IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1858IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1480 CODE: 1859 CODE:
1481{ 1860{
1482 GLint width; 1861 GLint width;
1483 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1862 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1490MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1491 1870
1492PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1493 1872
1494DC::Map 1873DC::Map
1495new (SV *class) 1874new (SV *klass)
1496 CODE: 1875 CODE:
1497 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1498 RETVAL->x = 0; 1877 RETVAL->x = 0;
1499 RETVAL->y = 0; 1878 RETVAL->y = 0;
1500 RETVAL->w = 0; 1879 RETVAL->w = 0;
1539 1918
1540void 1919void
1541set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1542 CODE: 1921 CODE:
1543{ 1922{
1544 tileid texid; 1923 tileid texid;
1545 maptex *tex; 1924 maptex *tex;
1546 1925
1547 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1548 return; 1927 return;
1549 1928
1550 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1551 return; 1930 return;
1552 1931
1553 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1554 1933
1555 if (!texid) 1934 if (!texid)
1556 return; 1935 return;
1557 1936
1558 tex = self->tex + texid; 1937 tex = self->tex + texid;
1587 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1966 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1588 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 1970}
1971
1972void
1973expire_textures (DC::Map self, int texid, int count)
1974 PPCODE:
1975 for (; texid < self->texs && count; ++texid, --count)
1976 {
1977 maptex *tex = self->tex + texid;
1978
1979 if (tex->name)
1980 {
1981 if (tex->unused)
1982 {
1983 tex->name = 0;
1984 tex->unused = 0;
1985 XPUSHs (sv_2mortal (newSViv (texid)));
1986 }
1987 else
1988 tex->unused = 1;
1989 }
1990 }
1592 1991
1593int 1992int
1594ox (DC::Map self) 1993ox (DC::Map self)
1595 ALIAS: 1994 ALIAS:
1596 oy = 1 1995 oy = 1
1636 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1637 } 2036 }
1638} 2037}
1639 2038
1640SV * 2039SV *
1641map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1642 CODE: 2041 CODE:
1643{ 2042{
1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1646 mapcell *cell; 2045 mapcell *cell;
1667 2066
1668 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1669 2068
1670 if (flags & 8) 2069 if (flags & 8)
1671 { 2070 {
2071 uint8_t ext, cmd;
2072
1672 if (extmap) 2073 do
1673 { 2074 {
1674 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1675 2077
1676 do 2078 if (cmd < 4)
2079 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2080 else if (cmd == 5) // health
1677 { 2081 {
1678 ext = *data++;
1679 cmd = ext & 0x3f;
1680
1681 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health
1684 {
1685 cell->stat_width = 1; 2082 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1687 }
1688 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47)
1691 {
1692 if (*data == 4)
1693 ; // decode player count
1694
1695 data += *data + 1;
1696 }
1697 else if (cmd == 8) // cell flags
1698 cell->flags = *data++;
1699 else if (ext & 0x40) // unknown, multibyte => skip
1700 data += *data + 1;
1701 else
1702 data++;
1703 } 2084 }
1704 while (ext & 0x80); 2085 else if (cmd == 6) // monster width
2086 cell->stat_width = *data++ + 1;
2087 else if (cmd == 0x47)
2088 {
2089 if (*data == 1) cell->player = data [1];
2090 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2091 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2092 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2093
2094 data += *data + 1;
2095 }
2096 else if (cmd == 8) // cell flags
2097 cell->flags = *data++;
2098 else if (ext & 0x40) // unknown, multibyte => skip
2099 data += *data + 1;
2100 else
2101 data++;
1705 } 2102 }
1706 else 2103 while (ext & 0x80);
1707 cell->darkness = *data++ + 1;
1708 } 2104 }
1709 2105
1710 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1711 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1712 { 2108 {
1715 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1716 2112
1717 if (cell->tile [z]) 2113 if (cell->tile [z])
1718 { 2114 {
1719 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1720 if (!tex->name) 2117 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1722 2119
1723 if (tex->smoothtile) 2120 if (tex->smoothtile)
1724 { 2121 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1726 if (!smooth->name) 2124 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1728 } 2126 }
1729 } 2127 }
1730 } 2128 }
1731 } 2129 }
1732 else 2130 else
1733 cell->darkness = 0; 2131 CELL_CLEAR (cell);
1734 } 2132 }
1735} 2133}
1736 OUTPUT: 2134 OUTPUT:
1737 RETVAL 2135 RETVAL
1738 2136
1758 ? self->row + y 2156 ? self->row + y
1759 : 0; 2157 : 0;
1760 2158
1761 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1762 { 2160 {
1763 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2162
1765 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1766 { 2164 {
1767 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1768 2166
1770 { 2168 {
1771 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2171 int a1 = tex.a;
1774 2172
1775 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1779 } 2177 }
1780 } 2178 }
1781 2179
1782 *map++ = (r ) 2180 *map++ = (r )
1783 | (g << 8) 2181 | (g << 8)
1784 | (b << 16) 2182 | (b << 16)
1785 | (a << 24); 2183 | (a << 24);
1786 } 2184 }
1787 } 2185 }
1788 2186
1789 RETVAL = map_sv; 2187 RETVAL = map_sv;
1790} 2188}
1791 OUTPUT: 2189 OUTPUT:
1792 RETVAL 2190 RETVAL
1793 2191
1794void 2192void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2193draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796 CODE: 2194 CODE:
1797{ 2195{
1798 int x, y, z; 2196 int x, y, z;
1799 2197
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2199 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2200 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803 smooth_key skey; 2201 smooth_key skey;
1804 2202 int pl_x, pl_y;
2203 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1806 rc_key_t key; 2206 rc_key_t key;
1807 rc_array_t *arr; 2207 rc_array_t *arr;
1808 2208
2209 pl_tex.name = 0;
2210
1809 // thats current max. sorry. 2211 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1812 2214
1813 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1818 key.g = 255; 2220 key.g = 255;
1819 key.b = 255; 2221 key.b = 255;
1820 key.a = 255; 2222 key.a = 255;
1821 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2225
1825 mx += self->x; 2226 mx += self->x;
1826 my += self->y; 2227 my += self->y;
1827 2228
1828 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2254
1854 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1855 { 2256 {
1856 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1857 2259
1858 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1860 { 2262 {
1861 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1871 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1872 int px, py; 2274 int px, py;
1873 2275
1874 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1875 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1876 if (!tex.name) 2280 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2282
1879 key.texname = tex.name; 2283 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1881 } 2285 }
1882 2286
1883 px = (x + 1) * T - tex.w; 2287 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2288 py = (y + 1) * Tw - tex.h;
2289
2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2291 {
2292 pl_x = px;
2293 pl_y = py;
2294 pl_tex = tex;
2295 continue;
2296 }
1885 2297
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2300 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2301 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890
1891 if (cell->flags && z == 2)
1892 {
1893 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1)
1895 {
1896 maptex tex = self->tex [1];
1897 int px = x * T + T * 2 / 32;
1898 int py = y * T - T * 6 / 32;
1899
1900 if (tex.name)
1901 {
1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912 }
1913 }
1914 }
1915 2302
1916 // update smooth hash 2303 // update smooth hash
1917 if (tex.smoothtile) 2304 if (tex.smoothtile)
1918 { 2305 {
1919 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
1948 // corners 2335 // corners
1949 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1950 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2337 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1951 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2338 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1952 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2339 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2340 }
2341 }
2342
2343 if (expect_false (z == 2) && expect_false (cell->flags))
2344 {
2345 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1)
2347 {
2348 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32;
2353
2354 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov);
2356
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1953 } 2361 }
1954 } 2362 }
1955 } 2363 }
1956 } 2364 }
1957 2365
1984 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
1985 && skey->level == level 2393 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
1987 { 2395 {
1988 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
1989 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
1990 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
1991 int border = bits & 15; 2399 int border = bits & 15;
1992 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
1994 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
1995 2403
1997 { 2405 {
1998 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
1999 // save gobs of state changes. 2407 // save gobs of state changes.
2000 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2001 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2002 glEnd (); 2412 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2005 } 2415 }
2006 2416
2007 if (border) 2417 if (border)
2008 { 2418 {
2009 float ox = border * dx; 2419 float ox = border * dx;
2010 2420
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2425 }
2016 2426
2017 if (corner) 2427 if (corner)
2018 { 2428 {
2019 float ox = corner * dx; 2429 float ox = corner * dx;
2020 2430
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 } 2435 }
2026 } 2436 }
2027 } 2437 }
2028 } 2438 }
2029 } 2439 }
2035 } 2445 }
2036 2446
2037 hv_clear (smooth); 2447 hv_clear (smooth);
2038 } 2448 }
2039 2449
2450 if (pl_tex.name)
2451 {
2452 maptex tex = pl_tex;
2453 int px = pl_x + sdx;
2454 int py = pl_y + sdy;
2455
2456 key.texname = tex.name;
2457 arr = rc_array (rc, &key);
2458
2459 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2460 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2462 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2463
2464 rc_draw (rc);
2465 }
2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2040 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2041 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2042 2473
2043 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2046 { 2477 {
2049 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2482 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2053 2484
2054 int px = x * T; 2485 int px = x * Tw;
2055 int py = y * T; 2486 int py = y * Th;
2487
2488 if (expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2056 2493
2057 if (cell->stat_hp) 2494 if (cell->stat_hp)
2058 { 2495 {
2059 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2498
2062 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2501 px + width - 1, py);
2065 2502
2071 } 2508 }
2072 } 2509 }
2073} 2510}
2074 2511
2075void 2512void
2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2077 CODE: 2514 CODE:
2078{ 2515{
2079 static float color[16][3] = { 2516 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2084 2521
2085 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2089 2526
2090 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2094 2531
2095 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2096 2533
2097 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2100 }; 2537 };
2101 2538
2102 int x, y; 2539 int x, y;
2103 2540
2104 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2109 2552
2110 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2114 2557
2115 if (m) 2558 if (m)
2116 { 2559 {
2117 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2118 2561
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2121 2564
2122 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2570 }
2135void 2578void
2136fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2137 PPCODE: 2580 PPCODE:
2138{ 2581{
2139 int x, y; 2582 int x, y;
2140 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2143 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2591
2148 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2594
2151 mx += self->x - 1; 2595 mx += self->x - 1;
2152 my += self->y - 1; 2596 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2597
2156 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2158 { 2600 {
2159 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2605 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2165 2607
2166 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2611 }
2170 } 2612 }
2171 2613
2172 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2192 2634
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2638
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2202 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2648 }
2207 2649
2208 free (darkness1); 2650 free (darkness1);
2209 2651
2210 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2214} 2656}
2215 2657
2216SV * 2658SV *
2279 else 2721 else
2280 *data++ = 0; 2722 *data++ = 0;
2281 } 2723 }
2282 } 2724 }
2283 2725
2726 /* if size is w*h + 5 then no data has been found */
2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2728 {
2284 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2286 RETVAL = data_sv; 2733 RETVAL = data_sv;
2287} 2734}
2288 OUTPUT: 2735 OUTPUT:
2289 RETVAL 2736 RETVAL
2290 2737
2291void 2738void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2740 PPCODE:
2294{ 2741{
2295 int x, y, z; 2742 int x, y, z;
2296 int w, h; 2743 int w, h;
2297 int x1, y1; 2744 int x1, y1;
2745 STRLEN len;
2746 uint8_t *data, *end;
2747
2748 len = SvLEN (data_sv);
2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2751 end = data + len + 8;
2752
2753 if (len < 5)
2754 XSRETURN_EMPTY;
2298 2755
2299 if (*data++ != 0) 2756 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2301 2758
2302 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
2317 { 2774 {
2318 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2319 2776
2320 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2321 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2322 uint8_t flags = *data++; 2784 flags = *data++;
2323 2785
2324 if (flags) 2786 if (flags)
2325 { 2787 {
2326 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2794
2333 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2334 { 2796 {
2335 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2336 2799
2337 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2338 { 2801 {
2339 tileid t = tile [z]; 2802 tileid t = tile [z];
2340 2803
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2805 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2807 need_texid (self, t);
2345 } 2808 }
2346 2809
2347 cell->tile [z] = t; 2810 cell->tile [z] = t;
2348 } 2811 }
2353} 2816}
2354 2817
2355MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2356 2819
2357DC::RW 2820DC::RW
2358new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2359 CODE: 2822 CODE:
2360{ 2823{
2361 STRLEN datalen; 2824 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2363 2826
2365} 2828}
2366 OUTPUT: 2829 OUTPUT:
2367 RETVAL 2830 RETVAL
2368 2831
2369DC::RW 2832DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371 CODE: 2834 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT: 2836 OUTPUT:
2374 RETVAL 2837 RETVAL
2375 2838
2393 if (RETVAL < 0) 2856 if (RETVAL < 0)
2394 { 2857 {
2395 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2396 2859
2397 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2398 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2399 2867 }
2868 else
2400 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2401 } 2870 }
2402 2871
2403 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2405} 2874}
2452void 2921void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2923 CODE:
2455{ 2924{
2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2928}
2460 2929
2461void 2930void
2462set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2465 2934
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2936
2468PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2469 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2470DC::MixChunk 2951DC::MixChunk
2471new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2472 CODE: 2953 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT: 2955 OUTPUT:
2475 RETVAL 2956 RETVAL
2476 2957
2506 OUTPUT: 2987 OUTPUT:
2507 RETVAL 2988 RETVAL
2508 2989
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2511int 3004int
2512volume (int volume = -1) 3005volume (int volume = -1)
2513 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2514 CODE: 3007 CODE:
2515 if (items > 0) 3008 if (items > 0)
2526void 3019void
2527halt () 3020halt ()
2528 CODE: 3021 CODE:
2529 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2530 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2531DC::MixMusic 3031DC::MixMusic
2532new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2533 CODE: 3033 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2535 OUTPUT: 3035 OUTPUT:
2536 RETVAL 3036 RETVAL
2537 3037
2565 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2586 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2663 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2667 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2668# undef const_iv 3176# undef const_iv
2669 }; 3177 };
2670 3178
2671 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3181
2674 texture_av = newAV (); 3182 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2676} 3184}
2677 3185
2679disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2680 CODE: 3188 CODE:
2681 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2683 3191
2684char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2685gl_vendor () 3196gl_vendor ()
2686 CODE: 3197 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2688 OUTPUT: 3199 OUTPUT:
2689 RETVAL 3200 RETVAL
2690 3201
2691char * 3202const char *
2692gl_version () 3203gl_version ()
2693 CODE: 3204 CODE:
2694 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2695 OUTPUT: 3206 OUTPUT:
2696 RETVAL 3207 RETVAL
2697 3208
2698char * 3209const char *
2699gl_extensions () 3210gl_extensions ()
2700 CODE: 3211 CODE:
2701 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702 OUTPUT: 3213 OUTPUT:
2703 RETVAL 3214 RETVAL
2704 3215
2705const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2706 3221
2707GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2708 CODE: 3223 CODE:
2709 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2710 OUTPUT: 3225 OUTPUT:
2718 3233
2719int glGetError () 3234int glGetError ()
2720 3235
2721void glFinish () 3236void glFinish ()
2722 3237
3238void glFlush ()
3239
2723void glClear (int mask) 3240void glClear (int mask)
2724 3241
2725void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3243 PROTOTYPE: @
2727 3244
2736void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2737 3254
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3256 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2741 3260
2742void glDepthMask (int flag) 3261void glDepthMask (int flag)
2743 3262
2744void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2745 3264
2780void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2781 CODE: 3300 CODE:
2782 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2783 3302
2784void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2785 ALIAS: 3305 ALIAS:
2786 glColor_premultiply = 1 3306 glColor_premultiply = 1
2787 CODE: 3307 CODE:
2788 if (ix) 3308 if (ix)
2789 { 3309 {
2895 3415
2896void glEndList () 3416void glEndList ()
2897 3417
2898void glCallList (int list) 3418void glCallList (int list)
2899 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3426
2902PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2903 3428
2904void 3429void
2905find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2906 PPCODE: 3431 PPCODE:
2907{ 3432{
2908 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2909 XPUSHs (self); 3434 XPUSHs (self);
2910} 3435}
2911 3436
2912BOOT: 3437BOOT:
2913{ 3438{
2921 3446
2922void 3447void
2923draw (SV *self) 3448draw (SV *self)
2924 CODE: 3449 CODE:
2925{ 3450{
2926 HV *hv; 3451 HV *hv;
2927 SV **svp; 3452 SV **svp;
2928 NV x, y, w, h; 3453 NV x, y, w, h;
2929 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2930 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2931 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2932 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines