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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC

… …
41 41
42#define MAP_EXTEND_X 32 42#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 43#define MAP_EXTEND_Y 512
44 44
45#define MIN_FONT_HEIGHT 10 45#define MIN_FONT_HEIGHT 10
46
47#define GL_CALL(type,func,args) \
48 { \
49 static int init_; \
50 static type fptr_; \
51 \
52 if (!init_) \
53 { \
54 init_ = 1; \
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56 } \
57 \
58 if (fptr_) \
59 fptr_ args; \
60 }
46 61
47typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
49 64
50typedef PangoFontDescription *CFClient__Font; 65typedef PangoFontDescription *CFClient__Font;
… …
604 PUSHs (sv_2mortal (newSViv (b / y))); 619 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 620 PUSHs (sv_2mortal (newSViv (a / y)));
606} 621}
607 622
608void 623void
624error (char *message)
625 CODE:
626#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif
631
632void
609fatal (char *message) 633fatal (char *message)
610 CODE: 634 CODE:
611#ifdef _WIN32 635#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
613#else 637#else
… …
1331 const_iv (GL_SRC_ALPHA), 1355 const_iv (GL_SRC_ALPHA),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1356 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1333 const_iv (GL_RGB), 1357 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1358 const_iv (GL_RGBA),
1335 const_iv (GL_UNSIGNED_BYTE), 1359 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4),
1337 const_iv (GL_ALPHA), 1360 const_iv (GL_ALPHA),
1338 const_iv (GL_FLOAT), 1361 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1362 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1363 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1364 const_iv (GL_TEXTURE_1D),
… …
1402 1425
1403void glPopMatrix () 1426void glPopMatrix ()
1404 1427
1405void glLoadIdentity () 1428void glLoadIdentity ()
1406 1429
1430# near and far are due to microsofts buggy c compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 1431void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 1432
1409void glViewport (int x, int y, int width, int height) 1433void glViewport (int x, int y, int width, int height)
1410 1434
1411void glTranslate (float x, float y, float z = 0.) 1435void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1436 CODE:
… …
1447 1471
1448void glBindTexture (int target, int name) 1472void glBindTexture (int target, int name)
1449 1473
1450void glConvolutionParameter (int target, int pname, float params) 1474void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1475 CODE:
1452 glConvolutionParameterf (target, pname, params); 1476 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453 1477
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1478void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1479 CODE:
1480 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1481 (target, internalformat, width, height, format, type, data));
1455 1482
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1483void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 1484
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1485void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1459 1486

Diff Legend

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