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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.86 by root, Fri May 19 16:43:56 2006 UTC

… …
441 SDL_Rect **m; 441 SDL_Rect **m;
442 442
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
447 450
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 455
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456 457
457 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 460
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
669} 670}
670 671
671void 672void
672error (char *message) 673error (char *message)
673 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 676#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 678#endif
679 679
680void 680void
681fatal (char *message) 681fatal (char *message)
682 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 684#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 686#endif
688 exit (1); 687 exit (1);
689 688
690MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
691 690
… …
969 968
970 if (ix) 969 if (ix)
971 { 970 {
972 glEnable (GL_BLEND); 971 glEnable (GL_BLEND);
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 972 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
973 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f);
974 } 975 }
975 976
976 glBindTexture (GL_TEXTURE_2D, name); 977 glBindTexture (GL_TEXTURE_2D, name);
977 978
978 if (wrap_mode) 979 if (wrap_mode)
… …
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 988 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 989 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 990 glEnd ();
990 991
991 if (ix) 992 if (ix)
993 {
994 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 995 glDisable (GL_BLEND);
996 }
993} 997}
994 998
995MODULE = CFClient PACKAGE = CFClient::Map 999MODULE = CFClient PACKAGE = CFClient::Map
996 1000
997CFClient::Map 1001CFClient::Map
… …
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1524 const_iv (GL_ONE_MINUS_DST_ALPHA),
1521 const_iv (GL_RGB), 1525 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1526 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1527 const_iv (GL_UNSIGNED_BYTE),
1524 const_iv (GL_ALPHA), 1528 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1530 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1532 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1533 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1534 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1535 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1536 const_iv (GL_TEXTURE_2D),

Diff Legend

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