Do not try to get search path every time

SuperTux · Feb 2, 2014 · 3ac835b · 3ac835b
1 parent 394d459
commit 3ac835b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp
@@ -36,7 +36,8 @@ Parser::Parser(bool translate) :
   dictionary_manager(0), 
   dictionary(0),
   token(),
-  obst()
+  obst(),
+  searchpath()
 {
   if(translate) {
     dictionary_manager = new tinygettext::DictionaryManager();
@@ -46,13 +47,15 @@ Parser::Parser(bool translate) :
   }
 
   obstack_init(&obst);
+  searchpath = PHYSFS_getSearchPath();
 }
 
 Parser::~Parser()
 {
   obstack_free(&obst, NULL);
   delete lexer;
   delete dictionary_manager;
+  delete searchpath;
 }
 
 static std::string dirname(const std::string& filename)
@@ -78,7 +81,6 @@ Parser::parse(const std::string& filename)
 
   if(dictionary_manager) {
     std::string rel_dir = dirname (filename);
-    char **searchpath = PHYSFS_getSearchPath();
     for(char** i = searchpath; *i != NULL; i++)
     {
       std::string abs_dir = std::string (*i) + PHYSFS_getDirSeparator () + rel_dir;

diff --git a/src/lisp/parser.hpp b/src/lisp/parser.hpp
@@ -60,6 +60,7 @@ class Parser
   tinygettext::DictionaryManager* dictionary_manager;
   tinygettext::Dictionary* dictionary;
   Lexer::TokenType token;
+  char** searchpath;
 
   struct obstack obst;