| … | |
… | |
| 47 | use Gtk2 -init; |
47 | use Gtk2 -init; |
| 48 | |
48 | |
| 49 | use Data::Dumper; |
49 | use Data::Dumper; |
| 50 | use File::Spec; |
50 | use File::Spec; |
| 51 | |
51 | |
| 52 | use Crossfire; |
52 | use Deliantra; |
| 53 | |
53 | |
| 54 | use GCE::MainWindow; |
54 | use GCE::MainWindow; |
| 55 | |
55 | |
| 56 | our $CFG; |
56 | our $CFG; |
| 57 | our $MAPDIR; |
57 | our $MAPDIR; |
| … | |
… | |
| 120 | # FIXME: This sucks, moving it after showing it can't be a good thing. |
120 | # FIXME: This sucks, moving it after showing it can't be a good thing. |
| 121 | $window->show_all; |
121 | $window->show_all; |
| 122 | $window->move ($p_and_s->[0] || $default_x, $p_and_s->[1] || $default_y); |
122 | $window->move ($p_and_s->[0] || $default_x, $p_and_s->[1] || $default_y); |
| 123 | } |
123 | } |
| 124 | |
124 | |
| 125 | if (-e "$Crossfire::VARDIR/gdeconfig") { |
125 | if (-e "$Deliantra::VARDIR/gdeconfig") { |
| 126 | read_cfg "$Crossfire::VARDIR/gdeconfig"; |
126 | read_cfg "$Deliantra::VARDIR/gdeconfig"; |
| 127 | } else { |
127 | } else { |
| 128 | read_cfg "$Crossfire::VARDIR/gceconfig"; |
128 | read_cfg "$Deliantra::VARDIR/gceconfig"; |
| 129 | } |
129 | } |
| 130 | |
130 | |
| 131 | $LIBDIR = $ENV{CROSSFIRE_LIBDIR}; |
131 | $LIBDIR = $ENV{CROSSFIRE_LIBDIR}; |
| 132 | $LIBDIR ||= $CFG->{LIBDIR}; |
132 | $LIBDIR ||= $CFG->{LIBDIR}; |
| 133 | |
133 | |
| 134 | $MAPDIR = $ENV{CROSSFIRE_MAPDIR}; |
134 | $MAPDIR = $ENV{CROSSFIRE_MAPDIR}; |
| 135 | $MAPDIR ||= $CFG->{MAPDIR}; |
135 | $MAPDIR ||= $CFG->{MAPDIR}; |
| 136 | $MAPDIR ||= File::Spec->catfile ($ENV{CROSSFIRE_LIBDIR}, 'maps'); |
136 | $MAPDIR ||= File::Spec->catfile ($ENV{CROSSFIRE_LIBDIR}, 'maps'); |
| 137 | |
137 | |
| 138 | # must be done after changing the libdir path: |
138 | # must be done after changing the libdir path: |
| 139 | Crossfire::set_libdir ($LIBDIR); |
139 | Deliantra::set_libdir ($LIBDIR); |
| 140 | Crossfire::load_archetypes; |
140 | Deliantra::load_archetypes; |
| 141 | Crossfire::load_tilecache; |
141 | Deliantra::load_tilecache; |
| 142 | |
142 | |
| 143 | my $w = GCE::MainWindow->new; |
143 | my $w = GCE::MainWindow->new; |
| 144 | |
144 | |
| 145 | $w->load_layout; |
145 | $w->load_layout; |
| 146 | |
146 | |
