rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 12:42:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing errors that caused errors/Warnings when compiling under linux.

Browse source
This commit is contained in:
Richard Allen 2001-10-29 09:58:44 +00:00
parent 2e28e3e710
commit cb90148a07
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/cgame/cg_particles.c
View file

@ -1231,7 +1231,8 @@ void CG_ParticleExplosion (char *animStr, vec3_t origin, vec3_t vel, int duratio
// find the animation string
for (anim=0; shaderAnimNames[anim]; anim++) {
if (!stricmp( animStr, shaderAnimNames[anim] ))
// JBravo - It was stricmp. Changed to Q_stricmp
if (!Q_stricmp( animStr, shaderAnimNames[anim] ))
break;
}
if (!shaderAnimNames[anim]) {
@ -1811,7 +1812,8 @@ void CG_ParticleBloodCloud (centity_t *cent, vec3_t origin, vec3_t dir)
}
void CG_ParticleSparks (vec3_t org, vec3_t vel, int duration, float x, float y, float speed)
// JBravo - there was "float scale" missing from the declaration here. Caused errors under linux.
void CG_ParticleSparks (vec3_t org, vec3_t vel, int duration, float x, float y, float speed, float scale)
{
cparticle_t *p;

4
reaction/cgame/cg_predict.c
View file

@ -245,6 +245,8 @@ static void CG_TouchItem( centity_t *cent ) {
gitem_t *item;
//Blaze: No item prediction
return;
// JBravo - Compiler warnings over unreached code.
/*
if ( !cg_predictItems.integer ) {
return;
}
@ -297,7 +299,7 @@ static void CG_TouchItem( centity_t *cent ) {
if ( !cg.predictedPlayerState.ammo[ item->giTag ] ) {
cg.predictedPlayerState.ammo[ item->giTag ] = 1;
}
}
} */
}

3
reaction/game/inv.h
View file

@ -207,4 +207,5 @@
#define WEAPONINDEX_NAILGUN 11
#define WEAPONINDEX_PROXLAUNCHER 12
#define WEAPONINDEX_CHAINGUN 13
*/
*/

7
reaction/game/q_shared.h
View file

@ -242,7 +242,8 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); }
#define BOTLIB_HARD_LINKED
#endif
#if !idppc
// JBravo: this causes compile time issues under Linux
/* #if !idppc
inline static short BigShort( short l) { return ShortSwap(l); }
#define LittleShort
inline static int BigLong(int l) { return LongSwap(l); }
@ -256,7 +257,7 @@ inline static short LittleShort(short l) { return ShortSwap(l); }
inline static int LittleLong (int l) { return LongSwap(l); }
#define BigFloat
inline static float LittleFloat (const float *l) { return FloatSwap(l); }
#endif
#endif */
#endif
@ -601,6 +602,8 @@ typedef struct {
float v[3];
} vec3struct_t;
#define VectorCopy(a,b) *(vec3struct_t *)b=*(vec3struct_t *)a;
// JBravo: ID_INLINE get defined again. Error....
#undef ID_INLINE
#define ID_INLINE static
#endif
#endif