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 #31 from xoddark/Werror_conversion-null

Browse Source 
Fix conversion-null warning
This commit is contained in:
Timothee "TTimo" Besset
2011-12-29 09:43:34 -08:00
parent d5f751654d a95464d419
commit 279d6c6f8d
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neo/d3xp/Actor.cpp
View File

@@ -458,7 +458,7 @@ idActor::idActor( void ) {
waitState = ""; waitState = "";
blink_anim = NULL; blink_anim = 0;
blink_time = 0; blink_time = 0;
blink_min = 0; blink_min = 0;
blink_max = 0; blink_max = 0;

2
neo/d3xp/Grabber.cpp
View File

@@ -276,7 +276,7 @@ void idGrabber::StartDrag( idEntity *grabEnt, int id ) {
aiEnt->StartRagdoll(); aiEnt->StartRagdoll();
} }
} else if ( grabEnt->IsType( idMoveableItem::Type ) ) { } else if ( grabEnt->IsType( idMoveableItem::Type ) ) {
grabEnt->PostEventMS( &EV_Touch, 250, thePlayer, NULL ); grabEnt->PostEventMS( &EV_Touch, 250, thePlayer, 0 );
} }
// Get the current physics object to manipulate // Get the current physics object to manipulate

2
neo/d3xp/Item.cpp
View File

@@ -294,7 +294,7 @@ void idItem::Spawn( void ) {
if ( !ent ) { if ( !ent ) {
gameLocal.Error( "Item couldn't find owner '%s'", giveTo.c_str() ); gameLocal.Error( "Item couldn't find owner '%s'", giveTo.c_str() );
} }
PostEventMS( &EV_Touch, 0, ent, NULL ); PostEventMS( &EV_Touch, 0, ent, 0 );
} }
#ifdef CTF #ifdef CTF

4
neo/d3xp/Trigger.cpp
View File

@@ -1303,10 +1303,10 @@ void idTrigger_Flag::Event_Touch( idEntity *other, trace_t *trace ) {
flag->PostEventMS( eventFlag, 0 ); flag->PostEventMS( eventFlag, 0 );
break; break;
case 1 : case 1 :
flag->PostEventMS( eventFlag, 0, NULL ); flag->PostEventMS( eventFlag, 0, 0 );
break; break;
case 2 : case 2 :
flag->PostEventMS( eventFlag, 0, NULL, NULL ); flag->PostEventMS( eventFlag, 0, 0, 0 );
break; break;
} }

4
neo/d3xp/ai/AI_events.cpp
View File

@@ -2489,7 +2489,7 @@ void idAI::Event_ThrowMoveable( void ) {
} }
if ( moveable ) { if ( moveable ) {
moveable->Unbind(); moveable->Unbind();
moveable->PostEventMS( &EV_SetOwner, 200, NULL ); moveable->PostEventMS( &EV_SetOwner, 200, 0 );
} }
} }
@@ -2510,7 +2510,7 @@ void idAI::Event_ThrowAF( void ) {
} }
if ( af ) { if ( af ) {
af->Unbind(); af->Unbind();
af->PostEventMS( &EV_SetOwner, 200, NULL ); af->PostEventMS( &EV_SetOwner, 200, 0 );
} }
} }

2
neo/idlib/Dict.cpp
View File

@@ -475,7 +475,7 @@ int idDict::FindKeyIndex( const char *key ) const {
if ( key == NULL || key[0] == '\0' ) { if ( key == NULL || key[0] == '\0' ) {
idLib::common->DWarning( "idDict::FindKeyIndex: empty key" ); idLib::common->DWarning( "idDict::FindKeyIndex: empty key" );
return NULL; return 0;
} }
int hash = argHash.GenerateKey( key, false ); int hash = argHash.GenerateKey( key, false );