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.303 by root, Thu Apr 22 11:18:04 2010 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 atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
48#endif 52#endif
49 53
50#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
52 56
53#include <glib/gmacros.h> 57#include <glib.h>
54 58
55#include <pango/pango.h> 59#include <pango/pango.h>
56 60
57#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
101 105
102#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
104 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}
127
105static AV *texture_av; 128static AV *texture_av;
106 129
107static struct 130static struct
108{ 131{
109#define GL_FUNC(ptr,name) ptr name; 132#define GL_FUNC(ptr,name) ptr name;
165{ 188{
166 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
167 190
168 while (attrs) 191 while (attrs)
169 { 192 {
170 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 194
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 196 return 1;
174 197
175 attrs = attrs->next; 198 attrs = attrs->next;
193static void 216static void
194substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
195{ 218{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 222#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 224}
202 225
203static void 226static void
420 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
421 } 444 }
422 } 445 }
423} 446}
424 447
425typedef struct { 448struct smooth_key
449{
426 tileid tile; 450 tileid tile;
427 uint8_t x, y, level; 451 uint8_t x, y, level;
428} 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}
429 471
430static void 472static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 474{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
434 476
435 if (SvIOK (*sv)) 477 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
437 else 479 else
438 sv_setiv (*sv, bits); 480 it->second |= bits;
439} 481}
440 482
441static void 483static void
442music_finished (void) 484music_finished (void)
443{ 485{
460 ev.code = 1; 502 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 504 ev.data2 = 0;
463 505
464 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;
465} 514}
466 515
467static unsigned int 516static unsigned int
468minpot (unsigned int n) 517minpot (unsigned int n)
469{ 518{
552 601
553 return mod; 602 return mod;
554} 603}
555 604
556static void 605static void
557deliantra_main () 606deliantra_main (SV *real_main)
558{ 607{
559 char *argv[] = { 0 }; 608 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
561} 612}
562 613
563#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
564 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
569 */ 622 */
570 extern C_LINKAGE int 623 extern C_LINKAGE int
571 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
572 { 625 {
573 deliantra_main (); 626 deliantra_main (real_main);
574 } 627 }
575 628
576 #undef main 629 #undef main
577 630
578 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
579 632
580 static void 633 static void
581 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
582 { 635 {
636 real_main = real_main_;
637
583 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 639 (main) (1, argv);
585 } 640 }
586#else 641#else
587 static void 642 static void
588 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
589 { 644 {
590 deliantra_main (); 645 deliantra_main (real_main);
591 } 646 }
592#endif 647#endif
593 648
594MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
595 650
796 851
797 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
798# undef const_iv 853# undef const_iv
799 }; 854 };
800 855
801 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--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 858
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 861}
807 862
846#endif 901#endif
847} 902}
848 903
849char *SDL_GetError () 904char *SDL_GetError ()
850 905
851void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
852 908
853int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
854 910
855int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
856 912
857void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
858 914
859void SDL_Quit () 915void SDL_Quit ()
860 916
861int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
862 919
863int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
864 CODE: 921 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
867 OUTPUT: 924 OUTPUT:
868 RETVAL 925 RETVAL
869 926
870void 927void
925 ); 982 );
926 983
927 if (RETVAL) 984 if (RETVAL)
928 { 985 {
929 av_clear (texture_av); 986 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#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);
933#include "glfunc.h" 988#include "glfunc.h"
934#undef GL_FUNC 989#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 992 }
939} 993}
940 OUTPUT: 994 OUTPUT:
941 RETVAL 995 RETVAL
942 996
943void 997void
998SDL_WM_SetCaption (const char *title, const char *icon)
999
1000void
944SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
945 1002
946char * 1003char *
947SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
948 1006
949int 1007int
950SDL_GetAppState () 1008SDL_GetAppState ()
951 1009
952int 1010int
953SDL_GetModState () 1011SDL_GetModState ()
954 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
955void 1017void
1018SDL_PumpEvents ()
1019
1020void
956poll_events () 1021peep_events ()
957 PPCODE: 1022 PPCODE:
958{ 1023{
959 SDL_Event ev; 1024 SDL_Event ev;
960 1025
961 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1042 OUTPUT: 1107 OUTPUT:
1043 RETVAL 1108 RETVAL
1044 1109
1045int 1110int
1046Mix_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)
1047 POSTCALL: 1112 POSTCALL:
1048 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1049 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1050 1115
1051void 1116void
1052Mix_QuerySpec () 1117Mix_QuerySpec ()
1111add_font (char *file) 1176add_font (char *file)
1112 CODE: 1177 CODE:
1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT: 1179 OUTPUT:
1115 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)
1116 1188
1117void 1189void
1118load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1119 ALIAS: 1191 ALIAS:
1120 load_image_file = 1 1192 load_image_file = 1
1166 1238
1167 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1168 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1169 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1170 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1171 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1172 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)));
1173 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1174 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1175 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1176 1248
1248MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1249 1321
1250PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1251 1323
1252DC::Font 1324DC::Font
1253new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1254 CODE: 1326 CODE:
1255{ 1327{
1256 int count; 1328 int count;
1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1258 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1287 PROTOTYPE: 1359 PROTOTYPE:
1288 CODE: 1360 CODE:
1289 tc_restore (); 1361 tc_restore ();
1290 1362
1291DC::Layout 1363DC::Layout
1292new (SV *class) 1364new (SV *klass)
1293 CODE: 1365 CODE:
1294 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1295 1367
1296 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1297 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1446 1518
1447void 1519void
1448set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1449 CODE: 1521 CODE:
1450 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1451 { 1523 {
1452 self->base_height = base_height; 1524 self->base_height = base_height;
1453 layout_update_font (self); 1525 layout_update_font (self);
1454 } 1526 }
1455 1527
1456void 1528void
1820MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1821 1893
1822PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1823 1895
1824DC::Map 1896DC::Map
1825new (SV *class) 1897new (SV *klass)
1826 CODE: 1898 CODE:
1827 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1828 RETVAL->x = 0; 1900 RETVAL->x = 0;
1829 RETVAL->y = 0; 1901 RETVAL->y = 0;
1830 RETVAL->w = 0; 1902 RETVAL->w = 0;
1869 1941
1870void 1942void
1871set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1872 CODE: 1944 CODE:
1873{ 1945{
1874 tileid texid; 1946 tileid texid;
1875 maptex *tex; 1947 maptex *tex;
1876 1948
1877 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1878 return; 1950 return;
1879 1951
1880 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1881 return; 1953 return;
1882 1954
1883 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1884 1956
1885 if (!texid) 1957 if (!texid)
1886 return; 1958 return;
1887 1959
1888 tex = self->tex + texid; 1960 tex = self->tex + texid;
1921} 1993}
1922 1994
1923void 1995void
1924expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1925 PPCODE: 1997 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1927 { 1999 {
1928 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1929 2001
1930 if (tex->name) 2002 if (tex->name)
1931 { 2003 {
1986 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1987 } 2059 }
1988} 2060}
1989 2061
1990SV * 2062SV *
1991map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1992 CODE: 2064 CODE:
1993{ 2065{
1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1995 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1996 mapcell *cell; 2068 mapcell *cell;
2017 2089
2018 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
2019 2091
2020 if (flags & 8) 2092 if (flags & 8)
2021 { 2093 {
2094 uint8_t ext, cmd;
2095
2022 if (extmap) 2096 do
2023 { 2097 {
2024 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
2025 2100
2026 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
2027 { 2104 {
2028 ext = *data++;
2029 cmd = ext & 0x7f;
2030
2031 if (cmd < 4)
2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2033 else if (cmd == 5) // health
2034 {
2035 cell->stat_width = 1; 2105 cell->stat_width = 1;
2036 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
2037 }
2038 else if (cmd == 6) // monster width
2039 cell->stat_width = *data++ + 1;
2040 else if (cmd == 0x47)
2041 {
2042 if (*data == 1) cell->player = data [1];
2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2046
2047 data += *data + 1;
2048 }
2049 else if (cmd == 8) // cell flags
2050 cell->flags = *data++;
2051 else if (ext & 0x40) // unknown, multibyte => skip
2052 data += *data + 1;
2053 else
2054 data++;
2055 } 2107 }
2056 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++;
2057 } 2125 }
2058 else 2126 while (ext & 0x80);
2059 cell->darkness = *data++ + 1;
2060 } 2127 }
2061 2128
2062 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2063 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2064 { 2131 {
2112 ? self->row + y 2179 ? self->row + y
2113 : 0; 2180 : 0;
2114 2181
2115 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2116 { 2183 {
2117 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2118 2185
2119 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2120 { 2187 {
2121 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2122 2189
2124 { 2191 {
2125 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2126 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2127 int a1 = tex.a; 2194 int a1 = tex.a;
2128 2195
2129 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2130 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2131 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2132 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2133 } 2200 }
2134 } 2201 }
2135 2202
2136 *map++ = (r ) 2203 *map++ = (r )
2137 | (g << 8) 2204 | (g << 8)
2138 | (b << 16) 2205 | (b << 16)
2139 | (a << 24); 2206 | (a << 24);
2140 } 2207 }
2141 } 2208 }
2142 2209
2143 RETVAL = map_sv; 2210 RETVAL = map_sv;
2144} 2211}
2145 OUTPUT: 2212 OUTPUT:
2146 RETVAL 2213 RETVAL
2147 2214
2148void 2215void
2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 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)
2150 CODE: 2217 CODE:
2151{ 2218{
2152 int x, y, z; 2219 int x, y, z;
2153 2220
2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2155 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
2156 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)
2157 smooth_key skey; 2223 smooth_key skey;
2158 int pl_x, pl_y; 2224 int pl_x, pl_y;
2159 maptex pl_tex; 2225 maptex pl_tex;
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210 2276
2211 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2212 { 2278 {
2279 smooth_hash smooth;
2213 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1; 2281 key.texname = -1;
2215 2282
2216 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2217 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2238 2305
2239 key.texname = tex.name; 2306 key.texname = tex.name;
2240 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2241 } 2308 }
2242 2309
2243 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2244 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2245 2312
2246 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 { 2314 {
2248 pl_x = px; 2315 pl_x = px;
2249 pl_y = py; 2316 pl_y = py;
2278 2345
2279 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2280 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2281 2348
2282 // full tile 2349 // full tile
2283 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);
2284 2351
2285 // borders 2352 // borders
2286 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);
2287 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);
2288 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);
2289 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);
2290 2357
2291 // corners 2358 // corners
2292 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);
2293 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);
2294 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);
2295 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);
2296 } 2363 }
2297 } 2364 }
2298 2365
2299 if (expect_false (z == 2) && expect_false (cell->flags)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2300 { 2367 {
2302 if (cell->flags & 1) 2369 if (cell->flags & 1)
2303 { 2370 {
2304 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr; 2373 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32; 2374 int px = x * Tw + Tw * 2 / 32;
2308 int py = y * T - T * 6 / 32; 2375 int py = y * Th - Th * 6 / 32;
2309 2376
2310 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2312 2379
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2317 } 2384 }
2318 } 2385 }
2319 } 2386 }
2320 } 2387 }
2321 2388
2337 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2338 { 2405 {
2339 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2340 HE *he; 2407 HE *he;
2341 2408
2342 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2343 while ((he = hv_iternext (smooth)))
2344 { 2410 {
2345 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2346 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2347 2413
2348 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2349 && skey->level == level 2415 && skey.level == level
2350 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2351 { 2417 {
2352 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2353 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2354 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2355 int border = bits & 15; 2421 int border = bits & 15;
2356 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2358 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2359 2425
2361 { 2427 {
2362 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2363 // save gobs of state changes. 2429 // save gobs of state changes.
2364 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2365 { 2431 {
2366 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2367 2433
2368 glEnd (); 2434 glEnd ();
2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2370 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2371 } 2437 }
2372 2438
2373 if (border) 2439 if (border)
2374 { 2440 {
2375 float ox = border * dx; 2441 float ox = border * dx;
2376 2442
2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381 } 2447 }
2382 2448
2383 if (corner) 2449 if (corner)
2384 { 2450 {
2385 float ox = corner * dx; 2451 float ox = corner * dx;
2386 2452
2387 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391 } 2457 }
2392 } 2458 }
2393 } 2459 }
2394 } 2460 }
2395 } 2461 }
2397 2463
2398 glEnd (); 2464 glEnd ();
2399 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1; 2466 key.texname = -1;
2401 } 2467 }
2402
2403 hv_clear (smooth);
2404 } 2468 }
2405 2469
2406 if (pl_tex.name) 2470 if (pl_tex.name)
2407 { 2471 {
2408 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2436 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2437 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2438 { 2502 {
2439 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2440 2504
2441 int px = x * T; 2505 int px = x * Tw;
2442 int py = y * T; 2506 int py = y * Th;
2443 2507
2444 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2445 { 2509 {
2446 px += sdx; 2510 px += sdx;
2447 py += sdy; 2511 py += sdy;
2448 } 2512 }
2449 2513
2450 if (cell->stat_hp) 2514 if (cell->stat_hp)
2451 { 2515 {
2452 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454 2518
2455 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2456 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2457 px + width - 1, py); 2521 px + width - 1, py);
2458 2522
2538 int x, y; 2602 int x, y;
2539 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2540 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2541 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2542 int sw3 = sw * 3; 2606 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2610 memset (darkness1, 0, sw1*sh1);
2546 2611
2547 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2548 SvCUR_set (darkness3_sv, sw3 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2549 2614
2550 mx += self->x - 1; 2615 mx += self->x - 1;
2676 else 2741 else
2677 *data++ = 0; 2742 *data++ = 0;
2678 } 2743 }
2679 } 2744 }
2680 2745
2681 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 { 2748 {
2684 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 } 2751 }
2687 2752
2688 RETVAL = data_sv; 2753 RETVAL = data_sv;
2689} 2754}
2690 OUTPUT: 2755 OUTPUT:
2691 RETVAL 2756 RETVAL
2692 2757
2693void 2758void
2700 STRLEN len; 2765 STRLEN len;
2701 uint8_t *data, *end; 2766 uint8_t *data, *end;
2702 2767
2703 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2706 end = data + len + 8; 2771 end = data + len + 8;
2707 2772
2708 if (len < 5) 2773 if (len < 5)
2709 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2710 2775
2771} 2836}
2772 2837
2773MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2774 2839
2775DC::RW 2840DC::RW
2776new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2777 CODE: 2842 CODE:
2778{ 2843{
2779 STRLEN datalen; 2844 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2781 2846
2783} 2848}
2784 OUTPUT: 2849 OUTPUT:
2785 RETVAL 2850 RETVAL
2786 2851
2787DC::RW 2852DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2789 CODE: 2854 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT: 2856 OUTPUT:
2792 RETVAL 2857 RETVAL
2793 2858
2902#else 2967#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif 2969#endif
2905 2970
2906DC::MixChunk 2971DC::MixChunk
2907new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2908 CODE: 2973 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT: 2975 OUTPUT:
2911 RETVAL 2976 RETVAL
2912 2977
2982 RETVAL = Mix_PlayingMusic (); 3047 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT: 3048 OUTPUT:
2984 RETVAL 3049 RETVAL
2985 3050
2986DC::MixMusic 3051DC::MixMusic
2987new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2988 CODE: 3053 CODE:
2989 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2990 OUTPUT: 3055 OUTPUT:
2991 RETVAL 3056 RETVAL
2992 3057
3129 const_iv (GL_FUNC_SUBTRACT), 3194 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131# undef const_iv 3196# undef const_iv
3132 }; 3197 };
3133 3198
3134 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--)
3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136 3201
3137 texture_av = newAV (); 3202 texture_av = newAV ();
3138 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
3139} 3204}
3140 3205
3145 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
3146 3211
3147void 3212void
3148apple_nvidia_bug (int enable) 3213apple_nvidia_bug (int enable)
3149 3214
3150char * 3215const char *
3151gl_vendor () 3216gl_vendor ()
3152 CODE: 3217 CODE:
3153 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
3154 OUTPUT: 3219 OUTPUT:
3155 RETVAL 3220 RETVAL
3156 3221
3157char * 3222const char *
3158gl_version () 3223gl_version ()
3159 CODE: 3224 CODE:
3160 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
3161 OUTPUT: 3226 OUTPUT:
3162 RETVAL 3227 RETVAL
3163 3228
3164char * 3229const char *
3165gl_extensions () 3230gl_extensions ()
3166 CODE: 3231 CODE:
3167 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3168 OUTPUT: 3233 OUTPUT:
3169 RETVAL 3234 RETVAL
3170 3235
3171const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
3172 3241
3173GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
3174 CODE: 3243 CODE:
3175 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
3176 OUTPUT: 3245 OUTPUT:
3183 RETVAL 3252 RETVAL
3184 3253
3185int glGetError () 3254int glGetError ()
3186 3255
3187void glFinish () 3256void glFinish ()
3257
3258void glFlush ()
3188 3259
3189void glClear (int mask) 3260void glClear (int mask)
3190 3261
3191void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3192 PROTOTYPE: @ 3263 PROTOTYPE: @
3377 3448
3378void 3449void
3379find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3380 PPCODE: 3451 PPCODE:
3381{ 3452{
3382 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3383 XPUSHs (self); 3454 XPUSHs (self);
3384} 3455}
3385 3456
3386BOOT: 3457BOOT:
3387{ 3458{
3395 3466
3396void 3467void
3397draw (SV *self) 3468draw (SV *self)
3398 CODE: 3469 CODE:
3399{ 3470{
3400 HV *hv; 3471 HV *hv;
3401 SV **svp; 3472 SV **svp;
3402 NV x, y, w, h; 3473 NV x, y, w, h;
3403 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3404 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3405 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3406 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