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.306 by root, Thu Oct 14 00:02:39 2010 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

… …
580 580
581static void 581static void
582deliantra_main () 582deliantra_main ()
583{ 583{
584 char *argv[] = { 0 }; 584 char *argv[] = { 0 };
585 call_argv ("::main", G_DISCARD | G_VOID, argv); 585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586} 586}
587 587
588#ifdef __MACOSX__ 588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we 589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main() 590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which, 591 * on OS X, so... we provide one and call the original main(), which,
592 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back. 593 * and which calls our main (== SDL_main) back.
594 */ 594 */
595 extern C_LINKAGE int 595 extern C_LINKAGE int
596 main (int argc, char *argv[]) 596 main (int argc, char *argv[])
597 { 597 {
… …
821 821
822 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
823# undef const_iv 823# undef const_iv
824 }; 824 };
825 825
826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
828 828
829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
831} 831}
832 832
… …
975SDL_GetAppState () 975SDL_GetAppState ()
976 976
977int 977int
978SDL_GetModState () 978SDL_GetModState ()
979 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
980void 984void
985SDL_PumpEvents ()
986
987void
981poll_events () 988peep_events ()
982 PPCODE: 989 PPCODE:
983{ 990{
984 SDL_Event ev; 991 SDL_Event ev;
985 992
986 SDL_PumpEvents (); 993 SDL_PumpEvents ();
… …
1139 OUTPUT: 1146 OUTPUT:
1140 RETVAL 1147 RETVAL
1141 1148
1142void 1149void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
1144 1154
1145void 1155void
1146load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
1147 ALIAS: 1157 ALIAS:
1148 load_image_file = 1 1158 load_image_file = 1
… …
2566 int x, y; 2576 int x, y;
2567 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2568 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2569 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2570 int sw3 = sw * 3; 2580 int sw3 = sw * 3;
2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2584 memset (darkness1, 0, sw1*sh1);
2574 2585
2575 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2576 SvCUR_set (darkness3_sv, sw3 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2577 2588
2578 mx += self->x - 1; 2589 mx += self->x - 1;
… …
3157 const_iv (GL_FUNC_SUBTRACT), 3168 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3159# undef const_iv 3170# undef const_iv
3160 }; 3171 };
3161 3172
3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3164 3175
3165 texture_av = newAV (); 3176 texture_av = newAV ();
3166 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
3167} 3178}
3168 3179

Diff Legend

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