… | |
… | |
98 | $window->move ($p_and_s->[0] || $default_x, $p_and_s->[1] || $default_y); |
98 | $window->move ($p_and_s->[0] || $default_x, $p_and_s->[1] || $default_y); |
99 | } |
99 | } |
100 | |
100 | |
101 | read_cfg "$Crossfire::VARDIR/gceconfig"; |
101 | read_cfg "$Crossfire::VARDIR/gceconfig"; |
102 | |
102 | |
103 | $CFG->{LIBDIR} ||= $ENV{CROSSFIRE_LIBDIR}; |
103 | $ENV{CROSSFIRE_LIBDIR} = $CFG->{LIBDIR} |
|
|
104 | if $CFG->{LIBDIR}; |
|
|
105 | |
104 | $CFG->{MAPDIR} ||= File::Spec->catfile ($CFG->{LIBDIR}, 'maps'); |
106 | $CFG->{MAPDIR} ||= File::Spec->catfile ($ENV{CROSSFIRE_LIBDIR}, 'maps'); |
105 | |
107 | |
106 | # must be done after changing the libdir path: |
108 | # must be done after changing the libdir path: |
107 | Crossfire::set_libdir ($CFG->{LIBDIR}); |
109 | Crossfire::set_libdir ($ENV{CROSSFIRE_LIBDIR}); |
108 | Crossfire::load_archetypes; |
110 | Crossfire::load_archetypes; |
109 | Crossfire::load_tilecache; |
111 | Crossfire::load_tilecache; |
110 | |
112 | |
111 | my $w = GCE::MainWindow->new; |
113 | my $w = GCE::MainWindow->new; |
112 | |
114 | |