Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Limiting speed on dumb weapons so the don't "hyperspace".

Browse Source
This commit is contained in:
Allanis 2014-03-08 00:14:49 +00:00
parent 26c1fda143
commit e52307ce0a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/Makefile
View File

@ -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:":

3
src/weapon.c
View File

@ -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);