Skip to content

Commit 06a7507

Browse files
committed
fix regression in BaddyObjects
1 parent d12e829 commit 06a7507

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

src/game/setup.c

+3-23
Original file line numberDiff line numberDiff line change
@@ -315,35 +315,15 @@ void BaddyObjects()
315315
}
316316

317317
if (Objects[O_WARRIOR2].loaded) {
318+
Objects[O_WARRIOR2] = Objects[O_WARRIOR1];
318319
Objects[O_WARRIOR2].initialise = InitialiseWarrior2;
319-
Objects[O_WARRIOR2].control = FlyerControl;
320-
Objects[O_WARRIOR2].collision = CreatureCollision;
321-
Objects[O_WARRIOR2].shadow_size = UNIT_SHADOW / 3;
322-
Objects[O_WARRIOR2].hit_points = FLYER_HITPOINTS;
323-
Objects[O_WARRIOR2].pivot_length = 150;
324-
Objects[O_WARRIOR2].radius = FLYER_RADIUS;
325320
Objects[O_WARRIOR2].smartness = WARRIOR2_SMARTNESS;
326-
Objects[O_WARRIOR2].intelligent = 1;
327-
Objects[O_WARRIOR2].save_position = 1;
328-
Objects[O_WARRIOR2].save_hitpoints = 1;
329-
Objects[O_WARRIOR2].save_anim = 1;
330-
Objects[O_WARRIOR2].save_flags = 1;
331321
}
332322

333323
if (Objects[O_WARRIOR3].loaded) {
324+
Objects[O_WARRIOR3] = Objects[O_WARRIOR1];
334325
Objects[O_WARRIOR3].initialise = InitialiseWarrior2;
335-
Objects[O_WARRIOR3].control = FlyerControl;
336-
Objects[O_WARRIOR3].collision = CreatureCollision;
337-
Objects[O_WARRIOR3].shadow_size = UNIT_SHADOW / 3;
338-
Objects[O_WARRIOR3].hit_points = FLYER_HITPOINTS;
339-
Objects[O_WARRIOR3].pivot_length = 150;
340-
Objects[O_WARRIOR3].radius = FLYER_RADIUS;
341-
Objects[O_WARRIOR3].smartness = FLYER_SMARTNESS;
342-
Objects[O_WARRIOR3].intelligent = 1;
343-
Objects[O_WARRIOR3].save_position = 1;
344-
Objects[O_WARRIOR3].save_hitpoints = 1;
345-
Objects[O_WARRIOR3].save_anim = 1;
346-
Objects[O_WARRIOR3].save_flags = 1;
326+
Objects[O_WARRIOR2].smartness = WARRIOR2_SMARTNESS; // sic
347327
}
348328

349329
if (Objects[O_CENTAUR].loaded) {

0 commit comments

Comments
 (0)