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.257 by root, Mon Mar 24 01:15:21 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 75# include <netinet/in.h>
66# include <netinet/tcp.h> 76# include <netinet/tcp.h>
67# include <inttypes.h> 77# include <inttypes.h>
68#endif 78#endif
69 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
72#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
73 95
74#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
76 98
77#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
78 100
79/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 103
82#if 0 104#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 105
84#else 106#define TEXID_SPEECH 1
85# define PARACHUTE 0 107#define TEXID_NOFACE 2
86#endif 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
87 127
88static AV *texture_av; 128static AV *texture_av;
89 129
90static struct 130static struct
91{ 131{
148{ 188{
149 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
150 190
151 while (attrs) 191 while (attrs)
152 { 192 {
153 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 194
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 196 return 1;
157 197
158 attrs = attrs->next; 198 attrs = attrs->next;
176static void 216static void
177substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
178{ 218{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 222#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 224}
185 225
186static void 226static void
187layout_update_font (DC__Layout self) 227layout_update_font (DC__Layout self)
188{ 228{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 229 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
191 */ 231 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
193 233
194 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
223 int w, h; 263 int w, h;
224 float s, t; 264 float s, t;
225 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
226 tileid smoothtile; 266 tileid smoothtile;
227 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
228} maptex; 269} maptex;
229 270
230typedef struct { 271typedef struct {
231 uint32_t player; 272 uint32_t player;
232 tileid tile[3]; 273 tileid tile[3];
364 self->oy = 0; 405 self->oy = 0;
365 self->row = 0; 406 self->row = 0;
366 self->rows = 0; 407 self->rows = 0;
367} 408}
368 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
369static void 420static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 422{
372 int x, y; 423 int x, y;
373 maprow *row; 424 maprow *row;
387 if (x >= row->c1) 438 if (x >= row->c1)
388 break; 439 break;
389 440
390 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
391 442
392 cell->darkness = 0; 443 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 444 }
397 } 445 }
398} 446}
399 447
400typedef struct { 448struct smooth_key
449{
401 tileid tile; 450 tileid tile;
402 uint8_t x, y, level; 451 uint8_t x, y, level;
403} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
404 471
405static void 472static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 474{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
409 476
410 if (SvIOK (*sv)) 477 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
412 else 479 else
413 sv_setiv (*sv, bits); 480 it->second |= bits;
414} 481}
415 482
416static void 483static void
417music_finished (void) 484music_finished (void)
418{ 485{
435 ev.code = 1; 502 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 504 ev.data2 = 0;
438 505
439 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
440} 514}
441 515
442static unsigned int 516static unsigned int
443minpot (unsigned int n) 517minpot (unsigned int n)
444{ 518{
511 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
512 return 0; 586 return 0;
513 587
514 return 1; 588 return 1;
515} 589}
590
591/******************************************************************************/
592
593/* process keyboard modifiers */
594static int
595mod_munge (int mod)
596{
597 mod &= MOD_MASK;
598
599 if (mod & (KMOD_META | KMOD_ALT))
600 mod |= KMOD_LRAM;
601
602 return mod;
603}
604
605static void
606deliantra_main (SV *real_main)
607{
608 dSP;
609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
612}
613
614#ifdef __MACOSX__
615 static SV *real_main;
616
617 /* to due surprising braindamage on the side of SDL design, we
618 * do some mind-boggling hack here: SDL requires a custom main()
619 * on OS X, so... we provide one and call the original main(), which,
620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
621 * and which calls our main (== SDL_main) back.
622 */
623 extern C_LINKAGE int
624 main (int argc, char *argv[])
625 {
626 deliantra_main (real_main);
627 }
628
629 #undef main
630
631 extern C_LINKAGE int main (int argc, char *argv[]);
632
633 static void
634 SDL_main_hack (SV *real_main_)
635 {
636 real_main = real_main_;
637
638 char *argv[] = { "deliantra client", 0 };
639 (main) (1, argv);
640 }
641#else
642 static void
643 SDL_main_hack (SV *real_main)
644 {
645 deliantra_main (real_main);
646 }
647#endif
516 648
517MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
518 650
519PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
520 652
549 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
550 682
551 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
686
687
688 const_iv (SDLK_UNKNOWN),
689 const_iv (SDLK_FIRST),
690 const_iv (SDLK_BACKSPACE),
691 const_iv (SDLK_TAB),
692 const_iv (SDLK_CLEAR),
693 const_iv (SDLK_RETURN),
694 const_iv (SDLK_PAUSE),
695 const_iv (SDLK_ESCAPE),
696 const_iv (SDLK_SPACE),
697 const_iv (SDLK_EXCLAIM),
698 const_iv (SDLK_QUOTEDBL),
699 const_iv (SDLK_HASH),
700 const_iv (SDLK_DOLLAR),
701 const_iv (SDLK_AMPERSAND),
702 const_iv (SDLK_QUOTE),
703 const_iv (SDLK_LEFTPAREN),
704 const_iv (SDLK_RIGHTPAREN),
705 const_iv (SDLK_ASTERISK),
706 const_iv (SDLK_PLUS),
707 const_iv (SDLK_COMMA),
708 const_iv (SDLK_MINUS),
709 const_iv (SDLK_PERIOD),
710 const_iv (SDLK_SLASH),
711 const_iv (SDLK_0),
712 const_iv (SDLK_1),
713 const_iv (SDLK_2),
714 const_iv (SDLK_3),
715 const_iv (SDLK_4),
716 const_iv (SDLK_5),
717 const_iv (SDLK_6),
718 const_iv (SDLK_7),
719 const_iv (SDLK_8),
720 const_iv (SDLK_9),
721 const_iv (SDLK_COLON),
722 const_iv (SDLK_SEMICOLON),
723 const_iv (SDLK_LESS),
724 const_iv (SDLK_EQUALS),
725 const_iv (SDLK_GREATER),
726 const_iv (SDLK_QUESTION),
727 const_iv (SDLK_AT),
728
729 const_iv (SDLK_LEFTBRACKET),
730 const_iv (SDLK_BACKSLASH),
731 const_iv (SDLK_RIGHTBRACKET),
732 const_iv (SDLK_CARET),
733 const_iv (SDLK_UNDERSCORE),
734 const_iv (SDLK_BACKQUOTE),
735 const_iv (SDLK_DELETE),
554 736
555 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
638 820
821 const_iv (KMOD_LRAM),
822
639 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
824
825 const_iv (SDL_INIT_TIMER),
826 const_iv (SDL_INIT_AUDIO),
827 const_iv (SDL_INIT_VIDEO),
828 const_iv (SDL_INIT_CDROM),
829 const_iv (SDL_INIT_JOYSTICK),
830 const_iv (SDL_INIT_EVERYTHING),
831 const_iv (SDL_INIT_NOPARACHUTE),
832 const_iv (SDL_INIT_EVENTTHREAD),
833
834 const_iv (SDL_GL_RED_SIZE),
835 const_iv (SDL_GL_GREEN_SIZE),
836 const_iv (SDL_GL_BLUE_SIZE),
837 const_iv (SDL_GL_ALPHA_SIZE),
838 const_iv (SDL_GL_DOUBLEBUFFER),
839 const_iv (SDL_GL_BUFFER_SIZE),
840 const_iv (SDL_GL_DEPTH_SIZE),
841 const_iv (SDL_GL_STENCIL_SIZE),
842 const_iv (SDL_GL_ACCUM_RED_SIZE),
843 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
844 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
845 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
846 const_iv (SDL_GL_STEREO),
847 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
848 const_iv (SDL_GL_MULTISAMPLESAMPLES),
849 const_iv (SDL_GL_ACCELERATED_VISUAL),
850 const_iv (SDL_GL_SWAP_CONTROL),
851
852 const_iv (FOW_DARKNESS)
640# undef const_iv 853# undef const_iv
641 }; 854 };
642 855
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 858
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 861}
649 862
665NV ceil (NV x) 878NV ceil (NV x)
666 879
667IV minpot (UV n) 880IV minpot (UV n)
668 881
669IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
670 889
671void 890void
672pango_init () 891pango_init ()
673 CODE: 892 CODE:
674{ 893{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 899 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 900 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 901#endif
683} 902}
684 903
685char *
686SDL_GetError () 904char *SDL_GetError ()
687 905
688int 906void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
690 908
691void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
692SDL_Quit () 915void SDL_Quit ()
916
917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
919
920int SDL_GL_GetAttribute (int attr)
921 CODE:
922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
923 XSRETURN_UNDEF;
924 OUTPUT:
925 RETVAL
693 926
694void 927void
695SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
696 PPCODE: 929 PPCODE:
697{ 930{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 945
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 948
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 950
721 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
722 while (*m) 952 while (*m)
723 { 953 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 955 {
726 AV *av = newAV (); 956 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
752 ); 982 );
753 983
754 if (RETVAL) 984 if (RETVAL)
755 { 985 {
756 av_clear (texture_av); 986 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 988#include "glfunc.h"
761#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 992 }
763} 993}
764 OUTPUT: 994 OUTPUT:
765 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
766 999
767void 1000void
768SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
769 1002
770char * 1003char *
771SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
772 1006
773int 1007int
774SDL_GetAppState () 1008SDL_GetAppState ()
775 1009
776int 1010int
777SDL_GetModState () 1011SDL_GetModState ()
778 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
779void 1017void
1018SDL_PumpEvents ()
1019
1020void
780poll_events () 1021peep_events ()
781 PPCODE: 1022 PPCODE:
782{ 1023{
783 SDL_Event ev; 1024 SDL_Event ev;
784 1025
785 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
792 { 1033 {
793 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1035 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1038 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1039 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1041 break;
801 1042
802 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1062 x = ev.motion.x;
822 y = ev.motion.y; 1063 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1065 }
825 1066
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1092
852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
853 } 1094 }
854} 1095}
855 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
856int 1110int
857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
858 POSTCALL: 1112 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
861 1115
862void 1116void
863Mix_QuerySpec () 1117Mix_QuerySpec ()
922add_font (char *file) 1176add_font (char *file)
923 CODE: 1177 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1179 OUTPUT:
926 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
927 1188
928void 1189void
929load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
930 ALIAS: 1191 ALIAS:
931 load_image_file = 1 1192 load_image_file = 1
977 1238
978 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
987 1248
1047#if DEBUG 1308#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1049#endif 1310#endif
1050} 1311}
1051 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1321
1054PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1055 1323
1056DC::Font 1324DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1326 CODE:
1059{ 1327{
1060 int count; 1328 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1359 PROTOTYPE:
1092 CODE: 1360 CODE:
1093 tc_restore (); 1361 tc_restore ();
1094 1362
1095DC::Layout 1363DC::Layout
1096new (SV *class) 1364new (SV *klass)
1097 CODE: 1365 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1099 1367
1100 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1250 1518
1251void 1519void
1252set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1253 CODE: 1521 CODE:
1254 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1255 { 1523 {
1256 self->base_height = base_height; 1524 self->base_height = base_height;
1257 layout_update_font (self); 1525 layout_update_font (self);
1258 } 1526 }
1259 1527
1260void 1528void
1487 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1489 } 1757 }
1490} 1758}
1491 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1882 CODE:
1494{ 1883{
1495 GLint width; 1884 GLint width;
1496 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1893
1505PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1506 1895
1507DC::Map 1896DC::Map
1508new (SV *class) 1897new (SV *klass)
1509 CODE: 1898 CODE:
1510 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1511 RETVAL->x = 0; 1900 RETVAL->x = 0;
1512 RETVAL->y = 0; 1901 RETVAL->y = 0;
1513 RETVAL->w = 0; 1902 RETVAL->w = 0;
1552 1941
1553void 1942void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1944 CODE:
1556{ 1945{
1557 tileid texid; 1946 tileid texid;
1558 maptex *tex; 1947 maptex *tex;
1559 1948
1560 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1561 return; 1950 return;
1562 1951
1563 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1564 return; 1953 return;
1565 1954
1566 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1567 1956
1568 if (!texid) 1957 if (!texid)
1569 return; 1958 return;
1570 1959
1571 tex = self->tex + texid; 1960 tex = self->tex + texid;
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1605 2014
1606int 2015int
1607ox (DC::Map self) 2016ox (DC::Map self)
1608 ALIAS: 2017 ALIAS:
1609 oy = 1 2018 oy = 1
1649 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1650 } 2059 }
1651} 2060}
1652 2061
1653SV * 2062SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1655 CODE: 2064 CODE:
1656{ 2065{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2068 mapcell *cell;
1680 2089
1681 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1682 2091
1683 if (flags & 8) 2092 if (flags & 8)
1684 { 2093 {
2094 uint8_t ext, cmd;
2095
1685 if (extmap) 2096 do
1686 { 2097 {
1687 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1688 2100
1689 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1690 { 2104 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2105 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2107 }
1717 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1718 } 2125 }
1719 else 2126 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2127 }
1722 2128
1723 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1725 { 2131 {
1728 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1729 2135
1730 if (cell->tile [z]) 2136 if (cell->tile [z])
1731 { 2137 {
1732 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1733 if (!tex->name) 2140 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1735 2142
1736 if (tex->smoothtile) 2143 if (tex->smoothtile)
1737 { 2144 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1739 if (!smooth->name) 2147 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1741 } 2149 }
1742 } 2150 }
1743 } 2151 }
1744 } 2152 }
1745 else 2153 else
1746 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1747 } 2155 }
1748} 2156}
1749 OUTPUT: 2157 OUTPUT:
1750 RETVAL 2158 RETVAL
1751 2159
1771 ? self->row + y 2179 ? self->row + y
1772 : 0; 2180 : 0;
1773 2181
1774 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1775 { 2183 {
1776 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2185
1778 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1779 { 2187 {
1780 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1781 2189
1783 { 2191 {
1784 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2194 int a1 = tex.a;
1787 2195
1788 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1792 } 2200 }
1793 } 2201 }
1794 2202
1795 *map++ = (r ) 2203 *map++ = (r )
1796 | (g << 8) 2204 | (g << 8)
1797 | (b << 16) 2205 | (b << 16)
1798 | (a << 24); 2206 | (a << 24);
1799 } 2207 }
1800 } 2208 }
1801 2209
1802 RETVAL = map_sv; 2210 RETVAL = map_sv;
1803} 2211}
1804 OUTPUT: 2212 OUTPUT:
1805 RETVAL 2213 RETVAL
1806 2214
1807void 2215void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2217 CODE:
1810{ 2218{
1811 int x, y, z; 2219 int x, y, z;
1812 2220
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 2223 smooth_key skey;
1817 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1819 rc_key_t key; 2228 rc_key_t key;
1820 rc_array_t *arr; 2229 rc_array_t *arr;
1821 2230
2231 pl_tex.name = 0;
2232
1822 // thats current max. sorry. 2233 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1825 2236
1826 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1831 key.g = 255; 2242 key.g = 255;
1832 key.b = 255; 2243 key.b = 255;
1833 key.a = 255; 2244 key.a = 255;
1834 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2247
1838 mx += self->x; 2248 mx += self->x;
1839 my += self->y; 2249 my += self->y;
1840 2250
1841 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2276
1867 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1868 { 2278 {
2279 smooth_hash smooth;
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1870 2282
1871 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1873 { 2285 {
1874 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1885 int px, py; 2297 int px, py;
1886 2298
1887 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1888 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1889 if (!tex.name) 2303 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2305
1892 key.texname = tex.name; 2306 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1894 } 2308 }
1895 2309
1896 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2312
2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2314 {
2315 pl_x = px;
2316 pl_y = py;
2317 pl_tex = tex;
2318 continue;
2319 }
1898 2320
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 {
1906 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1)
1908 {
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 }
1928 2325
1929 // update smooth hash 2326 // update smooth hash
1930 if (tex.smoothtile) 2327 if (tex.smoothtile)
1931 { 2328 {
1932 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1948 2345
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1951 2348
1952 // full tile 2349 // full tile
1953 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1954 2351
1955 // borders 2352 // borders
1956 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1957 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1958 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1959 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1960 2357
1961 // corners 2358 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1966 } 2384 }
1967 } 2385 }
1968 } 2386 }
1969 } 2387 }
1970 2388
1986 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1987 { 2405 {
1988 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1989 HE *he; 2407 HE *he;
1990 2408
1991 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1992 while ((he = hv_iternext (smooth)))
1993 { 2410 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1995 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1996 2413
1997 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1998 && skey->level == level 2415 && skey.level == level
1999 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2000 { 2417 {
2001 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2002 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2003 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2004 int border = bits & 15; 2421 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2008 2425
2010 { 2427 {
2011 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2012 // save gobs of state changes. 2429 // save gobs of state changes.
2013 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2014 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2015 glEnd (); 2434 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2018 } 2437 }
2019 2438
2020 if (border) 2439 if (border)
2021 { 2440 {
2022 float ox = border * dx; 2441 float ox = border * dx;
2023 2442
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2447 }
2029 2448
2030 if (corner) 2449 if (corner)
2031 { 2450 {
2032 float ox = corner * dx; 2451 float ox = corner * dx;
2033 2452
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 } 2457 }
2039 } 2458 }
2040 } 2459 }
2041 } 2460 }
2042 } 2461 }
2044 2463
2045 glEnd (); 2464 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2466 key.texname = -1;
2048 } 2467 }
2049
2050 hv_clear (smooth);
2051 } 2468 }
2469
2470 if (pl_tex.name)
2471 {
2472 maptex tex = pl_tex;
2473 int px = pl_x + sdx;
2474 int py = pl_y + sdy;
2475
2476 key.texname = tex.name;
2477 arr = rc_array (rc, &key);
2478
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2481 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2483
2484 rc_draw (rc);
2485 }
2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2052 2489
2053 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2054 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2055 2493
2056 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2059 { 2497 {
2062 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2502 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2066 2504
2067 int px = x * T; 2505 int px = x * Tw;
2068 int py = y * T; 2506 int py = y * Th;
2507
2508 if (expect_false (cell->player == player))
2509 {
2510 px += sdx;
2511 py += sdy;
2512 }
2069 2513
2070 if (cell->stat_hp) 2514 if (cell->stat_hp)
2071 { 2515 {
2072 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2518
2075 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2521 px + width - 1, py);
2078 2522
2084 } 2528 }
2085 } 2529 }
2086} 2530}
2087 2531
2088void 2532void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2534 CODE:
2091{ 2535{
2092 static float color[16][3] = { 2536 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2097 2541
2098 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2102 2546
2103 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2107 2551
2108 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2109 2553
2110 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2113 }; 2557 };
2114 2558
2115 int x, y; 2559 int x, y;
2116 2560
2117 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2122 2572
2123 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2127 2577
2128 if (m) 2578 if (m)
2129 { 2579 {
2130 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2131 2581
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2134 2584
2135 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2590 }
2148void 2598void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2600 PPCODE:
2151{ 2601{
2152 int x, y; 2602 int x, y;
2153 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2611
2161 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2614
2164 mx += self->x - 1; 2615 mx += self->x - 1;
2165 my += self->y - 1; 2616 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2617
2169 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2171 { 2620 {
2172 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2625 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2178 2627
2179 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2631 }
2183 } 2632 }
2184 2633
2185 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2205 2654
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2658
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2668 }
2220 2669
2221 free (darkness1); 2670 free (darkness1);
2222 2671
2223 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2227} 2676}
2228 2677
2229SV * 2678SV *
2292 else 2741 else
2293 *data++ = 0; 2742 *data++ = 0;
2294 } 2743 }
2295 } 2744 }
2296 2745
2746 /* if size is w*h + 5 then no data has been found */
2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2748 {
2297 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2299 RETVAL = data_sv; 2753 RETVAL = data_sv;
2300} 2754}
2301 OUTPUT: 2755 OUTPUT:
2302 RETVAL 2756 RETVAL
2303 2757
2304void 2758void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2760 PPCODE:
2307{ 2761{
2308 int x, y, z; 2762 int x, y, z;
2309 int w, h; 2763 int w, h;
2310 int x1, y1; 2764 int x1, y1;
2765 STRLEN len;
2766 uint8_t *data, *end;
2767
2768 len = SvLEN (data_sv);
2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2771 end = data + len + 8;
2772
2773 if (len < 5)
2774 XSRETURN_EMPTY;
2311 2775
2312 if (*data++ != 0) 2776 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2314 2778
2315 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2330 { 2794 {
2331 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2332 2796
2333 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2334 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2335 uint8_t flags = *data++; 2804 flags = *data++;
2336 2805
2337 if (flags) 2806 if (flags)
2338 { 2807 {
2339 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2814
2346 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2347 { 2816 {
2348 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2349 2819
2350 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2351 { 2821 {
2352 tileid t = tile [z]; 2822 tileid t = tile [z];
2353 2823
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2825 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2827 need_texid (self, t);
2358 } 2828 }
2359 2829
2360 cell->tile [z] = t; 2830 cell->tile [z] = t;
2361 } 2831 }
2366} 2836}
2367 2837
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2839
2370DC::RW 2840DC::RW
2371new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2372 CODE: 2842 CODE:
2373{ 2843{
2374 STRLEN datalen; 2844 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2376 2846
2378} 2848}
2379 OUTPUT: 2849 OUTPUT:
2380 RETVAL 2850 RETVAL
2381 2851
2382DC::RW 2852DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2854 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2856 OUTPUT:
2387 RETVAL 2857 RETVAL
2388 2858
2406 if (RETVAL < 0) 2876 if (RETVAL < 0)
2407 { 2877 {
2408 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2409 2879
2410 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2411 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2412 2887 }
2888 else
2413 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2414 } 2890 }
2415 2891
2416 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2418} 2894}
2465void 2941void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2943 CODE:
2468{ 2944{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2948}
2473 2949
2474void 2950void
2475set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2478 2954
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2956
2481PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2482 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2483DC::MixChunk 2971DC::MixChunk
2484new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2485 CODE: 2973 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2975 OUTPUT:
2488 RETVAL 2976 RETVAL
2489 2977
2519 OUTPUT: 3007 OUTPUT:
2520 RETVAL 3008 RETVAL
2521 3009
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2524int 3024int
2525volume (int volume = -1) 3025volume (int volume = -1)
2526 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2527 CODE: 3027 CODE:
2528 if (items > 0) 3028 if (items > 0)
2539void 3039void
2540halt () 3040halt ()
2541 CODE: 3041 CODE:
2542 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2543 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2544DC::MixMusic 3051DC::MixMusic
2545new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2546 CODE: 3053 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3055 OUTPUT:
2549 RETVAL 3056 RETVAL
2550 3057
2578 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2680 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2681# undef const_iv 3196# undef const_iv
2682 }; 3197 };
2683 3198
2684 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3201
2687 texture_av = newAV (); 3202 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2689} 3204}
2690 3205
2692disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2693 CODE: 3208 CODE:
2694 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2696 3211
2697char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2698gl_vendor () 3216gl_vendor ()
2699 CODE: 3217 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3219 OUTPUT:
2702 RETVAL 3220 RETVAL
2703 3221
2704char * 3222const char *
2705gl_version () 3223gl_version ()
2706 CODE: 3224 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3226 OUTPUT:
2709 RETVAL 3227 RETVAL
2710 3228
2711char * 3229const char *
2712gl_extensions () 3230gl_extensions ()
2713 CODE: 3231 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3233 OUTPUT:
2716 RETVAL 3234 RETVAL
2717 3235
2718const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2719 3241
2720GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2721 CODE: 3243 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3245 OUTPUT:
2731 3253
2732int glGetError () 3254int glGetError ()
2733 3255
2734void glFinish () 3256void glFinish ()
2735 3257
3258void glFlush ()
3259
2736void glClear (int mask) 3260void glClear (int mask)
2737 3261
2738void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3263 PROTOTYPE: @
2740 3264
2749void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2750 3274
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3276 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2754 3280
2755void glDepthMask (int flag) 3281void glDepthMask (int flag)
2756 3282
2757void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2758 3284
2793void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2794 CODE: 3320 CODE:
2795 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2796 3322
2797void glColor (float r, float g, float b, float a = 1.0) 3323void glColor (float r, float g, float b, float a = 1.0)
3324 PROTOTYPE: @
2798 ALIAS: 3325 ALIAS:
2799 glColor_premultiply = 1 3326 glColor_premultiply = 1
2800 CODE: 3327 CODE:
2801 if (ix) 3328 if (ix)
2802 { 3329 {
2908 3435
2909void glEndList () 3436void glEndList ()
2910 3437
2911void glCallList (int list) 3438void glCallList (int list)
2912 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3446
2915PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2916 3448
2917void 3449void
2918find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3451 PPCODE:
2920{ 3452{
2921 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2922 XPUSHs (self); 3454 XPUSHs (self);
2923} 3455}
2924 3456
2925BOOT: 3457BOOT:
2926{ 3458{
2934 3466
2935void 3467void
2936draw (SV *self) 3468draw (SV *self)
2937 CODE: 3469 CODE:
2938{ 3470{
2939 HV *hv; 3471 HV *hv;
2940 SV **svp; 3472 SV **svp;
2941 NV x, y, w, h; 3473 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2945 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines