Skip to content

Assume beam and shockwave creation is fallible #7174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Baezon wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −3
Open

Assume beam and shockwave creation is fallible #7174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/ship/ship.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14021,7 +14021,6 @@ void ship_process_targeting_lasers()

// hmm, why didn't it fire?
if(shipp->targeting_laser_objnum < 0){
Int3();
ship_stop_targeting_laser(shipp);
}
}
Expand Down
1 change: 0 additions & 1 deletion code/weapon/beam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@ int beam_fire_targeting(fighter_beam_fire_info *fire_info)
if(objnum < 0){
beam_delete(new_item);
nprintf(("General", "obj_create() failed for beam weapon! bah!\n"));
Int3();
return -1;
}
new_item->objnum = objnum;
Expand Down
3 changes: 2 additions & 1 deletion code/weapon/shockwave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ int shockwave_create(int parent_objnum, const vec3d* pos, const shockwave_create
objnum = obj_create( OBJ_SHOCKWAVE, real_parent, i, &orient, &sw->pos, sw->outer_radius, tmp_flags + Object::Object_Flags::Renders, false );

if ( objnum == -1 ){
Int3();
mprintf(("Couldn't create shockwave object -- out of object slots\n"));
return -1;
}

sw->objnum = objnum;
Expand Down