dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-27 06:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix -Wpointer-arith warnings

Browse source 
NULL used in arithmetic
This commit is contained in:
dhewg 2011-11-30 23:14:44 +01:00
parent 120d560722
commit 783db18c5e
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/d3xp/Actor.cpp
View file

@ -3134,7 +3134,7 @@ idActor::Event_HasAnim
================
*/
void idActor::Event_HasAnim( int channel, const char *animname ) {
if ( GetAnim( channel, animname ) != NULL ) {
if ( GetAnim( channel, animname ) != 0 ) {
idThread::ReturnFloat( 1.0f );
} else {
idThread::ReturnFloat( 0.0f );

8
neo/d3xp/Player.cpp
View file

@ -4140,7 +4140,7 @@ idPlayer::GiveVideo
*/
void idPlayer::GiveVideo( const char *videoName, idDict *item ) {
if ( videoName == NULL || *videoName == NULL ) {
if ( videoName == NULL || *videoName == 0 ) {
return;
}
@ -4177,7 +4177,7 @@ idPlayer::GiveEmail
*/
void idPlayer::GiveEmail( const char *emailName ) {
if ( emailName == NULL || *emailName == NULL ) {
if ( emailName == NULL || *emailName == 0 ) {
return;
}
@ -4204,7 +4204,7 @@ void idPlayer::GivePDA( const char *pdaName, idDict *item )
inventory.pdaSecurity.AddUnique( item->GetString( "inv_name" ) );
}
if ( pdaName == NULL || *pdaName == NULL ) {
if ( pdaName == NULL || *pdaName == 0 ) {
pdaName = "personal";
}
@ -6297,7 +6297,7 @@ void idPlayer::UpdatePDAInfo( bool updatePDASel ) {
const char *security = pda->GetSecurity();
if ( j == currentPDA || (currentPDA == 0 && security && *security ) ) {
if ( *security == NULL ) {
if ( *security == 0 ) {
security = common->GetLanguageDict()->GetString( "#str_00066" );
}
objectiveSystem->SetStateString( "PDASecurityClearance", security );

2
neo/game/Actor.cpp
View file

@ -3063,7 +3063,7 @@ idActor::Event_HasAnim
================
*/
void idActor::Event_HasAnim( int channel, const char *animname ) {
if ( GetAnim( channel, animname ) != NULL ) {
if ( GetAnim( channel, animname ) != 0 ) {
idThread::ReturnFloat( 1.0f );
} else {
idThread::ReturnFloat( 0.0f );

8
neo/game/Player.cpp
View file

@ -3281,7 +3281,7 @@ idPlayer::GiveVideo
*/
void idPlayer::GiveVideo( const char *videoName, idDict *item ) {
if ( videoName == NULL || *videoName == NULL ) {
if ( videoName == NULL || *videoName == 0 ) {
return;
}
@ -3318,7 +3318,7 @@ idPlayer::GiveEmail
*/
void idPlayer::GiveEmail( const char *emailName ) {
if ( emailName == NULL || *emailName == NULL ) {
if ( emailName == NULL || *emailName == 0 ) {
return;
}
@ -3345,7 +3345,7 @@ void idPlayer::GivePDA( const char *pdaName, idDict *item )
inventory.pdaSecurity.AddUnique( item->GetString( "inv_name" ) );
}
if ( pdaName == NULL || *pdaName == NULL ) {
if ( pdaName == NULL || *pdaName == 0 ) {
pdaName = "personal";
}
@ -5249,7 +5249,7 @@ void idPlayer::UpdatePDAInfo( bool updatePDASel ) {
const char *security = pda->GetSecurity();
if ( j == currentPDA || (currentPDA == 0 && security && *security ) ) {
if ( *security == NULL ) {
if ( *security == 0 ) {
security = common->GetLanguageDict()->GetString( "#str_00066" );
}
objectiveSystem->SetStateString( "PDASecurityClearance", security );