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.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.266 by root, Sun Jul 20 02:51:40 2008 UTC

… …
65# include <netinet/in.h> 65# include <netinet/in.h>
66# include <netinet/tcp.h> 66# include <netinet/tcp.h>
67# include <inttypes.h> 67# include <inttypes.h>
68#endif 68#endif
69 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 80
72#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
73 82
74#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
… …
76 85
77#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
78 87
79/* mask out modifiers we are not interested in */ 88/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
82#if 0
83# define PARACHUTE SDL_INIT_NOPARACHUTE
84#else
85# define PARACHUTE 0
86#endif
87 90
88static AV *texture_av; 91static AV *texture_av;
89 92
90static struct 93static struct
91{ 94{
… …
635 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
638 641
639 const_iv (MIX_DEFAULT_FORMAT), 642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
640# undef const_iv 670# undef const_iv
641 }; 671 };
642 672
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 712#endif
683} 713}
684 714
685char *
686SDL_GetError () 715char *SDL_GetError ()
687 716
688int 717int SDL_Init (U32 flags)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 718
691void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
692SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
693 733
694void 734void
695SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
696 PPCODE: 736 PPCODE:
697{ 737{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 752
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 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); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 755
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 757
721 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
722 while (*m) 759 while (*m)
723 { 760 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 762 {
726 AV *av = newAV (); 763 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
… …
1687 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1688 1725
1689 do 1726 do
1690 { 1727 {
1691 ext = *data++; 1728 ext = *data++;
1692 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1693 1730
1694 if (cmd < 4) 1731 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1697 { 1734 {
… …
1700 } 1737 }
1701 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1704 { 1741 {
1705 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1746
1708 data += *data + 1; 1747 data += *data + 1;
1709 } 1748 }
1710 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1750 cell->flags = *data++;
… …
1741 } 1780 }
1742 } 1781 }
1743 } 1782 }
1744 } 1783 }
1745 else 1784 else
1785 {
1746 cell->darkness = 0; 1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1747 } 1791 }
1748} 1792}
1749 OUTPUT: 1793 OUTPUT:
1750 RETVAL 1794 RETVAL
1751 1795
… …
1803} 1847}
1804 OUTPUT: 1848 OUTPUT:
1805 RETVAL 1849 RETVAL
1806 1850
1807void 1851void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 1853 CODE:
1810{ 1854{
1811 int x, y, z; 1855 int x, y, z;
1812 1856
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 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) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 1860 smooth_key skey;
1817 1861 int pl_x, pl_y;
1862 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 1863 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 1864 rc_key_t key;
1820 rc_array_t *arr; 1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1821 1868
1822 // thats current max. sorry. 1869 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1825 1872
… …
1880 tileid tile = cell->tile [z]; 1927 tileid tile = cell->tile [z];
1881 1928
1882 if (tile) 1929 if (tile)
1883 { 1930 {
1884 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1885 int px, py; 1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1886 1934
1887 if (key.texname != tex.name) 1935 if (key.texname != tex.name)
1888 { 1936 {
1889 if (!tex.name) 1937 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1891 1939
1892 key.texname = tex.name; 1940 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 1941 arr = rc_array (rc, &key);
1894 } 1942 }
1895 1943
1896 px = (x + 1) * T - tex.w; 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1898 1951
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1953 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); 1954 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); 1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 1956
1904 if (cell->flags && z == 2) 1957 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 1958 {
1906 // overlays such as the speech bubble, probably more to come 1959 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 1960 if (cell->flags & 1)
1908 { 1961 {
1909 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
… …
2046 glDisable (GL_TEXTURE_2D); 2099 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2100 key.texname = -1;
2048 } 2101 }
2049 2102
2050 hv_clear (smooth); 2103 hv_clear (smooth);
2104 }
2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2051 } 2121 }
2052 2122
2053 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2054 rc_free (rc); 2124 rc_free (rc);
2055 2125
… …
2292 else 2362 else
2293 *data++ = 0; 2363 *data++ = 0;
2294 } 2364 }
2295 } 2365 }
2296 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2297 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2299 RETVAL = data_sv; 2374 RETVAL = data_sv;
2300} 2375}
2301 OUTPUT: 2376 OUTPUT:
2302 RETVAL 2377 RETVAL
2303 2378
2304void 2379void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2381 PPCODE:
2307{ 2382{
2308 int x, y, z; 2383 int x, y, z;
2309 int w, h; 2384 int w, h;
2310 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2311 2396
2312 if (*data++ != 0) 2397 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2314 2399
2315 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
… …
2330 { 2415 {
2331 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2332 2417
2333 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2334 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2335 uint8_t flags = *data++; 2425 flags = *data++;
2336 2426
2337 if (flags) 2427 if (flags)
2338 { 2428 {
2339 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
… …
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2435
2346 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2347 { 2437 {
2348 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2349 2440
2350 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2351 { 2442 {
2352 tileid t = tile [z]; 2443 tileid t = tile [z];
2353 2444
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2446 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2448 need_texid (self, t);
2358 } 2449 }
2359 2450
2360 cell->tile [z] = t; 2451 cell->tile [z] = t;
2361 } 2452 }

Diff Legend

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