Mercurial > hg > forks > yadex
diff src/cfgfile.cc @ 83:002bc70a3982
More cleanups. Mostly variable renames.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 26 Sep 2011 18:06:30 +0300 |
| parents | 2f1ecc1c5f72 |
| children | 5652866f31eb |
line wrap: on
line diff
--- a/src/cfgfile.cc Mon Sep 26 17:56:33 2011 +0300 +++ b/src/cfgfile.cc Mon Sep 26 18:06:30 2011 +0300 @@ -114,7 +114,7 @@ /* The first option has neither long name nor short name. It is used for "lonely" arguments (i.e. file names). */ OptionDesc options[] = { - {NULL, NULL, OPT_STRINGPTRACC, NULL, "Patch wad file", &cfg.PatchWads }, + {NULL, NULL, OPT_STRINGPTRACC, NULL, "Patch wad file", &cfg.patchwads }, {"autoscroll", NULL, OPT_BOOLEAN, NULL, "Enable autoscrolling", &cfg.autoscroll }, {"autoscroll_amp", NULL, OPT_UNSIGNED, NULL, "Amp. of scrolling (% of screen size)", &cfg.autoscroll_amp}, {"autoscroll_edge", NULL, OPT_UNSIGNED, NULL, "Max. dist. to edge (pixels)", &cfg.autoscroll_edge}, @@ -122,7 +122,7 @@ {"blindly_swap_sidedefs", NULL, OPT_BOOLEAN, NULL, "Blindly swap sidedefs on a linedef", &cfg.blindly_swap_sidedefs}, {"config_file", "f", OPT_STRINGPTR, "1", "Config file", &cfg.config_file}, {"copy_linedef_reuse_sidedefs",NULL,OPT_BOOLEAN, NULL, "Use same sidedefs as original linedef", &cfg.copy_linedef_reuse_sidedefs}, - {"debug", "d", OPT_BOOLEAN, NULL, "Debug mode", &cfg.Debug}, + {"debug", "d", OPT_BOOLEAN, NULL, "Debug mode", &cfg.debug}, {"default_ceiling_height", NULL, OPT_INTEGER, NULL, "Default ceiling height", &cfg.def.ceiling_height}, {"default_ceiling_texture", NULL, OPT_STRINGBUF8, NULL, "Default ceiling texture", cfg.def.ceiling_texture}, @@ -137,8 +137,8 @@ {"digit_zoom_base", NULL, OPT_INTEGER, NULL, "[0]-[9]: base zoom factor (in %)", &cfg.digit_zoom_base}, {"digit_zoom_step", NULL, OPT_INTEGER, NULL, "[0]-[9]: step between factors (in %)", &cfg.digit_zoom_step}, {"double_click_timeout", NULL, OPT_INTEGER, NULL, "Max delay in ms between clicks", &cfg.double_click_timeout}, - {"expert", NULL, OPT_BOOLEAN, NULL, "Expert mode", &cfg.Expert}, - {"file", NULL, OPT_STRINGPTRLIST, NULL, "Patch wad file", &cfg.PatchWads}, + {"expert", NULL, OPT_BOOLEAN, NULL, "Expert mode", &cfg.expert}, + {"file", NULL, OPT_STRINGPTRLIST, NULL, "Patch wad file", &cfg.patchwads}, {"font", "fn", OPT_STRINGPTR, NULL, "(X11 only) Font name", &font_name}, {"game", "g", OPT_STRINGPTR, NULL, "Game", &cfg.Game}, {"grid_max", NULL, OPT_INTEGER, NULL, "Max grid step (map units)", &cfg.GridMax}, @@ -150,25 +150,25 @@ {"info_bar", NULL, OPT_BOOLEAN, NULL, "Show the info bar", &cfg.InfoShown}, {"insert_vertex_split_linedef",NULL,OPT_CONFIRM, NULL, "Split ld after ins. vertex", &cfg.insert_vertex_split_linedef}, {"insert_vertex_merge_vertices",NULL,OPT_CONFIRM, NULL, "Merge vertices after ins. vertex", &cfg.insert_vertex_merge_vertices}, - {"iwad1", "i1", OPT_STRINGPTR, NULL, "The name of the Doom/Ultimate D. iwad", &cfg.Iwad[0]}, - {"iwad2", "i2", OPT_STRINGPTR, NULL, "The name of the Doom II/Final D. iwad", &cfg.Iwad[1]}, - {"iwad3", "i3", OPT_STRINGPTR, NULL, "The name of the Heretic iwad", &cfg.Iwad[2]}, - {"iwad4", "i4", OPT_STRINGPTR, NULL, "The name of the Hexen iwad", &cfg.Iwad[3]}, - {"iwad5", "i5", OPT_STRINGPTR, NULL, "The name of the Strife iwad", &cfg.Iwad[4]}, - {"iwad6", "i6", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.2 iwad", &cfg.Iwad[5]}, - {"iwad7", "i7", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.4 iwad", &cfg.Iwad[6]}, - {"iwad8", "i8", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.5 iwad", &cfg.Iwad[7]}, - {"iwad9", "i9", OPT_STRINGPTR, NULL, "The name of the Doom press rel. iwad", &cfg.Iwad[8]}, - {"iwad10", "i10",OPT_STRINGPTR, NULL, "The name of the Strife 1.0 iwad", &cfg.Iwad[9]}, + {"iwad1", "i1", OPT_STRINGPTR, NULL, "The name of the Doom/Ultimate D. iwad", &cfg.iwadnames[0]}, + {"iwad2", "i2", OPT_STRINGPTR, NULL, "The name of the Doom II/Final D. iwad", &cfg.iwadnames[1]}, + {"iwad3", "i3", OPT_STRINGPTR, NULL, "The name of the Heretic iwad", &cfg.iwadnames[2]}, + {"iwad4", "i4", OPT_STRINGPTR, NULL, "The name of the Hexen iwad", &cfg.iwadnames[3]}, + {"iwad5", "i5", OPT_STRINGPTR, NULL, "The name of the Strife iwad", &cfg.iwadnames[4]}, + {"iwad6", "i6", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.2 iwad", &cfg.iwadnames[5]}, + {"iwad7", "i7", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.4 iwad", &cfg.iwadnames[6]}, + {"iwad8", "i8", OPT_STRINGPTR, NULL, "The name of the Doom alpha 0.5 iwad", &cfg.iwadnames[7]}, + {"iwad9", "i9", OPT_STRINGPTR, NULL, "The name of the Doom press rel. iwad", &cfg.iwadnames[8]}, + {"iwad10", "i10",OPT_STRINGPTR, NULL, "The name of the Strife 1.0 iwad", &cfg.iwadnames[9]}, {"no_pixmap", "P", OPT_BOOLEAN, NULL, "(X11 only) Use no pixmap", &cfg.no_pixmap}, - {"pwad", "pw", OPT_STRINGPTRACC, NULL, "Pwad file to load", &cfg.PatchWads}, - {"quiet", "q", OPT_BOOLEAN, NULL, "Quiet mode", &cfg.Quiet}, - {"quieter", "qq", OPT_BOOLEAN, NULL, "Quieter mode", &cfg.Quieter}, + {"pwad", "pw", OPT_STRINGPTRACC, NULL, "Pwad file to load", &cfg.patchwads}, + {"quiet", "q", OPT_BOOLEAN, NULL, "Quiet mode", &cfg.quiet}, + {"quieter", "qq", OPT_BOOLEAN, NULL, "Quieter mode", &cfg.quieter}, {"scroll_less", NULL, OPT_UNSIGNED, NULL, "Amp. of scrolling (% of screen size)", &cfg.scroll_less}, {"scroll_more", NULL, OPT_UNSIGNED, NULL, "Amp. of scrolling (% of screen size)", &cfg.scroll_more}, - {"select0", "s0", OPT_BOOLEAN, NULL, "Automatic selection of 0th object", &cfg.Select0}, + {"select0", "s0", OPT_BOOLEAN, NULL, "Automatic selection of 0th object", &cfg.autoselect0}, {"sprite_scale", NULL, OPT_INTEGER, NULL, "Relative scale of sprites", &cfg.sprite_scale}, - {"swap_buttons", "sb", OPT_BOOLEAN, NULL, "Swap mouse buttons", &cfg.SwapButtons}, + {"swap_buttons", "sb", OPT_BOOLEAN, NULL, "Swap mouse buttons", &cfg.swap_buttons}, {"text_dot", "td", OPT_BOOLEAN, NULL, "DrawScreenText debug flag", &cfg.text_dot}, {"verbose", "v", OPT_BOOLEAN, "1", "Verbose mode", &cfg.verbose}, {"welcome_message", NULL, OPT_BOOLEAN, NULL, "Print welcome message", &cfg.welcome_message},