diff --git a/arch/linux/ipx_udp.c b/arch/linux/ipx_udp.c index 0efe632d0..fa3ee6496 100755 --- a/arch/linux/ipx_udp.c +++ b/arch/linux/ipx_udp.c @@ -142,7 +142,7 @@ static void chk(void *p) exit(EXIT_FAILURE); } -#define FAIL(m...) do { msg(#m); return -1; } while (0) +#define FAIL(m...) do { msg(m); return -1; } while (0) /* Find as much as MAX_BRDINTERFACES during local iface autoconfiguration. * Note that more interfaces can be added during manual configuration diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index 3974969a8..75cb9faa3 100755 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -838,7 +838,7 @@ bool g3_draw_bitmap(vms_vector *pos,fix width,fix height,grs_bitmap *bm,object * glBegin(GL_QUADS); // Define alpha by looking for object TYPE or ID. We do this here so we have it seperated from the rest of the code. - if (glalpha_effects && (obj->type==OBJ_FIREBALL || obj->type==OBJ_WEAPON || obj->id==POW_EXTRA_LIFE || obj->id==POW_ENERGY || obj->id==POW_SHIELD_BOOST || obj->id==POW_HOARD_ORB || obj->id==POW_CLOAK || obj->id==POW_INVULNERABILITY)) + if (glalpha_effects && (obj->type==OBJ_FIREBALL || obj->type==OBJ_WEAPON || obj->id==POW_EXTRA_LIFE || obj->id==POW_ENERGY || obj->id==POW_SHIELD_BOOST || obj->id==POW_CLOAK || obj->id==POW_INVULNERABILITY)) glColor4f(1.0,1.0,1.0,0.6); else glColor3f(1.0,1.0,1.0); diff --git a/dxx-changelog.txt b/dxx-changelog.txt index 6e225cf5c..20ad9da69 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -3,6 +3,7 @@ D1X-Rebirth Changelog 20070130 -------- d1x.ini, arch/ogl/gr.c, arch/ogl/ogl.c, include/3d.h, main/inferno.c, main/object.c: added transparency effects for some bitmaps like explosions, powerups, weapons, etc. - to enable with -gl_transparency +arch/linux/ipx_udp.c, main/ipclient.h: corrected UDP/IP error output 20070128 -------- diff --git a/main/ipclient.h b/main/ipclient.h index a7b98f78f..73abd69ac 100755 --- a/main/ipclient.h +++ b/main/ipclient.h @@ -48,7 +48,7 @@ static inline void msg(const char *fmt,...) putchar('\n'); } -#define FAIL(m...) do { msg(#m); return -1; } while (0) +#define FAIL(m...) do { msg(m); return -1; } while (0) static inline void chk(void *p){ if (p) return;