diff --git a/d3xp/Actor.cpp b/d3xp/Actor.cpp index 135bae3..107e506 100644 --- a/d3xp/Actor.cpp +++ b/d3xp/Actor.cpp @@ -458,7 +458,7 @@ idActor::idActor( void ) { waitState = ""; - blink_anim = NULL; + blink_anim = 0; blink_time = 0; blink_min = 0; blink_max = 0; diff --git a/d3xp/Grabber.cpp b/d3xp/Grabber.cpp index 7c9dbe9..34b8067 100644 --- a/d3xp/Grabber.cpp +++ b/d3xp/Grabber.cpp @@ -276,7 +276,7 @@ void idGrabber::StartDrag( idEntity *grabEnt, int id ) { aiEnt->StartRagdoll(); } } 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 diff --git a/d3xp/Item.cpp b/d3xp/Item.cpp index 524952d..34713c1 100644 --- a/d3xp/Item.cpp +++ b/d3xp/Item.cpp @@ -294,7 +294,7 @@ void idItem::Spawn( void ) { if ( !ent ) { 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 diff --git a/d3xp/Trigger.cpp b/d3xp/Trigger.cpp index e15c021..52ab270 100644 --- a/d3xp/Trigger.cpp +++ b/d3xp/Trigger.cpp @@ -1303,10 +1303,10 @@ void idTrigger_Flag::Event_Touch( idEntity *other, trace_t *trace ) { flag->PostEventMS( eventFlag, 0 ); break; case 1 : - flag->PostEventMS( eventFlag, 0, NULL ); + flag->PostEventMS( eventFlag, 0, 0 ); break; case 2 : - flag->PostEventMS( eventFlag, 0, NULL, NULL ); + flag->PostEventMS( eventFlag, 0, 0, 0 ); break; } diff --git a/d3xp/ai/AI_events.cpp b/d3xp/ai/AI_events.cpp index 6d11607..0c000e5 100644 --- a/d3xp/ai/AI_events.cpp +++ b/d3xp/ai/AI_events.cpp @@ -2489,7 +2489,7 @@ void idAI::Event_ThrowMoveable( void ) { } if ( moveable ) { 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 ) { af->Unbind(); - af->PostEventMS( &EV_SetOwner, 200, NULL ); + af->PostEventMS( &EV_SetOwner, 200, 0 ); } } diff --git a/game/Actor.cpp b/game/Actor.cpp index ec20ab7..f5d26ef 100644 --- a/game/Actor.cpp +++ b/game/Actor.cpp @@ -442,7 +442,7 @@ idActor::idActor( void ) { waitState = ""; - blink_anim = NULL; + blink_anim = 0; blink_time = 0; blink_min = 0; blink_max = 0; diff --git a/game/Item.cpp b/game/Item.cpp index fa0f28d..c5ca917 100644 --- a/game/Item.cpp +++ b/game/Item.cpp @@ -294,7 +294,7 @@ void idItem::Spawn( void ) { if ( !ent ) { gameLocal.Error( "Item couldn't find owner '%s'", giveTo.c_str() ); } - PostEventMS( &EV_Touch, 0, ent, NULL ); + PostEventMS( &EV_Touch, 0, ent, 0 ); } if ( spawnArgs.GetBool( "spin" ) || gameLocal.isMultiplayer ) { diff --git a/game/ai/AI_events.cpp b/game/ai/AI_events.cpp index fc96076..984cd6f 100644 --- a/game/ai/AI_events.cpp +++ b/game/ai/AI_events.cpp @@ -2335,7 +2335,7 @@ void idAI::Event_ThrowMoveable( void ) { } if ( moveable ) { moveable->Unbind(); - moveable->PostEventMS( &EV_SetOwner, 200, NULL ); + moveable->PostEventMS( &EV_SetOwner, 200, 0 ); } } @@ -2356,7 +2356,7 @@ void idAI::Event_ThrowAF( void ) { } if ( af ) { af->Unbind(); - af->PostEventMS( &EV_SetOwner, 200, NULL ); + af->PostEventMS( &EV_SetOwner, 200, 0 ); } } diff --git a/idlib/Dict.cpp b/idlib/Dict.cpp index c49a5ca..8130226 100644 --- a/idlib/Dict.cpp +++ b/idlib/Dict.cpp @@ -475,7 +475,7 @@ int idDict::FindKeyIndex( const char *key ) const { if ( key == NULL || key[0] == '\0' ) { idLib::common->DWarning( "idDict::FindKeyIndex: empty key" ); - return NULL; + return 0; } int hash = argHash.GenerateKey( key, false );