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.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

… …
367 self->oy = 0; 367 self->oy = 0;
368 self->row = 0; 368 self->row = 0;
369 self->rows = 0; 369 self->rows = 0;
370} 370}
371 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
372static void 382static void
373map_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)
374{ 384{
375 int x, y; 385 int x, y;
376 maprow *row; 386 maprow *row;
… …
390 if (x >= row->c1) 400 if (x >= row->c1)
391 break; 401 break;
392 402
393 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
394 404
395 cell->darkness = 0; 405 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 406 }
400 } 407 }
401} 408}
402 409
403typedef struct { 410typedef struct {
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 672 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 675 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 676 const_iv (SDL_GL_SWAP_CONTROL),
677
678 const_iv (FOW_DARKNESS)
670# undef const_iv 679# undef const_iv
671 }; 680 };
672 681
673 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; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 766
758 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
759 while (*m) 768 while (*m)
760 { 769 {
770 if ((*m)->w >= 400 && (*m)->h >= 300)
771 {
761 AV *av = newAV (); 772 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 774 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 775 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 776 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 777 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
778 }
767 779
768 ++m; 780 ++m;
769 } 781 }
770} 782}
771 783
… …
1777 } 1789 }
1778 } 1790 }
1779 } 1791 }
1780 } 1792 }
1781 else 1793 else
1782 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1783 } 1795 }
1784} 1796}
1785 OUTPUT: 1797 OUTPUT:
1786 RETVAL 1798 RETVAL
1787 1799
… …
1839} 1851}
1840 OUTPUT: 1852 OUTPUT:
1841 RETVAL 1853 RETVAL
1842 1854
1843void 1855void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845 CODE: 1857 CODE:
1846{ 1858{
1847 int x, y, z; 1859 int x, y, z;
1848 1860
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2096 } 2108 }
2097 2109
2098 if (pl_tex.name) 2110 if (pl_tex.name)
2099 { 2111 {
2100 maptex tex = pl_tex; 2112 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2113 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2114 int py = pl_y + sdy;
2103 2115
2104 key.texname = tex.name; 2116 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2117 arr = rc_array (rc, &key);
2106 2118
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2119 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2225 2237
2226 mx += self->x - 1; 2238 mx += self->x - 1;
2227 my += self->y - 1; 2239 my += self->y - 1;
2228 2240
2229 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2230 2242
2231 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2233 { 2245 {
2234 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);

Diff Legend

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