Menu
▾
▴
CVS: allegro_new/include/allegro/inline 3dmaths.inl,1.1.1.1,1.2 color.inl,1.1.1.1,1.2 draw.inl,1.1.1.1,1.2 file.inl,1.1.1.1,1.2 fix.inl,1.1.1.1,1.2 fmaths.inl,1.1.1.1,1.2 gfx.inl,1.1.1.1,1.2 gui.inl,1.1.1.1,1.2 matrix.inl,1.1.1.1,1.2 rle.inl,1.1.1.1,1.2 system.inl,1.1.1.1,1.2
|
From: Grzegorz A. H. <gr...@us...> - 2002-01-20 17:34:43
|
Update of /cvsroot/alleg/allegro_new/include/allegro/inline
In directory usw-pr-cvs1:/tmp/cvs-serv15595/include/allegro/inline
Modified Files:
3dmaths.inl color.inl draw.inl file.inl fix.inl fmaths.inl
gfx.inl gui.inl matrix.inl rle.inl system.inl
Log Message:
Initial prefixed compilable version
Index: 3dmaths.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/3dmaths.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- 3dmaths.inl 2002/01/18 16:32:04 1.1.1.1
+++ 3dmaths.inl 2002/01/20 17:34:09 1.2
@@ -26,24 +26,24 @@
AL_INLINE(fixed, dot_product, (fixed x1, fixed y1, fixed z1, fixed x2, fixed y2, fixed z2),
{
- return fixmul(x1, x2) + fixmul(y1, y2) + fixmul(z1, z2);
+ return al_fix_mul(x1, x2) + al_fix_mul(y1, y2) + al_fix_mul(z1, z2);
})
-AL_INLINE(float, dot_product_f, (float x1, float y1, float z1, float x2, float y2, float z2),
+AL_INLINE(float, al_dot_product_f, (float x1, float y1, float z1, float x2, float y2, float z2),
{
return (x1 * x2) + (y1 * y2) + (z1 * z2);
})
-AL_INLINE(void, persp_project, (fixed x, fixed y, fixed z, fixed *xout, fixed *yout),
+AL_INLINE(void, al_persp_project, (fixed x, fixed y, fixed z, fixed *xout, fixed *yout),
{
- *xout = fixmul(fixdiv(x, z), _persp_xscale) + _persp_xoffset;
- *yout = fixmul(fixdiv(y, z), _persp_yscale) + _persp_yoffset;
+ *xout = al_fix_mul(al_fix_div(x, z), _persp_xscale) + _persp_xoffset;
+ *yout = al_fix_mul(al_fix_div(y, z), _persp_yscale) + _persp_yoffset;
})
-AL_INLINE(void, persp_project_f, (float x, float y, float z, float *xout, float *yout),
+AL_INLINE(void, al_persp_project_f, (float x, float y, float z, float *xout, float *yout),
{
float z1 = 1.0f / z;
*xout = ((x * z1) * _persp_xscale_f) + _persp_xoffset_f;
Index: color.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/color.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- color.inl 2002/01/18 16:32:04 1.1.1.1
+++ color.inl 2002/01/20 17:34:09 1.2
@@ -23,7 +23,7 @@
extern "C" {
#endif
-AL_INLINE(int, makecol15, (int r, int g, int b),
+AL_INLINE(int, al_make_color_15, (int r, int g, int b),
{
return (((r >> 3) << _rgb_r_shift_15) |
((g >> 3) << _rgb_g_shift_15) |
@@ -31,7 +31,7 @@
})
-AL_INLINE(int, makecol16, (int r, int g, int b),
+AL_INLINE(int, al_make_color_16, (int r, int g, int b),
{
return (((r >> 3) << _rgb_r_shift_16) |
((g >> 2) << _rgb_g_shift_16) |
@@ -39,7 +39,7 @@
})
-AL_INLINE(int, makecol24, (int r, int g, int b),
+AL_INLINE(int, al_make_color_24, (int r, int g, int b),
{
return ((r << _rgb_r_shift_24) |
(g << _rgb_g_shift_24) |
@@ -47,7 +47,7 @@
})
-AL_INLINE(int, makecol32, (int r, int g, int b),
+AL_INLINE(int, al_make_color_32, (int r, int g, int b),
{
return ((r << _rgb_r_shift_32) |
(g << _rgb_g_shift_32) |
@@ -55,7 +55,7 @@
})
-AL_INLINE(int, makeacol32, (int r, int g, int b, int a),
+AL_INLINE(int, al_make_acolor_32, (int r, int g, int b, int a),
{
return ((r << _rgb_r_shift_32) |
(g << _rgb_g_shift_32) |
@@ -64,97 +64,97 @@
})
-AL_INLINE(int, getr8, (int c),
+AL_INLINE(int, al_get_r8, (int c),
{
return _rgb_scale_6[(int)_current_palette[c].r];
})
-AL_INLINE(int, getg8, (int c),
+AL_INLINE(int, al_get_g8, (int c),
{
return _rgb_scale_6[(int)_current_palette[c].g];
})
-AL_INLINE(int, getb8, (int c),
+AL_INLINE(int, al_get_b8, (int c),
{
return _rgb_scale_6[(int)_current_palette[c].b];
})
-AL_INLINE(int, getr15, (int c),
+AL_INLINE(int, al_get_r15, (int c),
{
return _rgb_scale_5[(c >> _rgb_r_shift_15) & 0x1F];
})
-AL_INLINE(int, getg15, (int c),
+AL_INLINE(int, al_get_g15, (int c),
{
return _rgb_scale_5[(c >> _rgb_g_shift_15) & 0x1F];
})
-AL_INLINE(int, getb15, (int c),
+AL_INLINE(int, al_get_b15, (int c),
{
return _rgb_scale_5[(c >> _rgb_b_shift_15) & 0x1F];
})
-AL_INLINE(int, getr16, (int c),
+AL_INLINE(int, al_get_r16, (int c),
{
return _rgb_scale_5[(c >> _rgb_r_shift_16) & 0x1F];
})
-AL_INLINE(int, getg16, (int c),
+AL_INLINE(int, al_get_g16, (int c),
{
return _rgb_scale_6[(c >> _rgb_g_shift_16) & 0x3F];
})
-AL_INLINE(int, getb16, (int c),
+AL_INLINE(int, al_get_b16, (int c),
{
return _rgb_scale_5[(c >> _rgb_b_shift_16) & 0x1F];
})
-AL_INLINE(int, getr24, (int c),
+AL_INLINE(int, al_get_r24, (int c),
{
return ((c >> _rgb_r_shift_24) & 0xFF);
})
-AL_INLINE(int, getg24, (int c),
+AL_INLINE(int, al_get_g24, (int c),
{
return ((c >> _rgb_g_shift_24) & 0xFF);
})
-AL_INLINE(int, getb24, (int c),
+AL_INLINE(int, al_get_b24, (int c),
{
return ((c >> _rgb_b_shift_24) & 0xFF);
})
-AL_INLINE(int, getr32, (int c),
+AL_INLINE(int, al_get_r32, (int c),
{
return ((c >> _rgb_r_shift_32) & 0xFF);
})
-AL_INLINE(int, getg32, (int c),
+AL_INLINE(int, al_get_g32, (int c),
{
return ((c >> _rgb_g_shift_32) & 0xFF);
})
-AL_INLINE(int, getb32, (int c),
+AL_INLINE(int, al_get_b32, (int c),
{
return ((c >> _rgb_b_shift_32) & 0xFF);
})
-AL_INLINE(int, geta32, (int c),
+AL_INLINE(int, al_get_a32, (int c),
{
return ((c >> _rgb_a_shift_32) & 0xFF);
})
@@ -162,9 +162,9 @@
#ifndef ALLEGRO_DOS
-AL_INLINE(void, _set_color, (int index, AL_CONST RGB *p),
+AL_INLINE(void, al_set_color_no_vsync, (int index, AL_CONST AL_RGB *p),
{
- set_color(index, p);
+ al_set_palette_color(index, p);
})
#endif
Index: draw.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/draw.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- draw.inl 2002/01/18 16:32:06 1.1.1.1
+++ draw.inl 2002/01/20 17:34:09 1.2
@@ -27,139 +27,139 @@
#include "gfx.inl"
-AL_INLINE(int, getpixel, (BITMAP *bmp, int x, int y),
+AL_INLINE(int, al_get_pixel, (AL_BITMAP *bmp, int x, int y),
{
- ASSERT(bmp);
+ AL_ASSERT(bmp);
- return bmp->vtable->getpixel(bmp, x, y);
+ return bmp->vtable->al_get_pixel(bmp, x, y);
[...345 lines suppressed...]
unsigned long addr;
int c;
@@ -340,7 +340,7 @@
})
-AL_INLINE(void, _putpixel32, (BITMAP *bmp, int x, int y, int color),
+AL_INLINE(void, al_putpixel_32, (AL_BITMAP *bmp, int x, int y, int color),
{
unsigned long addr;
@@ -351,7 +351,7 @@
})
-AL_INLINE(int, _getpixel32, (BITMAP *bmp, int x, int y),
+AL_INLINE(int, al_get_pixel_32, (AL_BITMAP *bmp, int x, int y),
{
unsigned long addr;
int c;
Index: file.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/file.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- file.inl 2002/01/18 16:32:06 1.1.1.1
+++ file.inl 2002/01/20 17:34:09 1.2
@@ -23,7 +23,7 @@
extern "C" {
#endif
-AL_INLINE(int, pack_getc, (PACKFILE *f),
+AL_INLINE(int, pack_getc, (AL_PACKFILE *f),
{
f->buf_size--;
if (f->buf_size > 0)
@@ -33,7 +33,7 @@
})
-AL_INLINE(int, pack_putc, (int c, PACKFILE *f),
+AL_INLINE(int, pack_putc, (int c, AL_PACKFILE *f),
{
f->buf_size++;
if (f->buf_size >= F_BUF_SIZE)
@@ -43,15 +43,15 @@
})
-AL_INLINE(int, pack_feof, (PACKFILE *f),
+AL_INLINE(int, pack_feof, (AL_PACKFILE *f),
{
- return (f->flags & PACKFILE_FLAG_EOF);
+ return (f->flags & AL_PACKFILE_FLAG_EOF);
})
-AL_INLINE(int, pack_ferror, (PACKFILE *f),
+AL_INLINE(int, pack_ferror, (AL_PACKFILE *f),
{
- return (f->flags & PACKFILE_FLAG_ERROR);
+ return (f->flags & AL_PACKFILE_FLAG_ERROR);
})
#ifdef __cplusplus
Index: fix.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/fix.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- fix.inl 2002/01/18 16:32:08 1.1.1.1
+++ fix.inl 2002/01/20 17:34:09 1.2
@@ -23,207 +23,207 @@
inline fix operator + (const fix x, const fix y) { fix t; t.v = x.v + y.v; return t; }
-inline fix operator + (const fix x, const int y) { fix t; t.v = x.v + itofix(y); return t; }
-inline fix operator + (const int x, const fix y) { fix t; t.v = itofix(x) + y.v; return t; }
-inline fix operator + (const fix x, const long y) { fix t; t.v = x.v + itofix(y); return t; }
-inline fix operator + (const long x, const fix y) { fix t; t.v = itofix(x) + y.v; return t; }
-inline fix operator + (const fix x, const float y) { fix t; t.v = x.v + ftofix(y); return t; }
-inline fix operator + (const float x, const fix y) { fix t; t.v = ftofix(x) + y.v; return t; }
-inline fix operator + (const fix x, const double y) { fix t; t.v = x.v + ftofix(y); return t; }
-inline fix operator + (const double x, const fix y) { fix t; t.v = ftofix(x) + y.v; return t; }
[...310 lines suppressed...]
@@ -235,15 +235,15 @@
}
-inline void apply_matrix(MATRIX *m, fix x, fix y, fix z, fix *xout, fix *yout, fix *zout)
+inline void al_apply_matrix(AL_MATRIX *m, fix x, fix y, fix z, fix *xout, fix *yout, fix *zout)
{
- apply_matrix(m, x.v, y.v, z.v, &xout->v, &yout->v, &zout->v);
+ al_apply_matrix(m, x.v, y.v, z.v, &xout->v, &yout->v, &zout->v);
}
-inline void persp_project(fix x, fix y, fix z, fix *xout, fix *yout)
+inline void al_persp_project(fix x, fix y, fix z, fix *xout, fix *yout)
{
- persp_project(x.v, y.v, z.v, &xout->v, &yout->v);
+ al_persp_project(x.v, y.v, z.v, &xout->v, &yout->v);
}
Index: fmaths.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/fmaths.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- fmaths.inl 2002/01/18 16:32:05 1.1.1.1
+++ fmaths.inl 2002/01/20 17:34:09 1.2
@@ -29,8 +29,8 @@
#undef ALLEGRO_IMPORT_MATH_ASM
-/* ftofix and fixtof are used in generic C versions of fixmul and fixdiv */
-AL_INLINE(fixed, ftofix, (double x),
+/* al_float_to_fix and al_fix_to_ are used in generic C versions of al_fix_mul and al_fix_div */
+AL_INLINE(fixed, al_float_to_fix, (double x),
{
if (x > 32767.0) {
*allegro_errno = ERANGE;
@@ -46,7 +46,7 @@
})
-AL_INLINE(double, fixtof, (fixed x),
+AL_INLINE(double, al_fix_to_, (fixed x),
{
return (double)x / 65536.0;
})
@@ -56,7 +56,7 @@
/* use generic C versions */
-AL_INLINE(fixed, fixadd, (fixed x, fixed y),
+AL_INLINE(fixed, al_fix_add, (fixed x, fixed y),
{
fixed result = x + y;
@@ -79,7 +79,7 @@
})
-AL_INLINE(fixed, fixsub, (fixed x, fixed y),
+AL_INLINE(fixed, al_fix_sub, (fixed x, fixed y),
{
fixed result = x - y;
@@ -102,24 +102,24 @@
})
-AL_INLINE(fixed, fixmul, (fixed x, fixed y),
+AL_INLINE(fixed, al_fix_mul, (fixed x, fixed y),
{
- return ftofix(fixtof(x) * fixtof(y));
+ return al_float_to_fix(al_fix_to_(x) * al_fix_to_(y));
})
-AL_INLINE(fixed, fixdiv, (fixed x, fixed y),
+AL_INLINE(fixed, al_fix_div, (fixed x, fixed y),
{
if (y == 0) {
*allegro_errno = ERANGE;
return (x < 0) ? -0x7FFFFFFF : 0x7FFFFFFF;
}
else
- return ftofix(fixtof(x) / fixtof(y));
+ return al_float_to_fix(al_fix_to_(x) / al_fix_to_(y));
})
-AL_INLINE(int, fixfloor, (fixed x),
+AL_INLINE(int, al_fix_floor, (fixed x),
{
/* (x >> 16) is not portable */
if (x >= 0)
@@ -129,50 +129,50 @@
})
-AL_INLINE(int, fixceil, (fixed x),
+AL_INLINE(int, al_fix_ceil, (fixed x),
{
if (x > (long)(0x7FFF0000)) {
*allegro_errno = ERANGE;
return 0x7FFF;
}
- return fixfloor(x + 0xFFFF);
+ return al_fix_floor(x + 0xFFFF);
})
#endif /* C vs. inline asm */
-AL_INLINE(fixed, itofix, (int x),
+AL_INLINE(fixed, al_int_to_fix, (int x),
{
return x << 16;
})
-AL_INLINE(int, fixtoi, (fixed x),
+AL_INLINE(int, al_fix_to_int, (fixed x),
{
- return fixfloor(x) + ((x & 0x8000) >> 15);
+ return al_fix_floor(x) + ((x & 0x8000) >> 15);
})
-AL_INLINE(fixed, fixcos, (fixed x),
+AL_INLINE(fixed, al_fix_cos, (fixed x),
{
return _cos_tbl[((x + 0x4000) >> 15) & 0x1FF];
})
-AL_INLINE(fixed, fixsin, (fixed x),
+AL_INLINE(fixed, al_fix_sin, (fixed x),
{
return _cos_tbl[((x - 0x400000 + 0x4000) >> 15) & 0x1FF];
})
-AL_INLINE(fixed, fixtan, (fixed x),
+AL_INLINE(fixed, al_fix_tan, (fixed x),
{
return _tan_tbl[((x + 0x4000) >> 15) & 0xFF];
})
-AL_INLINE(fixed, fixacos, (fixed x),
+AL_INLINE(fixed, al_fix_acos, (fixed x),
{
if ((x < -65536) || (x > 65536)) {
*allegro_errno = EDOM;
@@ -183,7 +183,7 @@
})
-AL_INLINE(fixed, fixasin, (fixed x),
+AL_INLINE(fixed, al_fix_asin, (fixed x),
{
if ((x < -65536) || (x > 65536)) {
*allegro_errno = EDOM;
Index: gfx.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/gfx.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gfx.inl 2002/01/18 16:32:09 1.1.1.1
+++ gfx.inl 2002/01/20 17:34:09 1.2
@@ -41,25 +41,25 @@
})
-typedef AL_METHOD(unsigned long, _BMP_BANK_SWITCHER, (BITMAP *bmp, int line));
-typedef AL_METHOD(void, _BMP_UNBANK_SWITCHER, (BITMAP *bmp));
+typedef AL_METHOD(unsigned long, _BMP_BANK_SWITCHER, (AL_BITMAP *bmp, int al_draw_line));
+typedef AL_METHOD(void, _BMP_UNBANK_SWITCHER, (AL_BITMAP *bmp));
-AL_INLINE(unsigned long, bmp_write_line, (BITMAP *bmp, int line),
+AL_INLINE(unsigned long, bmp_write_line, (AL_BITMAP *bmp, int al_draw_line),
[...167 lines suppressed...]
bmp->vtable->release(bmp);
})
-AL_INLINE(void, acquire_screen, (void),
+AL_INLINE(void, al_acquire_screen, (void),
{
- acquire_bitmap(screen);
+ al_acquire_bitmap(al_screen);
})
-AL_INLINE(void, release_screen, (void),
+AL_INLINE(void, al_release_screen, (void),
{
- release_bitmap(screen);
+ al_release_bitmap(al_screen);
})
#endif
Index: gui.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/gui.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gui.inl 2002/01/18 16:32:09 1.1.1.1
+++ gui.inl 2002/01/20 17:34:09 1.2
@@ -23,19 +23,19 @@
extern "C" {
#endif
-AL_INLINE(int, object_message, (DIALOG *d, int msg, int c),
+AL_INLINE(int, al_object_message, (AL_DIALOG *d, int msg, int c),
{
int ret;
if (msg == MSG_DRAW) {
if (d->flags & D_HIDDEN) return D_O_K;
- acquire_screen();
+ al_acquire_screen();
}
ret = d->proc(msg, d, c);
if (msg == MSG_DRAW)
- release_screen();
+ al_release_screen();
if (ret & D_REDRAWME) {
d->flags |= D_DIRTY;
Index: matrix.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/matrix.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- matrix.inl 2002/01/18 16:32:08 1.1.1.1
+++ matrix.inl 2002/01/20 17:34:09 1.2
@@ -24,12 +24,12 @@
#endif
-#define CALC_ROW(n) (fixmul(x, m->v[n][0]) + \
- fixmul(y, m->v[n][1]) + \
- fixmul(z, m->v[n][2]) + \
+#define CALC_ROW(n) (al_fix_mul(x, m->v[n][0]) + \
+ al_fix_mul(y, m->v[n][1]) + \
+ al_fix_mul(z, m->v[n][2]) + \
m->t[n])
-AL_INLINE(void, apply_matrix, (MATRIX *m, fixed x, fixed y, fixed z, fixed *xout, fixed *yout, fixed *zout),
+AL_INLINE(void, al_apply_matrix, (AL_MATRIX *m, fixed x, fixed y, fixed z, fixed *xout, fixed *yout, fixed *zout),
{
*xout = CALC_ROW(0);
*yout = CALC_ROW(1);
Index: rle.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/rle.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rle.inl 2002/01/18 16:32:04 1.1.1.1
+++ rle.inl 2002/01/20 17:34:09 1.2
@@ -26,39 +26,39 @@
#include "allegro/debug.h"
-AL_INLINE(void, draw_rle_sprite, (struct BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y),
+AL_INLINE(void, al_draw_rle_sprite, (struct AL_BITMAP *bmp, AL_CONST struct AL_RLE_SPRITE *sprite, int x, int y),
{
- ASSERT(bmp);
- ASSERT(sprite);
- ASSERT(bmp->vtable->color_depth == sprite->color_depth);
+ AL_ASSERT(bmp);
+ AL_ASSERT(sprite);
+ AL_ASSERT(bmp->vtable->color_depth == sprite->color_depth);
- bmp->vtable->draw_rle_sprite(bmp, sprite, x, y);
+ bmp->vtable->al_draw_rle_sprite(bmp, sprite, x, y);
})
-AL_INLINE(void, draw_trans_rle_sprite, (struct BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y),
+AL_INLINE(void, al_draw_trans_rle_sprite, (struct AL_BITMAP *bmp, AL_CONST struct AL_RLE_SPRITE *sprite, int x, int y),
{
- ASSERT(bmp);
- ASSERT(sprite);
+ AL_ASSERT(bmp);
+ AL_ASSERT(sprite);
if (sprite->color_depth == 32) {
- ASSERT(bmp->vtable->draw_trans_rgba_rle_sprite);
+ AL_ASSERT(bmp->vtable->draw_trans_rgba_rle_sprite);
bmp->vtable->draw_trans_rgba_rle_sprite(bmp, sprite, x, y);
}
else {
- ASSERT(bmp->vtable->color_depth == sprite->color_depth);
- bmp->vtable->draw_trans_rle_sprite(bmp, sprite, x, y);
+ AL_ASSERT(bmp->vtable->color_depth == sprite->color_depth);
+ bmp->vtable->al_draw_trans_rle_sprite(bmp, sprite, x, y);
}
})
-AL_INLINE(void, draw_lit_rle_sprite, (struct BITMAP *bmp, AL_CONST struct RLE_SPRITE *sprite, int x, int y, int color),
+AL_INLINE(void, al_draw_lit_rle_sprite, (struct AL_BITMAP *bmp, AL_CONST struct AL_RLE_SPRITE *sprite, int x, int y, int color),
{
- ASSERT(bmp);
- ASSERT(sprite);
- ASSERT(bmp->vtable->color_depth == sprite->color_depth);
+ AL_ASSERT(bmp);
+ AL_ASSERT(sprite);
+ AL_ASSERT(bmp->vtable->color_depth == sprite->color_depth);
- bmp->vtable->draw_lit_rle_sprite(bmp, sprite, x, y, color);
+ bmp->vtable->al_draw_lit_rle_sprite(bmp, sprite, x, y, color);
})
#ifdef __cplusplus
Index: system.inl
===================================================================
RCS file: /cvsroot/alleg/allegro_new/include/allegro/inline/system.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- system.inl 2002/01/18 16:32:05 1.1.1.1
+++ system.inl 2002/01/20 17:34:09 1.2
@@ -26,12 +26,12 @@
#include "allegro/debug.h"
-AL_INLINE(void, set_window_title, (char *name),
+AL_INLINE(void, al_set_window_title, (char *name),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->set_window_title)
- system_driver->set_window_title(name);
+ if (system_driver->al_set_window_title)
+ system_driver->al_set_window_title(name);
})
@@ -41,54 +41,54 @@
"Proceed anyway?"
-AL_INLINE(int, set_window_close_button, (int enable),
+AL_INLINE(int, al_set_window_close_button, (int enable),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->set_window_close_button)
- return system_driver->set_window_close_button(enable);
+ if (system_driver->al_set_window_close_button)
+ return system_driver->al_set_window_close_button(enable);
return -1;
})
-AL_INLINE(void, set_window_close_hook, (AL_METHOD(void, proc, (void))),
+AL_INLINE(void, al_set_window_close_hook, (AL_METHOD(void, proc, (void))),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->set_window_close_hook)
- system_driver->set_window_close_hook(proc);
+ if (system_driver->al_set_window_close_hook)
+ system_driver->al_set_window_close_hook(proc);
})
-AL_INLINE(int, desktop_color_depth, (void),
+AL_INLINE(int, al_desktop_color_depth, (void),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->desktop_color_depth)
- return system_driver->desktop_color_depth();
+ if (system_driver->al_desktop_color_depth)
+ return system_driver->al_desktop_color_depth();
else
return 0;
})
-AL_INLINE(int, get_desktop_resolution, (int *width, int *height),
+AL_INLINE(int, al_get_desktop_resolution, (int *width, int *height),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->get_desktop_resolution)
- return system_driver->get_desktop_resolution(width, height);
+ if (system_driver->al_get_desktop_resolution)
+ return system_driver->al_get_desktop_resolution(width, height);
else
return -1;
})
-AL_INLINE(void, yield_timeslice, (void),
+AL_INLINE(void, al_yield_timeslice, (void),
{
- ASSERT(system_driver);
+ AL_ASSERT(system_driver);
- if (system_driver->yield_timeslice)
- system_driver->yield_timeslice();
+ if (system_driver->al_yield_timeslice)
+ system_driver->al_yield_timeslice();
})
|