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.263 by root, Fri Jul 18 21:18:42 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 {
… …
647 const_iv (SDL_INIT_CDROM), 654 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 655 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 656 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 657 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 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)
652# undef const_iv 679# undef const_iv
653 }; 680 };
654 681
655 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; )
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
702 729
703void SDL_QuitSubSystem (U32 flags) 730void SDL_QuitSubSystem (U32 flags)
704 731
705void SDL_Quit () 732void SDL_Quit ()
706 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
742
707void 743void
708SDL_ListModes (int rgb, int alpha) 744SDL_ListModes (int rgb, int alpha)
709 PPCODE: 745 PPCODE:
710{ 746{
711 SDL_Rect **m; 747 SDL_Rect **m;
… …
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 759 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 760 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 761
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 762 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 763 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 764
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 766
734 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
735 while (*m) 768 while (*m)
736 { 769 {
770 if ((*m)->w >= 400 && (*m)->h >= 300)
771 {
737 AV *av = newAV (); 772 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 774 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 775 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 776 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 777 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
778 }
743 779
744 ++m; 780 ++m;
745 } 781 }
746} 782}
747 783
… …
1753 } 1789 }
1754 } 1790 }
1755 } 1791 }
1756 } 1792 }
1757 else 1793 else
1758 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1759 } 1795 }
1760} 1796}
1761 OUTPUT: 1797 OUTPUT:
1762 RETVAL 1798 RETVAL
1763 1799
… …
1815} 1851}
1816 OUTPUT: 1852 OUTPUT:
1817 RETVAL 1853 RETVAL
1818 1854
1819void 1855void
1820draw (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)
1821 CODE: 1857 CODE:
1822{ 1858{
1823 int x, y, z; 1859 int x, y, z;
1824 1860
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2072 } 2108 }
2073 2109
2074 if (pl_tex.name) 2110 if (pl_tex.name)
2075 { 2111 {
2076 maptex tex = pl_tex; 2112 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2113 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2114 int py = pl_y + sdy;
2079 2115
2080 key.texname = tex.name; 2116 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2117 arr = rc_array (rc, &key);
2082 2118
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2119 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2201 2237
2202 mx += self->x - 1; 2238 mx += self->x - 1;
2203 my += self->y - 1; 2239 my += self->y - 1;
2204 2240
2205 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2206 2242
2207 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2209 { 2245 {
2210 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);

Diff Legend

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