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.269 by root, Sun Jul 20 03:46:02 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{
… …
364 self->oy = 0; 367 self->oy = 0;
365 self->row = 0; 368 self->row = 0;
366 self->rows = 0; 369 self->rows = 0;
367} 370}
368 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
369static void 382static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 384{
372 int x, y; 385 int x, y;
373 maprow *row; 386 maprow *row;
… …
387 if (x >= row->c1) 400 if (x >= row->c1)
388 break; 401 break;
389 402
390 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
391 404
392 cell->darkness = 0; 405 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 406 }
397 } 407 }
398} 408}
399 409
400typedef struct { 410typedef struct {
… …
635 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
638 648
639 const_iv (MIX_DEFAULT_FORMAT), 649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL),
677
678 const_iv (FOW_DARKNESS)
640# undef const_iv 679# undef const_iv
641 }; 680 };
642 681
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 719 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 720 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 721#endif
683} 722}
684 723
685char *
686SDL_GetError () 724char *SDL_GetError ()
687 725
688int 726int SDL_Init (U32 flags)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 727
691void 728int SDL_InitSubSystem (U32 flags)
729
730void SDL_QuitSubSystem (U32 flags)
731
692SDL_Quit () 732void SDL_Quit ()
733
734int SDL_GL_SetAttribute (int attr, int value)
735
736int SDL_GL_GetAttribute (int attr)
737 CODE:
738 if (SDL_GL_GetAttribute (attr, &RETVAL))
739 XSRETURN_UNDEF;
740 OUTPUT:
741 RETVAL
693 742
694void 743void
695SDL_ListModes (int rgb, int alpha) 744SDL_ListModes (int rgb, int alpha)
696 PPCODE: 745 PPCODE:
697{ 746{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 759 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 760 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 761
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 762 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); 763 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 764
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 766
721 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
722 while (*m) 768 while (*m)
723 { 769 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 770 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 771 {
726 AV *av = newAV (); 772 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 774 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 775 av_push (av, newSViv (rgb));
… …
1687 uint8_t ext, cmd; 1733 uint8_t ext, cmd;
1688 1734
1689 do 1735 do
1690 { 1736 {
1691 ext = *data++; 1737 ext = *data++;
1692 cmd = ext & 0x3f; 1738 cmd = ext & 0x7f;
1693 1739
1694 if (cmd < 4) 1740 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1741 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1742 else if (cmd == 5) // health
1697 { 1743 {
… …
1700 } 1746 }
1701 else if (cmd == 6) // monster width 1747 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1748 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1749 else if (cmd == 0x47)
1704 { 1750 {
1705 if (*data == 4) 1751 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1755
1708 data += *data + 1; 1756 data += *data + 1;
1709 } 1757 }
1710 else if (cmd == 8) // cell flags 1758 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1759 cell->flags = *data++;
… …
1741 } 1789 }
1742 } 1790 }
1743 } 1791 }
1744 } 1792 }
1745 else 1793 else
1746 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1747 } 1795 }
1748} 1796}
1749 OUTPUT: 1797 OUTPUT:
1750 RETVAL 1798 RETVAL
1751 1799
… …
1803} 1851}
1804 OUTPUT: 1852 OUTPUT:
1805 RETVAL 1853 RETVAL
1806 1854
1807void 1855void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 1857 CODE:
1810{ 1858{
1811 int x, y, z; 1859 int x, y, z;
1812 1860
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1862 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) 1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 1864 smooth_key skey;
1817 1865 int pl_x, pl_y;
1866 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 1867 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 1868 rc_key_t key;
1820 rc_array_t *arr; 1869 rc_array_t *arr;
1870
1871 pl_tex.name = 0;
1821 1872
1822 // thats current max. sorry. 1873 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 1874 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 1875 if (sh > 255) sh = 255;
1825 1876
… …
1880 tileid tile = cell->tile [z]; 1931 tileid tile = cell->tile [z];
1881 1932
1882 if (tile) 1933 if (tile)
1883 { 1934 {
1884 maptex tex = self->tex [tile]; 1935 maptex tex = self->tex [tile];
1885 int px, py; 1936 int px = (x + 1) * T - tex.w;
1937 int py = (y + 1) * T - tex.h;
1886 1938
1887 if (key.texname != tex.name) 1939 if (key.texname != tex.name)
1888 { 1940 {
1889 if (!tex.name) 1941 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 1942 tex = self->tex [2]; /* missing, replace by noface */
1891 1943
1892 key.texname = tex.name; 1944 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 1945 arr = rc_array (rc, &key);
1894 } 1946 }
1895 1947
1896 px = (x + 1) * T - tex.w; 1948 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 1949 {
1950 pl_x = px;
1951 pl_y = py;
1952 pl_tex = tex;
1953 continue;
1954 }
1898 1955
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1957 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); 1958 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); 1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 1960
1904 if (cell->flags && z == 2) 1961 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 1962 {
1906 // overlays such as the speech bubble, probably more to come 1963 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 1964 if (cell->flags & 1)
1908 { 1965 {
1909 maptex tex = self->tex [1]; 1966 maptex tex = self->tex [1];
… …
2048 } 2105 }
2049 2106
2050 hv_clear (smooth); 2107 hv_clear (smooth);
2051 } 2108 }
2052 2109
2110 if (pl_tex.name)
2111 {
2112 maptex tex = pl_tex;
2113 int px = pl_x + sdx;
2114 int py = pl_y + sdy;
2115
2116 key.texname = tex.name;
2117 arr = rc_array (rc, &key);
2118
2119 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2120 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2121 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123
2124 rc_draw (rc);
2125 }
2126
2053 glDisable (GL_BLEND); 2127 glDisable (GL_BLEND);
2054 rc_free (rc); 2128 rc_free (rc);
2055 2129
2056 // top layer: overlays such as the health bar 2130 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2131 for (y = 0; y < sh; y++)
… …
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2237
2164 mx += self->x - 1; 2238 mx += self->x - 1;
2165 my += self->y - 1; 2239 my += self->y - 1;
2166 2240
2167 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2242
2169 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2171 { 2245 {
2172 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);
… …
2292 else 2366 else
2293 *data++ = 0; 2367 *data++ = 0;
2294 } 2368 }
2295 } 2369 }
2296 2370
2371 /* if size is w*h + 5 then no data has been found */
2372 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2373 {
2297 SvPOK_only (data_sv); 2374 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 }
2377
2299 RETVAL = data_sv; 2378 RETVAL = data_sv;
2300} 2379}
2301 OUTPUT: 2380 OUTPUT:
2302 RETVAL 2381 RETVAL
2303 2382
2304void 2383void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2384set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2385 PPCODE:
2307{ 2386{
2308 int x, y, z; 2387 int x, y, z;
2309 int w, h; 2388 int w, h;
2310 int x1, y1; 2389 int x1, y1;
2390 STRLEN len;
2391 uint8_t *data, *end;
2392
2393 len = SvLEN (data_sv);
2394 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2395 data = SvPVbyte_nolen (data_sv);
2396 end = data + len + 8;
2397
2398 if (len < 5)
2399 XSRETURN_EMPTY;
2311 2400
2312 if (*data++ != 0) 2401 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2402 XSRETURN_EMPTY; /* version mismatch */
2314 2403
2315 w = *data++ << 8; w |= *data++; 2404 w = *data++ << 8; w |= *data++;
… …
2330 { 2419 {
2331 maprow *row = map_get_row (self, y); 2420 maprow *row = map_get_row (self, y);
2332 2421
2333 for (x = x0; x < x1; x++) 2422 for (x = x0; x < x1; x++)
2334 { 2423 {
2424 uint8_t flags;
2425
2426 if (data + 7 >= end)
2427 XSRETURN_EMPTY;
2428
2335 uint8_t flags = *data++; 2429 flags = *data++;
2336 2430
2337 if (flags) 2431 if (flags)
2338 { 2432 {
2339 mapcell *cell = row_get_cell (row, x); 2433 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2434 tileid tile[3] = { 0, 0, 0 };
… …
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2437 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2438 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2439
2346 if (cell->darkness == 0) 2440 if (cell->darkness == 0)
2347 { 2441 {
2348 cell->darkness = 0; 2442 /*cell->darkness = 0;*/
2443 EXTEND (SP, 3);
2349 2444
2350 for (z = 0; z <= 2; z++) 2445 for (z = 0; z <= 2; z++)
2351 { 2446 {
2352 tileid t = tile [z]; 2447 tileid t = tile [z];
2353 2448
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2449 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2450 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2451 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2452 need_texid (self, t);
2358 } 2453 }
2359 2454
2360 cell->tile [z] = t; 2455 cell->tile [z] = t;
2361 } 2456 }

Diff Legend

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