- merge fixes in Blood frontend code.

source/blood/src/blood.cpp

@@ -2469,14 +2469,9 @@ const char *pzCrypticArts[] = {
     "CPART07.AR_", "CPART15.AR_"
 };
 
-const char* pzCrypticArts1[] = {
-	"addons/Cryptic Passage/CPART07.ART", "addons/Cryptic Passage/CPART15.ART"
-};
-
 INIDESCRIPTION gINIDescription[] = {
     { "BLOOD: One Unit Whole Blood", "BLOOD.INI", NULL, 0 },
     { "Cryptic passage", "CRYPTIC.INI", pzCrypticArts, ARRAY_SSIZE(pzCrypticArts) },
-	{ "Cryptic passage", "addons/Cryptic Passage/CRYPTIC.INI", pzCrypticArts1, ARRAY_SSIZE(pzCrypticArts1) },	// let's hope this works for the 
 };
 
 bool AddINIFile(const char *pzFile, bool bForce = false)

source/blood/src/common_game.h

@@ -540,12 +540,8 @@ static inline void G_HandleAsync(void)
     netGetPackets();
 }
 
-#if defined HAVE_FLAC || defined HAVE_VORBIS
 # define FORMAT_UPGRADE_ELIGIBLE
 extern int32_t S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic);
-#else
-# define S_OpenAudio(fn, searchfirst, ismusic) kopen4loadfrommod(fn, searchfirst)
-#endif
 
 #pragma pack(push,1)
 

source/blood/src/player.h

@@ -291,5 +291,6 @@ bool shrinkPlayerSize(PLAYER* pPlayer, int divider);
 bool growPlayerSize(PLAYER* pPlayer, int multiplier);
 bool resetPlayerSize(PLAYER* pPlayer);
 void deactivateSizeShrooms(PLAYER* pPlayer);
+PLAYER* getPlayerById(short id);
 
 END_BLD_NS

source/blood/src/weapon.cpp

@@ -52,6 +52,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_BLD_NS
 
+#define kQAVEnd 125
+
 void FirePitchfork(int, PLAYER *pPlayer);
 void FireSpray(int, PLAYER *pPlayer);
 void ThrowCan(int, PLAYER *pPlayer);

source/blood/src/weapon.h

@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_BLD_NS
 
+QAV* weaponQAV[];
+
 void WeaponInit(void);
 void WeaponDraw(PLAYER *pPlayer, int a2, int a3, int a4, int a5);
 void WeaponRaise(PLAYER *pPlayer);