Skip to content

Update type Prop to ensure it's on object list #7702

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
wookieejedi wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

Update type Prop to ensure it's on object list #7702

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
5 changes: 4 additions & 1 deletion code/object/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,13 @@ const char *Object_type_names[MAX_OBJECT_TYPES] = {
"Asteroid",
"Jump Node",
"Beam",
"Raw Pof"
"Raw Pof",
"Prop"
//XSTR:ON
};

static_assert(MAX_OBJECT_TYPES == OBJ_PROP + 1, "Object_type_names needs an entry for every object type!");

obj_flag_name Object_flag_names[] = {
{ Object::Object_Flags::Invulnerable, "invulnerable", },
{ Object::Object_Flags::Protected, "protect-ship", },
Expand Down
2 changes: 1 addition & 1 deletion code/object/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#define OBJ_PROP 17 // A prop object like a landscape. Similar to ships but is entirely non-interactable with the exception of collisions

//Make sure to change Object_type_names in Object.c when adding another type!
#define MAX_OBJECT_TYPES 17
#define MAX_OBJECT_TYPES 18

#define UNUSED_OBJNUM (-MAX_OBJECTS*2) // Newer systems use this instead of -1 for invalid object.

Expand Down
Loading