dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2025-04-05 00:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some assertions on startup

Browse source
This commit is contained in:
Daniel Gibson 2020-04-26 05:10:53 +02:00
parent 62c24709ad
commit d7a3332ad2
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/ai/AI.cpp
View file

@ -4092,7 +4092,7 @@ void idAI::UpdateIsOnScreen( void ) {
return;
}
idPlayer *player = gameLocal.GetLocalPlayer();
if ( !player ) {
if( player == NULL || player->GetRenderView() == NULL ) {
isOnScreen = false; //no player, no camera
return;
}

16
game/ai/AI_bot.cpp
View file

@ -1016,13 +1016,19 @@ bool idAI_Bot::SelectWeapon( int weaponNum ) {
//ammo
if(weapons[ weaponNum ].clipSize > 0){ //only if limited clip size
if(weapons[ weaponNum ].ammoInClip <= 0){
AI_WEAPON_NEED_RELOAD = true;
if(AI_WEAPON_NEED_RELOAD.IsLinked()) { // DG: otherwise this asserts at level start
AI_WEAPON_NEED_RELOAD = true;
}
}else{
AI_WEAPON_NEED_RELOAD = false;
if(AI_WEAPON_NEED_RELOAD.IsLinked()) { // DG: otherwise this asserts at level start
AI_WEAPON_NEED_RELOAD = false;
}
}
}
}else{ //no weapon selected
AI_WEAPON_NEED_RELOAD = false;
if(AI_WEAPON_NEED_RELOAD.IsLinked()) { // DG: otherwise this asserts at level start
AI_WEAPON_NEED_RELOAD = false;
}
}
//remove the current projectileClipModel so that it'll be recreated the next time GetAimDir is called
@ -1046,7 +1052,9 @@ bool idAI_Bot::SelectWeapon( int weaponNum ) {
setWeaponMuzzleFlash(); //ok because currentWeapon already updated
//upd script
AI_WEAPON_CHANGED = true;
if(AI_WEAPON_CHANGED.IsLinked()) { // DG: otherwise the assignment will cause an assertion
AI_WEAPON_CHANGED = true;
}
return true;
}