From e52307ce0ad06caeafe176d9db429e4a951f8379 Mon Sep 17 00:00:00 2001 From: Allanis <allanis@saracraft.net> Date: Sat, 8 Mar 2014 00:14:49 +0000 Subject: [PATCH] [Fix] Limiting speed on dumb weapons so the don't "hyperspace". --- bin/Makefile | 2 +- src/weapon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 9e903ad..ff53a29 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -97,7 +97,7 @@ DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) @$(CC) -c $(CFLAGS) -o $@ $< @echo " CC $@" -all: utils ldata lua lephisto +all: utils ldata lua Lephisto help: @echo "Possible targets are:": diff --git a/src/weapon.c b/src/weapon.c index a985708..e50823c 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -336,9 +336,10 @@ static void weapons_updateLayer(const double dt, const WeaponLayer layer) { /* Purpose fallthrough. */ /* Bolts too. */ + case OUTFIT_TYPE_MISSILE_DUMB_AMMO: /* Dumb missiles are like bolts. */ + limit_speed(&w->solid->vel, w->outfit->u.amm.speed, dt); case OUTFIT_TYPE_BOLT: case OUTFIT_TYPE_TURRET_BOLT: - case OUTFIT_TYPE_MISSILE_DUMB_AMMO: /* Dumb missiles are like bolts. */ w->timer -= dt; if(w->timer < 0.) { weapon_destroy(w, layer);