mail[Wesnoth-commits] r13964 - /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 elias on October 14, 2006 - 12:18:
Author: elias
Date: Sat Oct 14 12:18:11 2006
New Revision: 13964

URL: http://svn.gna.org/viewcvs/wesnoth?rev=13964&view=rev
Log:
Merged revision 13960.

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=13964&r1=13963&r2=13964&view=diff
==============================================================================
--- branches/1.2/src/game.cpp (original)
+++ branches/1.2/src/game.cpp Sat Oct 14 12:18:11 2006
@@ -808,6 +808,9 @@
                defines_map_.clear();
                defines_map_[difficulties[res]] = preproc_define();
        }
+#ifdef HAVE_PYTHON
+       defines_map_["PYTHON"] = preproc_define();
+#endif
 
        state_.campaign_define = campaign["define"];
 
@@ -1287,7 +1290,7 @@
 {
        log_scope("read_game_cfg");
 
-       if(defines.size() < 4) {
+       if(defines.size() < 5) {
                bool is_valid = true;
                std::stringstream str;
                str << "-v" << game_config::version;




Related Messages


Powered by MHonArc, Updated Sat Oct 14 17:20:16 2006