mail[Wesnoth-commits] r44663 - in /trunk: data/_main.cfg data/core/_main.cfg src/game.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by alinktomine on July 25, 2010 - 03:24:
Author: alink
Date: Sun Jul 25 03:24:59 2010
New Revision: 44663

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44663&view=rev
Log:
Show the main menu several times faster by skipping terrain rules (useless 
there)
This also speed up the use of '--load'. Add a new define MAIN_MENU for this.

Modified:
    trunk/data/_main.cfg
    trunk/data/core/_main.cfg
    trunk/src/game.cpp

Modified: trunk/data/_main.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/_main.cfg?rev=44663&r1=44662&r2=44663&view=diff
==============================================================================
--- trunk/data/_main.cfg (original)
+++ trunk/data/_main.cfg Sun Jul 25 03:24:59 2010
@@ -57,7 +57,9 @@
 
 # Include the terrain-graphics definitions after the campaigns so campaign 
specific
 # terrains work properly.
+#ifndef MAIN_MENU
 {core/terrain-graphics.cfg}
+#endif
 
 [binary_path]
     path=data/core

Modified: trunk/data/core/_main.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/_main.cfg?rev=44663&r1=44662&r2=44663&view=diff
==============================================================================
--- trunk/data/core/_main.cfg (original)
+++ trunk/data/core/_main.cfg Sun Jul 25 03:24:59 2010
@@ -2,13 +2,16 @@
 # Main purpose of this file is to ensure that macros get read in first.
 
 # wmlscope: set export=yes
+
+#ifndef MAIN_MENU
+{core/terrain-graphics/}
+#endif
 
 {core/macros/}
 {core/about.cfg}
 {core/help.cfg}
 {core/hotkeys.cfg}
 {core/terrain.cfg}
-{core/terrain-graphics/}
 {core/units.cfg}
 {core/editor/}
 

Modified: trunk/src/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=44663&r1=44662&r2=44663&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sun Jul 25 03:24:59 2010
@@ -594,6 +594,9 @@
 
        if (jump_to_editor_)
                cache_.add_define("EDITOR");
+
+       if (!multiplayer_mode_ && !test_mode_ && !jump_to_editor_)
+               cache_.add_define("MAIN_MENU");
 
        load_game_cfg(force);
 




Related Messages


Powered by MHonArc, Updated Sun Jul 25 03:40:13 2010