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.310 by root, Tue Dec 27 07:23:33 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
… …
1139 OUTPUT: 1139 OUTPUT:
1140 RETVAL 1140 RETVAL
1141 1141
1142void 1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
1144 1147
1145void 1148void
1146load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
1147 ALIAS: 1150 ALIAS:
1148 load_image_file = 1 1151 load_image_file = 1
… …
2566 int x, y; 2569 int x, y;
2567 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2568 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2569 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2570 int sw3 = sw * 3; 2573 int sw3 = sw * 3;
2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2577 memset (darkness1, 0, sw1*sh1);
2574 2578
2575 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2576 SvCUR_set (darkness3_sv, sw3 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2577 2581
2578 mx += self->x - 1; 2582 mx += self->x - 1;
… …
3157 const_iv (GL_FUNC_SUBTRACT), 3161 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3159# undef const_iv 3163# undef const_iv
3160 }; 3164 };
3161 3165
3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3164 3168
3165 texture_av = newAV (); 3169 texture_av = newAV ();
3166 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
3167} 3171}
3168 3172

Diff Legend

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