ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.212 by root, Sun Aug 12 13:09:44 2007 UTC vs.
Revision 1.218 by root, Sun Aug 19 14:17:05 2007 UTC

… …
167our $STATUSBOX; 167our $STATUSBOX;
168our $DEBUG_STATUS; 168our $DEBUG_STATUS;
169 169
170our $INV; 170our $INV;
171our $INVR; 171our $INVR;
172our $INV_RIGHT_HB; 172our $INVR_HB;
173
174our $PICKUP_CFG;
175 173
176############################################################################# 174#############################################################################
177 175
178sub status { 176sub status {
179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
772 ); 770 );
773 771
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
776 state => $CFG->{opengl11}, 774 state => $CFG->{force_opengl11},
777 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
778 . "higher memory usage and slower performance. It will, however, help tremendously on " 776 . "higher memory usage and slower performance. It will, however, help tremendously on "
779 . "cards that claim to support a feature but fall back to software rendering. " 777 . "cards that claim to support a feature but fall back to software rendering. "
780 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
781 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
782 . "experience extremely low framerates and your card should do better, try this option.</b>", 780 . "experience extremely low framerates and your card should do better, try this option.</b>",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 } 781 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
790 . "forced OpenGL 1.1 mode.",
791 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
784 ); 792 );
785 793
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 794 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 795 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{fast}, 796 state => $CFG->{fast},
… …
1610 $sw1->add ($INV = new CFPlus::UI::Inventory); 1618 $sw1->add ($INV = new CFPlus::UI::Inventory);
1611 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1619 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1612 1620
1613 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1621 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1614 1622
1615 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1623 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1616 1624
1617 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1625 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1618 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1626 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1619 1627
1620 # XXX: Call after $INVR = ... because set_opencont sets the items 1628 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1875 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1883 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1876 ); 1884 );
1877 $hb->add (new CFPlus::UI::Button 1885 $hb->add (new CFPlus::UI::Button
1878 text => "Quit anyway", 1886 text => "Quit anyway",
1879 expand => 1, 1887 expand => 1,
1880 on_activate => sub { exit }, 1888 on_activate => sub { Event::unloop_all },
1881 ); 1889 );
1882 } 1890 }
1883 1891
1884 $QUIT_DIALOG->show; 1892 $QUIT_DIALOG->show;
1885 $QUIT_DIALOG->grab_focus; 1893 $QUIT_DIALOG->grab_focus;
… …
2079 tooltip => "Terminates the program", 2087 tooltip => "Terminates the program",
2080 on_activate => sub { 2088 on_activate => sub {
2081 if ($CONN) { 2089 if ($CONN) {
2082 open_quit_dialog; 2090 open_quit_dialog;
2083 } else { 2091 } else {
2084 exit; 2092 Event::unloop_all;
2085 } 2093 }
2086 0 2094 0
2087 }, 2095 },
2088 ); 2096 );
2089 2097
2090 $BUTTONBAR->show; 2098 $BUTTONBAR->show;
2091 $SETUP_DIALOG->show; 2099 $SETUP_DIALOG->show;
2100 $MESSAGE_WINDOW->show;
2092 } 2101 }
2093 2102
2094 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2103 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2095} 2104}
2096 2105
… …
2190 CFPlus::DB::Server::run; 2199 CFPlus::DB::Server::run;
2191 2200
2192 CFPlus::UI::set_layout ($::CFG->{layout}); 2201 CFPlus::UI::set_layout ($::CFG->{layout});
2193 2202
2194 my %DEF_CFG = ( 2203 my %DEF_CFG = (
2195 sdl_mode => 0, 2204 sdl_mode => 0,
2196 fullscreen => 0, 2205 fullscreen => 0,
2197 fast => 0, 2206 fast => 0,
2198 opengl11 => 0, 2207 force_opengl11 => undef,
2208 texture_compression => 1,
2199 map_scale => 1, 2209 map_scale => 1,
2200 fow_enable => 1, 2210 fow_enable => 1,
2201 fow_intensity => 0, 2211 fow_intensity => 0,
2202 map_smoothing => 1, 2212 map_smoothing => 1,
2203 gui_fontsize => 1, 2213 gui_fontsize => 1,
2204 log_fontsize => 0.7, 2214 log_fontsize => 0.7,
2205 gauge_fontsize => 1, 2215 gauge_fontsize => 1,
2206 gauge_size => 0.35, 2216 gauge_size => 0.35,
2207 stat_fontsize => 0.7, 2217 stat_fontsize => 0.7,
2208 mapsize => 100, 2218 mapsize => 100,
2209 audio_enable => 1, 2219 audio_enable => 1,
2210 effects_enable => 1, 2220 effects_enable => 1,
2211 effects_volume => 1, 2221 effects_volume => 1,
2212 bgm_enable => 1, 2222 bgm_enable => 1,
2213 bgm_volume => 0.5, 2223 bgm_volume => 0.5,
2214 output_sync => 1, 2224 output_sync => 1,
2215 output_count => 1, 2225 output_count => 1,
2216 output_rate => "", 2226 output_rate => "",
2217 pickup => 0, 2227 pickup => 0,
2218 inv_sort => "mtime", 2228 inv_sort => "mtime",
2219 default => "profile", # default profile 2229 default => "profile", # default profile
2220 show_tips => 1, 2230 show_tips => 1,
2221 logview_max_par => 1000, 2231 logview_max_par => 1000,
2222 ); 2232 );
2223 2233
2224 while (my ($k, $v) = each %DEF_CFG) { 2234 while (my ($k, $v) = each %DEF_CFG) {
2225 $CFG->{$k} = $v unless exists $CFG->{$k}; 2235 $CFG->{$k} = $v unless exists $CFG->{$k};
2226 } 2236 }
… …
2292} 2302}
2293 2303
2294show_tip_of_the_day if $CFG->{show_tips}; 2304show_tip_of_the_day if $CFG->{show_tips};
2295 2305
2296Event::loop; 2306Event::loop;
2307
2308#video_shutdown;
2309#audio_shutdown;
2297#CFPlus::SDL_Quit; 2310CFPlus::SDL_Quit;
2298#CFPlus::_exit 0;
2299
2300END {
2301 video_shutdown;
2302 audio_shutdown;
2303 CFPlus::SDL_Quit;
2304 CFPlus::DB::Server::stop; 2311CFPlus::DB::Server::stop;
2305}
2306 2312
2307=head1 NAME 2313=head1 NAME
2308 2314
2309cfplus - A Crossfire TRT and Crossfire game client 2315cfplus - A Crossfire TRT and Crossfire game client
2310 2316

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines