editor: fixed compilation, but crashes on start up

boost::scoped_ptr<ParserData> data; in EditorParser would halt compilation because it is non-copyable
JanSimek · Feb 5, 2014 · dac4bd2 · vayerx · Feb 5, 2014 · vayerx
1 parent f7f01de
commit dac4bd2
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 27 deletions.
diff --git a/editor/explosion_scripts.cpp b/editor/explosion_scripts.cpp
@@ -98,12 +98,12 @@ namespace frozenbyte {
 
             void reload()
             {
-                Parser sParser(true, false);
-                Parser pParser(true, false);
-                Parser eParser(true, false);
-                Parser soParser(true, false);
-                Parser mParser(true, false);
-                Parser aParser(true, false);
+                EditorParser sParser(true, false);
+                EditorParser pParser(true, false);
+                EditorParser eParser(true, false);
+                EditorParser soParser(true, false);
+                EditorParser mParser(true, false);
+                EditorParser aParser(true, false);
                 //ifstream("Editor/ExplosionScripts.fbt") >> sParser;
                 //ifstream("Editor/ExplosionProjectiles.fbt") >> pParser;
                 //ifstream("Editor/ExplosionEffects.fbt") >> eParser;

diff --git a/editor/exporter_scene.cpp b/editor/exporter_scene.cpp
@@ -8,9 +8,9 @@
 #include "../filesystem/output_file_stream.h"
 #include <map>
 
-#ifdef _MSC_EXTENSIONS
-#  define for if (false) { } else { for
-#endif
+//#ifdef _MSC_EXTENSIONS
+//#  define for if (false) { } else { for
+//#endif
 
 namespace frozenbyte {
     namespace editor {

diff --git a/editor/group_list.cpp b/editor/group_list.cpp
@@ -55,7 +55,7 @@ namespace frozenbyte {
 
             void load(const string &name)
             {
-                Parser parser(true, false);
+                EditorParser parser(true, false);
                 //ifstream(name.c_str()) >> parser;
                 filesystem::FilePackageManager::getInstance().getFile(name) >> parser;
 
@@ -276,7 +276,7 @@ namespace frozenbyte {
 
         void GroupList::addObjectGroup(const string &group, const string &subgroup, const ObjectGroup &objectGroup)
         {
-            Parser parser(true, false);
+            EditorParser parser(true, false);
             ParserGroup &root = parser.getGlobals();
             root.setValue("group", group);
             root.setValue("subgroup", subgroup);

diff --git a/editor/object_mode.cpp b/editor/object_mode.cpp
@@ -16,8 +16,10 @@
 #include "icommand.h"
 #include "command_list.h"
 #include "common_dialog.h"
-#include "istream.h"
-#include "ostream.h"
+
+//#include "istream.h"
+//#include "ostream.h"
+
 #include "object_settings.h"
 #include "ieditor_state.h"
 #include "color_picker.h"

diff --git a/editor/object_settings.cpp b/editor/object_settings.cpp
@@ -34,7 +34,7 @@ namespace frozenbyte {
             typedef std::map<std::string, std::string> ValueMap;
             ValueMap defaultValues;
 
-            Parser   parser;
+            EditorParser   parser;
             Storm   &storm;
 
             ObjectSettingsData(Storm &storm_)

diff --git a/editor/parser.cpp b/editor/parser.cpp
@@ -316,13 +316,13 @@ namespace frozenbyte {
 
         ParserGroup::ParserGroup()
         {
-            boost::scoped_ptr<ParserGroupData> tempData( new ParserGroupData() );
+            /*boost::scoped_ptr*/ boost::shared_ptr<ParserGroupData> tempData( new ParserGroupData() );
             data.swap(tempData);
         }
 
         ParserGroup::ParserGroup(const ParserGroup &rhs)
         {
-            boost::scoped_ptr<ParserGroupData> tempData( new ParserGroupData() );
+            /*boost::scoped_ptr*/ boost::shared_ptr<ParserGroupData> tempData( new ParserGroupData() );
             tempData->copy( *rhs.data.get() );
 
             data.swap(tempData);
@@ -541,7 +541,7 @@ namespace frozenbyte {
 
         EditorParser::EditorParser(bool logUnreferenced, bool logNonExisting)
         {
-            boost::scoped_ptr<ParserData> tempData( new ParserData() );
+            /*boost::scoped_ptr*/ boost::shared_ptr<ParserData> tempData( new ParserData() );
             data.swap(tempData);
             data->logUnreferenced = logUnreferenced;
             data->logNonExisting = logNonExisting;

diff --git a/editor/parser.h b/editor/parser.h
@@ -3,6 +3,10 @@
 #ifndef INCLUDED_EDITOR_EDITOR_PARSER
 #define INCLUDED_EDITOR_EDITOR_PARSER
 
+#ifndef INCLUDED_BOOST_SHARED_PTR_HPP
+#  define INCLUDED_BOOST_SHARED_PTR_HPP
+#  include <boost/shared_ptr.hpp>
+#endif
 #ifndef INCLUDED_BOOST_SCOPED_PTR_HPP
 #  define INCLUDED_BOOST_SCOPED_PTR_HPP
 #  include <boost/scoped_ptr.hpp>
@@ -27,7 +31,7 @@ namespace frozenbyte {
         struct ParserData;
 
         class ParserGroup {
-            boost::scoped_ptr<ParserGroupData> data;
+            /*boost::scoped_ptr*/ boost::shared_ptr<ParserGroupData> data;
 
         public:
             ParserGroup();
@@ -74,7 +78,7 @@ namespace frozenbyte {
         }
 
         class EditorParser {
-            boost::scoped_ptr<ParserData> data;
+            /*boost::scoped_ptr*/ boost::shared_ptr<ParserData> data;
 
         public:
             // the new error whine to get rid of the f*ed up "silently ignore errors" feature. --jpk

diff --git a/editor/physics_mass.cpp b/editor/physics_mass.cpp
@@ -42,7 +42,7 @@ namespace frozenbyte {
 
             void parseData()
             {
-                Parser parser;
+                EditorParser parser;
                 filesystem::FilePackageManager::getInstance().getFile(fileName) >> parser;
 
                 const ParserGroup &globals = parser.getGlobals();

diff --git a/editor/storm.cpp b/editor/storm.cpp
@@ -78,7 +78,7 @@ namespace frozenbyte {
     float ts = .7f;
     storm->addAdditionalRenderTargets(VC2(ts, ts), 1);
  */
-            if ( !storm->SetWindowedMode(hwnd, disableBuffers) ) {
+            if ( !storm->SetWindowedMode(hwnd) { //, disableBuffers) ) {
                 std::string error = storm->GetErrorString();
                 MessageBox(hwnd, error.c_str(), "Failed to initialize storm.", MB_OK);
 

diff --git a/editor/unit_scripts.cpp b/editor/unit_scripts.cpp
@@ -246,17 +246,17 @@ namespace frozenbyte {
             std::vector<ScriptConfig> scriptConfigs;
             std::map<std::string, std::vector<Script> > scripts;
 
-            void parseUnits(const Parser &parser)
+            void parseUnits(const EditorParser &parser)
             {
                 parseBlocks(parser.getGlobals(), units, "Unit");
             }
 
-            void parseConfigs(const Parser &parser)
+            void parseConfigs(const EditorParser &parser)
             {
                 parseBlocks(parser.getGlobals(), scriptConfigs, "Config");
             }
 
-            void parseScripts(const Parser &parser)
+            void parseScripts(const EditorParser &parser)
             {
                 const ParserGroup &parserGroup = parser.getGlobals();
 
@@ -277,9 +277,9 @@ namespace frozenbyte {
                 scripts.clear();
                 scriptConfigs.clear();
 
-                Parser unitParser(true, false);
-                Parser configParser(true, false);
-                Parser scriptParser(true, false);
+                EditorParser unitParser(true, false);
+                EditorParser configParser(true, false);
+                EditorParser scriptParser(true, false);
 
                 //std::ifstream(unitName) >> unitParser;
                 //std::ifstream(configName) >> configParser;