id-software/doom3.gpl
1
0
Fork 0
mirror of https://github.com/TTimo/doom3.gpl.git synced 2026-03-19 16:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from xoddark/Werror_pointer-arith

Browse Source 
Fix pointer-arith warning
This commit is contained in:
Timothee "TTimo" Besset
2011-12-26 06:15:39 -08:00
parent 2fb684dbde 72fd4c6fc2
commit 232432d352
2 changed files with 5 additions and 5 deletions
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 ) { void idActor::Event_HasAnim( int channel, const char *animname ) {
if ( GetAnim( channel, animname ) != NULL ) { if ( GetAnim( channel, animname ) ) {
idThread::ReturnFloat( 1.0f ); idThread::ReturnFloat( 1.0f );
} else { } else {
idThread::ReturnFloat( 0.0f ); 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 ) { void idPlayer::GiveVideo( const char *videoName, idDict *item ) {
if ( videoName == NULL || *videoName == NULL ) { if ( videoName == NULL || *videoName == '\0' ) {
return; return;
} }
@@ -4177,7 +4177,7 @@ idPlayer::GiveEmail
*/ */
void idPlayer::GiveEmail( const char *emailName ) { void idPlayer::GiveEmail( const char *emailName ) {
if ( emailName == NULL || *emailName == NULL ) { if ( emailName == NULL || *emailName == '\0' ) {
return; return;
} }
@@ -4204,7 +4204,7 @@ void idPlayer::GivePDA( const char *pdaName, idDict *item )
inventory.pdaSecurity.AddUnique( item->GetString( "inv_name" ) ); inventory.pdaSecurity.AddUnique( item->GetString( "inv_name" ) );
} }
if ( pdaName == NULL || *pdaName == NULL ) { if ( pdaName == NULL || *pdaName == '\0' ) {
pdaName = "personal"; pdaName = "personal";
} }
@@ -6297,7 +6297,7 @@ void idPlayer::UpdatePDAInfo( bool updatePDASel ) {
const char *security = pda->GetSecurity(); const char *security = pda->GetSecurity();
if ( j == currentPDA || (currentPDA == 0 && security && *security ) ) { if ( j == currentPDA || (currentPDA == 0 && security && *security ) ) {
if ( *security == NULL ) { if ( *security == '\0' ) {
security = common->GetLanguageDict()->GetString( "#str_00066" ); security = common->GetLanguageDict()->GetString( "#str_00066" );
} }
objectiveSystem->SetStateString( "PDASecurityClearance", security ); objectiveSystem->SetStateString( "PDASecurityClearance", security );