diff --git a/common/start.tf b/common/start.tf index 71e1298..465297a 100644 --- a/common/start.tf +++ b/common/start.tf @@ -49,8 +49,9 @@ /load start.tf %;\ /eval /cd %{main_dir}/%{mudworld} %;\ /load start.tf %;\ - /load %{priv_dir}/%{mudworld}/init.tf %;\ /load %{priv_dir}/%{mudworld}/imiona.tf %;\ + /load %{priv_dir}/%{mudworld}/aliases.tf %;\ + /load %{priv_dir}/%{mudworld}/exceptions.tf %;\ /load %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf %;\ /if ( {poczta_show} =~ "NOWA" )\ /status_edit -r1 poczta_show:5:C%{c_alarm} %;\ diff --git a/common/stdinit.tf b/common/stdinit.tf deleted file mode 100644 index b33a85d..0000000 --- a/common/stdinit.tf +++ /dev/null @@ -1 +0,0 @@ -/eval /load %{priv_dir}/%{mudworld}/exceptions.tf diff --git a/start.tf b/start.tf index 34e6246..f0c485d 100644 --- a/start.tf +++ b/start.tf @@ -34,8 +34,9 @@ /eval /cd %%{main_dir}/$${world_name} %%;\ /load sets.tf %%;\ /load start.tf %%;\ - /eval /load %%{priv_dir}/%%{mudworld}/init.tf %%;\ /eval /load %%{priv_dir}/%%{mudworld}/imiona.tf %%;\ + /eval /load %%{priv_dir}/%%{mudworld}/aliases.tf %%;\ + /eval /load %%{priv_dir}/%%{mudworld}/exceptions.tf %%;\ /eval /load %%{priv_dir}/%%{mudworld}/players/%%{player}/%%{player}.tf /def _dir_sprawdz = \ @@ -43,7 +44,7 @@ if [ ! -d %{priv_dir}/%{mudworld} ]; then \ mkdir -p %{priv_dir}/%{mudworld}; \ touch %{priv_dir}/%{mudworld}/imiona.tf; \ - cp ../common/stdinit.tf %{priv_dir}/%{mudworld}/init.tf; \ + touch %{priv_dir}/%{mudworld}/aliases.tf; \ cp ../common/stdexceptions.tf %{priv_dir}/%{mudworld}/exceptions.tf; \ fi @@ -54,13 +55,8 @@ cp ../common/stdplayer.tf %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf; \ touch %{priv_dir}/%{mudworld}/players/%{player}/lista.tf; \ fi; \ - if [ ! -f %{priv_dir}/%{mudworld}/init.tf ]; then \ - cp ../common/stdinit.tf %{priv_dir}/%{mudworld}/init.tf; \ - fi; \ - if [ ! -f %{priv_dir}/%{mudworld}/imiona.tf ]; then \ - touch %{priv_dir}/%{mudworld}/imiona.tf; \ - fi; \ + touch %{priv_dir}/%{mudworld}/imiona.tf; \ + touch %{priv_dir}/%{mudworld}/aliases.tf; \ if [ ! -f %{priv_dir}/%{mudworld}/exceptions.tf ]; then \ cp ../common/stdexceptions.tf %{priv_dir}/%{mudworld}/exceptions.tf; \ - fi; \ - touch %{priv_dir}/%{mudworld}/imiona.tf + fi