Skip to content

Commit 59d6a44

Browse files
author
Goober5000
committed
colons are redundant
1 parent 975e108 commit 59d6a44

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

code/model/modelread.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static void set_subsystem_info(int model_num, model_subsystem *subsystemp, char
534534
mprintf(("Subsystem '%s' on ship %s is not recognized as a common subsystem type\n", dname, model_get(model_num)->filename));
535535
}
536536

537-
if ( (strstr(props, "$triggered:")) != NULL ) {
537+
if ( (strstr(props, "$triggered")) != NULL ) {
538538
subsystemp->flags |= MSS_FLAG_ROTATES;
539539
subsystemp->flags |= MSS_FLAG_TRIGGERED;
540540
}
@@ -1248,12 +1248,12 @@ int read_model_file(polymodel * pm, char *filename, int n_subsystems, model_subs
12481248
if (strstr(pm->submodel[n].name, "thruster")) {
12491249
pm->submodel[n].movement_type = MOVEMENT_TYPE_NONE;
12501250
pm->submodel[n].movement_axis = MOVEMENT_AXIS_NONE;
1251-
}else if(strstr(props, "$triggered:")){
1251+
} else if(strstr(props, "$triggered")) {
12521252
pm->submodel[n].movement_type = MOVEMENT_TYPE_TRIGGERED;
12531253
}
12541254
}
12551255

1256-
if ( ( p = strstr(props, "$look_at:")) != NULL ) {
1256+
if ( ( p = strstr(props, "$look_at")) != NULL ) {
12571257
pm->submodel[n].movement_type = MOVEMENT_TYPE_LOOK_AT;
12581258
get_user_prop_value(p+9, pm->submodel[n].look_at);
12591259
pm->submodel[n].look_at_num = -2; // Set this to -2 to mark it as something we need to work out the correct subobject number for later, after all subobjects have been processed
@@ -1274,7 +1274,7 @@ int read_model_file(polymodel * pm, char *filename, int n_subsystems, model_subs
12741274

12751275
// Sets can_move on submodels which are of a rotating type or which have such a parent somewhere down the hierarchy
12761276
if ((pm->submodel[n].movement_type != MOVEMENT_TYPE_NONE)
1277-
|| strstr(props, "$triggered:") || strstr(props, "$rotate") || strstr(props, "$gun_rotation:") || strstr(props, "$gun_rotation")) {
1277+
|| strstr(props, "$triggered") || strstr(props, "$rotate") || strstr(props, "$gun_rotation")) {
12781278
pm->submodel[n].can_move = true;
12791279
} else if (pm->submodel[n].parent >= 0 && pm->submodel[pm->submodel[n].parent].can_move) {
12801280
pm->submodel[n].can_move = true;

0 commit comments

Comments
 (0)