From b984d89bd7222f1f62aab6b0ea1aa15a45360a34 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 5 Jun 2007 23:10:11 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1144 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderhud.cpp | 2 +- source/src/tools.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index b8c02d3c..4edb465c 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -107,7 +107,7 @@ void drawequipicons() // health & armor if(player1->armour) drawequipicon(620, 1650, 2, 0, false); - drawequipicon(20, 1650, 1, 0, (player1->health <= 20 && !m_osok)); + drawequipicon(20, 1650, 1, 0, (player1->state!=CS_DEAD && player1->health<=20 && !m_osok)); // weapons int c = player1->gunselect, r = 1; diff --git a/source/src/tools.h b/source/src/tools.h index e6ef1538..448a0dae 100644 --- a/source/src/tools.h +++ b/source/src/tools.h @@ -111,7 +111,11 @@ extern void endianswap(void *, int, int); extern void seedMT(uint seed); extern uint randomMT(void); +#if SDL_BYTEORDER == SDL_BIG_ENDIAN +#define CMPB(b, c) +#else #define CMPB(b, c) (cmpb(b, sizeof(b), ENET_HOST_TO_NET_32(c))) +#endif #define loopv(v) if(false) {} else for(int i = 0; i<(v).length(); i++) #define loopvj(v) if(false) {} else for(int j = 0; j<(v).length(); j++)