diff --git a/config/scripts.cfg b/config/scripts.cfg index 08c3c772..9a8f874a 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -298,7 +298,7 @@ const copyent [ if $editing [ entidx = (getclosestent) if (> entidx -1) [ - push n (format2 "%1 %5 %6 %7 %8 %9 %010 %011" (editentity )) + push n (format2 "%1 %5 %6 %7 %8 %9 %010 %011" (editentity $entidx)) push d (switch (findlist "mapmodel sound" (at $n 0)) [mapmodelslotname (at $n 2)] [at (editmapsoundslot (at $n 1)) 0]) pasteent = [if $editing [if $editmetakeydown [showmenu [Paste entity]] [newent7 @@@n ; echo @@@n @@@d pasted.]]] newmenu [Paste entity] diff --git a/source/src/world.cpp b/source/src/world.cpp index d72f0e11..67e10ae5 100644 --- a/source/src/world.cpp +++ b/source/src/world.cpp @@ -374,8 +374,8 @@ void newentity(int index, int x, int y, int z, const char *what, float v1f, floa switch(type) { // MAPMODEL, PLAYERSTART and CTF-FLAG use the current camera direction as value for attr1, so attr23456 need to be moved case MAPMODEL: - v6f = v5f; - v5f = v4f; + v6f = v5f; + v5f = v4f; v4f = v3f; v3f = v2f; case PLAYERSTART: