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.279 by root, Thu Oct 2 15:59:40 2008 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
… …
85 90
86#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
87 92
88/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95
96#define KMOD_LRAM 0x10000 // our extension
90 97
91static AV *texture_av; 98static AV *texture_av;
92 99
93static struct 100static struct
94{ 101{
… …
367 self->oy = 0; 374 self->oy = 0;
368 self->row = 0; 375 self->row = 0;
369 self->rows = 0; 376 self->rows = 0;
370} 377}
371 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
372static void 389static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 391{
375 int x, y; 392 int x, y;
376 maprow *row; 393 maprow *row;
… …
390 if (x >= row->c1) 407 if (x >= row->c1)
391 break; 408 break;
392 409
393 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
394 411
395 cell->darkness = 0; 412 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 413 }
400 } 414 }
401} 415}
402 416
403typedef struct { 417typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 528 if (!svp || !SvTRUE (*svp))
515 return 0; 529 return 0;
516 530
517 return 1; 531 return 1;
518} 532}
533
534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
519 585
520MODULE = Deliantra::Client PACKAGE = DC 586MODULE = Deliantra::Client PACKAGE = DC
521 587
522PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
523 589
… …
552 const_iv (SDL_USEREVENT), 618 const_iv (SDL_USEREVENT),
553 619
554 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
557 673
558 const_iv (SDLK_FIRST), 674 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 675 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
641 757
758 const_iv (KMOD_LRAM),
759
642 const_iv (MIX_DEFAULT_FORMAT), 760 const_iv (MIX_DEFAULT_FORMAT),
643 761
644 const_iv (SDL_INIT_TIMER), 762 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 763 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 764 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 783 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 786 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
670# undef const_iv 790# undef const_iv
671 }; 791 };
672 792
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
712#endif 832#endif
713} 833}
714 834
715char *SDL_GetError () 835char *SDL_GetError ()
716 836
837void SDL_braino ()
838
717int SDL_Init (U32 flags) 839int SDL_Init (U32 flags)
718 840
719int SDL_InitSubSystem (U32 flags) 841int SDL_InitSubSystem (U32 flags)
720 842
721void SDL_QuitSubSystem (U32 flags) 843void SDL_QuitSubSystem (U32 flags)
… …
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 879
758 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
759 while (*m) 881 while (*m)
760 { 882 {
883 if ((*m)->w >= 400 && (*m)->h >= 300)
884 {
761 AV *av = newAV (); 885 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 889 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 890 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
891 }
767 892
768 ++m; 893 ++m;
769 } 894 }
770} 895}
771 896
… …
826 { 951 {
827 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
828 case SDL_KEYUP: 953 case SDL_KEYUP:
829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834 break; 959 break;
835 960
836 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
855 x = ev.motion.x; 980 x = ev.motion.x;
856 y = ev.motion.y; 981 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 } 983 }
859 984
860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
862 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
863 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
864 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1777 } 1902 }
1778 } 1903 }
1779 } 1904 }
1780 } 1905 }
1781 else 1906 else
1782 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1783 } 1908 }
1784} 1909}
1785 OUTPUT: 1910 OUTPUT:
1786 RETVAL 1911 RETVAL
1787 1912
… …
1839} 1964}
1840 OUTPUT: 1965 OUTPUT:
1841 RETVAL 1966 RETVAL
1842 1967
1843void 1968void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845 CODE: 1970 CODE:
1846{ 1971{
1847 int x, y, z; 1972 int x, y, z;
1848 1973
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2096 } 2221 }
2097 2222
2098 if (pl_tex.name) 2223 if (pl_tex.name)
2099 { 2224 {
2100 maptex tex = pl_tex; 2225 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2226 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2227 int py = pl_y + sdy;
2103 2228
2104 key.texname = tex.name; 2229 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2230 arr = rc_array (rc, &key);
2106 2231
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2126 { 2251 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
2128 2253
2129 int px = x * T; 2254 int px = x * T;
2130 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
2131 2262
2132 if (cell->stat_hp) 2263 if (cell->stat_hp)
2133 { 2264 {
2134 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
2135 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
2225 2356
2226 mx += self->x - 1; 2357 mx += self->x - 1;
2227 my += self->y - 1; 2358 my += self->y - 1;
2228 2359
2229 memset (darkness1, 255, sw1 * sh1); 2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2230 2361
2231 for (y = 0; y < sh1; y++) 2362 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
2233 { 2364 {
2234 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
… …
2876void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2877 CODE: 3008 CODE:
2878 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2879 3010
2880void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
3012 PROTOTYPE: @
2881 ALIAS: 3013 ALIAS:
2882 glColor_premultiply = 1 3014 glColor_premultiply = 1
2883 CODE: 3015 CODE:
2884 if (ix) 3016 if (ix)
2885 { 3017 {

Diff Legend

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