From 75fe4336137d84fb75e68cfe002411df12bdb875 Mon Sep 17 00:00:00 2001 From: flowtron Date: Wed, 18 Aug 2021 17:08:50 +0200 Subject: [PATCH] retire newent7 --- config/menus_edit.cfg | 4 ++-- config/scripts.cfg | 16 ++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 3a7b3a02..204392c5 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -312,8 +312,8 @@ menuinit [ menuitemslider "\fX> \f5Slope \t\f4S\f5: " -40 40 "$_clip06" 1 [ _clip06 = $arg1 ] menuitemslider "> Shape \t" 0 3 "$_clip07" "regular sloped-x sloped-y rotated" [ _clip07 = $arg1 ] 1 menuitem "" -1 - menuitem "\f2\t [ Place clip entity ]" [ newent7 clip (divf $_clip01 10) (divf $_clip02 10) (divf $_clip03 10) (divf $_clip04 10) 0 (divf $_clip06 10) $_clip07 ] - menuitem "\f2\t [ Place player clip entity ]" [ newent7 plclip (divf $_clip01 10) (divf $_clip02 10) (divf $_clip03 10) (divf $_clip04 10) 0 (divf $_clip06 10) $_clip07 ] + menuitem "\f2\t [ Place clip entity ]" [ newent clip (divf $_clip01 10) (divf $_clip02 10) (divf $_clip03 10) (divf $_clip04 10) 0 (divf $_clip06 10) $_clip07 ] + menuitem "\f2\t [ Place player clip entity ]" [ newent plclip (divf $_clip01 10) (divf $_clip02 10) (divf $_clip03 10) (divf $_clip04 10) 0 (divf $_clip06 10) $_clip07 ] if $editing [ push x (editentity (getclosestent)) if (|| (strcmp (at $x 0) clip) (strcmp (at $x 0) plclip)) [ diff --git a/config/scripts.cfg b/config/scripts.cfg index 3a706b6f..0e4fd8fc 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -315,9 +315,9 @@ const copyent [ if (> $entidx -1) [ 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.]]] + pasteent = [if $editing [if $editmetakeydown [showmenu [Paste entity]] [newent @@@n ; echo @@@n @@@d pasted.]]] newmenu [Paste entity] - menuitem [paste: @n @d] [newent7 @n ; echo @n @d pasted.] + menuitem [paste: @n @d] [newent @n ; echo @n @d pasted.] echo $n $d copied. pop n d ] @@ -325,18 +325,6 @@ const copyent [ ] ] -const newent7 [ // like newent, but setting all seven attributes directly - if $numargs [ - loop i 8 [ push [a@i] (if (< $i $numargs) [result $arg@(+ $i 1)])] - selectionwalk [] [ - push n (addentity $a0) - if (strlen $n) [ editentity $n (at $sw_cursel 0) (at $sw_cursel 1) "" $a1 $a2 $a3 $a4 $a5 $a6 $a7 ] - pop n - ] - loop i 8 [ pop [a@i] ] - ] -] - // used by editent // editentity requires ent index, coordinates (via tempalias) and all seven attributes (via arguments) const editentattr [ if (strlen $__editentprefix) [