empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit: Keep missions centered on unit centered when teleporting

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-19 16:41:50 +01:00
parent 10f6322594
commit c7af9bd955
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/edit.c
View file

@ -817,8 +817,7 @@ edit_unit(struct empobj *unit, char *key, char *p,
xyas(unit->x, unit->y, unit->own), xyas(unit->x, unit->y, unit->own),
xyas(newx, newy, unit->own), xyas(newx, newy, unit->own),
cname(player->cnum)); cname(player->cnum));
unit->x = newx; unit_teleport(unit, newx, newy);
unit->y = newy;
break; break;
case 'E': case 'E':
arg = LIMIT_TO(arg, mineff, 100); arg = LIMIT_TO(arg, mineff, 100);

2
tests/actofgod/final.xdump
View file

@ -250,7 +250,7 @@ config plane
uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta
0 0 1 -1 0 0 2 0 100 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000 0 0 1 -1 0 0 2 0 100 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000
1 98 1 -1 0 10 0 0 100 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000 1 98 1 -1 0 10 0 0 100 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000
2 2 3 -1 0 10 -127 0 50 1 -1 air\040defense 4 "" 0 0 -1 -1 (airburst) 0 0.00000 2 2 3 -1 0 10 -127 0 50 3 -1 air\040defense 4 "" 0 0 -1 -1 (airburst) 0 0.00000
3 3 1 -1 0 10 -127 0 50 1 -1 air\040defense 4 "a" 0 0 3 -1 () 0 0.00000 3 3 1 -1 0 10 -127 0 50 1 -1 air\040defense 4 "a" 0 0 3 -1 () 0 0.00000
4 3 3 -1 0 100 127 0 32767 0 0 none 0 "" 18 0 -1 4 () 0 0.00000 4 3 3 -1 0 100 127 0 32767 0 0 none 0 "" 18 0 -1 4 () 0 0.00000
5 3 1 -1 0 100 127 0 32767 1 -1 air\040defense 4 "" 18 0 -1 -1 () 0 0.00000 5 3 1 -1 0 100 127 0 32767 1 -1 air\040defense 4 "" 18 0 -1 -1 () 0 0.00000