mail[Wesnoth-commits] r14006 - /branches/1.2/src/game.cpp


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

Header


Content

Posted by rusty on October 18, 2006 - 13:44:
Author: rusty
Date: Wed Oct 18 13:43:48 2006
New Revision: 14006

URL: http://svn.gna.org/viewcvs/wesnoth?rev=14006&view=rev
Log:
Fix bug 7395: Help from main screen gives terrain table titles, no entries.
When Boucman introduced help from main screen, he didn't realize map could be 
NULL, so handed a dummy map.  NULL is handled specially in code by not 
drawing terrain table at all for units.

Modified:
    branches/1.2/src/game.cpp

Modified: branches/1.2/src/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/game.cpp?rev=14006&r1=14005&r2=14006&view=diff
==============================================================================
--- branches/1.2/src/game.cpp (original)
+++ branches/1.2/src/game.cpp Wed Oct 18 13:43:48 2006
@@ -1810,9 +1810,7 @@
                        about::show_about(game.disp());
                        continue;
                } else if(res == gui::SHOW_HELP) {
-                       config dummy_help_cfg;
-                       gamemap dummy_help_map(dummy_help_cfg, "1");
-                       help::help_manager help_manager(&game.game_config(), 
&game.units_data(), &dummy_help_map);
+                       help::help_manager help_manager(&game.game_config(), 
&game.units_data(), NULL);
                        help::show_help(game.disp());
                        continue;
                } else if(res == gui::GET_ADDONS) {




Related Messages


Powered by MHonArc, Updated Wed Oct 18 21:00:21 2006