Skip to content

Commit

Permalink
Moved entity initiation out of handle.
Browse files Browse the repository at this point in the history
This was causing a crash
  • Loading branch information
Linus_Probert committed Nov 23, 2016
1 parent 8445a1e commit a856440
Show file tree
Hide file tree
Showing 17 changed files with 125 additions and 72 deletions.
2 changes: 1 addition & 1 deletion docs/_collision_detector_8cpp_source.html

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions docs/_entity_container_8cpp_source.html

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions docs/_entity_container_8h_source.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_flat_builder_8cpp_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<div class="ttc" id="_camera_8h_html"><div class="ttname"><a href="_camera_8h.html">Camera.h</a></div></div>
<div class="ttc" id="classflat2d_1_1_game_data_html"><div class="ttname"><a href="classflat2d_1_1_game_data.html">flat2d::GameData</a></div><div class="ttdef"><b>Definition:</b> <a href="_game_data_8h_source.html#l00018">GameData.h:18</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html"><div class="ttname"><a href="classflat2d_1_1_window.html">flat2d::Window</a></div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00014">Window.h:14</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_accd81a3fb5c715c2383a9c3a2ad09803"><div class="ttname"><a href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">flat2d::Window::getRenderer</a></div><div class="ttdeci">SDL_Renderer * getRenderer()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00048">Window.h:48</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_accd81a3fb5c715c2383a9c3a2ad09803"><div class="ttname"><a href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">flat2d::Window::getRenderer</a></div><div class="ttdeci">SDL_Renderer * getRenderer()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00052">Window.h:52</a></div></div>
<div class="ttc" id="_mixer_8h_html"><div class="ttname"><a href="_mixer_8h.html">Mixer.h</a></div></div>
<div class="ttc" id="classflat2d_1_1_camera_html"><div class="ttname"><a href="classflat2d_1_1_camera.html">flat2d::Camera</a></div><div class="ttdef"><b>Definition:</b> <a href="_camera_8h_source.html#l00016">Camera.h:16</a></div></div>
</div><!-- fragment --></div><!-- contents -->
Expand Down
9 changes: 5 additions & 4 deletions docs/_game_engine_8cpp_source.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_texture_8cpp_source.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/_window_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
<div class="title">Window.h</div> </div>
</div><!--header-->
<div class="contents">
<a href="_window_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="preprocessor">#ifndef WINDOW_H_</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="preprocessor">#define WINDOW_H_</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="preprocessor">#include &lt;SDL2/SDL.h&gt;</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="preprocessor">#include &lt;cstdio&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceflat2d.html">flat2d</a></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;{</div><div class="line"><a name="l00014"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html"> 14</a></span>&#160; <span class="keyword">class </span><a class="code" href="classflat2d_1_1_window.html">Window</a></div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160; {</div><div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; <span class="keyword">private</span>:</div><div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; std::string title;</div><div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160; <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> width, height;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160;</div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; SDL_Window* window;</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160; SDL_Renderer* renderer;</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160; <span class="keyword">public</span>:</div><div class="line"><a name="l00024"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a6c7094e51245ba3e84030f815bb6fddf"> 24</a></span>&#160; <a class="code" href="classflat2d_1_1_window.html#a6c7094e51245ba3e84030f815bb6fddf">Window</a>(std::string t, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> w, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> h) : title(t), width(w), height(h) { }</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160;</div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89"> 26</a></span>&#160; <a class="code" href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89">~Window</a>() {</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; SDL_DestroyWindow(window);</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160; window = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160; renderer = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160; }</div><div class="line"><a name="l00032"></a><span class="lineno"> 32</span>&#160;</div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160; <span class="keywordtype">bool</span> <a class="code" href="classflat2d_1_1_window.html#a47386bbb46b33be46a46734156a5ad5f">init</a>();</div><div class="line"><a name="l00037"></a><span class="lineno"> 37</span>&#160;</div><div class="line"><a name="l00042"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92"> 42</a></span>&#160; SDL_Window* <a class="code" href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92">getWindow</a>() { <span class="keywordflow">return</span> window; }</div><div class="line"><a name="l00043"></a><span class="lineno"> 43</span>&#160;</div><div class="line"><a name="l00048"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803"> 48</a></span>&#160; SDL_Renderer* <a class="code" href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">getRenderer</a>() { <span class="keywordflow">return</span> renderer; }</div><div class="line"><a name="l00049"></a><span class="lineno"> 49</span>&#160; };</div><div class="line"><a name="l00050"></a><span class="lineno"> 50</span>&#160;} <span class="comment">// namespace flat2d</span></div><div class="line"><a name="l00051"></a><span class="lineno"> 51</span>&#160;</div><div class="line"><a name="l00052"></a><span class="lineno"> 52</span>&#160;<span class="preprocessor">#endif // WINDOW_H_</span></div><div class="ttc" id="classflat2d_1_1_window_html_a44465fd313ce5e2257266c4105e32c89"><div class="ttname"><a href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89">flat2d::Window::~Window</a></div><div class="ttdeci">~Window()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00026">Window.h:26</a></div></div>
<a href="_window_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="preprocessor">#ifndef WINDOW_H_</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="preprocessor">#define WINDOW_H_</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="preprocessor">#include &lt;SDL2/SDL.h&gt;</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="preprocessor">#include &lt;cstdio&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceflat2d.html">flat2d</a></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;{</div><div class="line"><a name="l00014"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html"> 14</a></span>&#160; <span class="keyword">class </span><a class="code" href="classflat2d_1_1_window.html">Window</a></div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160; {</div><div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; <span class="keyword">private</span>:</div><div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; std::string title;</div><div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160; <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> width, height;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160;</div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; SDL_Window* window = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160; SDL_Renderer* renderer = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160; <span class="keyword">public</span>:</div><div class="line"><a name="l00024"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a6c7094e51245ba3e84030f815bb6fddf"> 24</a></span>&#160; <a class="code" href="classflat2d_1_1_window.html#a6c7094e51245ba3e84030f815bb6fddf">Window</a>(std::string t, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> w, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> h) : title(t), width(w), height(h) { }</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160;</div><div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89"> 26</a></span>&#160; <a class="code" href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89">~Window</a>() {</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; <span class="keywordflow">if</span> (window) {</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; SDL_DestroyWindow(window);</div><div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160; window = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160; }</div><div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160; <span class="keywordflow">if</span> (renderer) {</div><div class="line"><a name="l00032"></a><span class="lineno"> 32</span>&#160; SDL_DestroyRenderer(renderer);</div><div class="line"><a name="l00033"></a><span class="lineno"> 33</span>&#160; renderer = <span class="keyword">nullptr</span>;</div><div class="line"><a name="l00034"></a><span class="lineno"> 34</span>&#160; }</div><div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; }</div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno"> 40</span>&#160; <span class="keywordtype">bool</span> <a class="code" href="classflat2d_1_1_window.html#a47386bbb46b33be46a46734156a5ad5f">init</a>();</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160;</div><div class="line"><a name="l00046"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92"> 46</a></span>&#160; SDL_Window* <a class="code" href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92">getWindow</a>() { <span class="keywordflow">return</span> window; }</div><div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160;</div><div class="line"><a name="l00052"></a><span class="lineno"><a class="line" href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803"> 52</a></span>&#160; SDL_Renderer* <a class="code" href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">getRenderer</a>() { <span class="keywordflow">return</span> renderer; }</div><div class="line"><a name="l00053"></a><span class="lineno"> 53</span>&#160; };</div><div class="line"><a name="l00054"></a><span class="lineno"> 54</span>&#160;} <span class="comment">// namespace flat2d</span></div><div class="line"><a name="l00055"></a><span class="lineno"> 55</span>&#160;</div><div class="line"><a name="l00056"></a><span class="lineno"> 56</span>&#160;<span class="preprocessor">#endif // WINDOW_H_</span></div><div class="ttc" id="classflat2d_1_1_window_html_a44465fd313ce5e2257266c4105e32c89"><div class="ttname"><a href="classflat2d_1_1_window.html#a44465fd313ce5e2257266c4105e32c89">flat2d::Window::~Window</a></div><div class="ttdeci">~Window()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00026">Window.h:26</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_a47386bbb46b33be46a46734156a5ad5f"><div class="ttname"><a href="classflat2d_1_1_window.html#a47386bbb46b33be46a46734156a5ad5f">flat2d::Window::init</a></div><div class="ttdeci">bool init()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8cpp_source.html#l00007">Window.cpp:7</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_a183145e91dc3b4a4f72a5dde7db0df92"><div class="ttname"><a href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92">flat2d::Window::getWindow</a></div><div class="ttdeci">SDL_Window * getWindow()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00042">Window.h:42</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_a183145e91dc3b4a4f72a5dde7db0df92"><div class="ttname"><a href="classflat2d_1_1_window.html#a183145e91dc3b4a4f72a5dde7db0df92">flat2d::Window::getWindow</a></div><div class="ttdeci">SDL_Window * getWindow()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00046">Window.h:46</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_a6c7094e51245ba3e84030f815bb6fddf"><div class="ttname"><a href="classflat2d_1_1_window.html#a6c7094e51245ba3e84030f815bb6fddf">flat2d::Window::Window</a></div><div class="ttdeci">Window(std::string t, unsigned int w, unsigned int h)</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00024">Window.h:24</a></div></div>
<div class="ttc" id="namespaceflat2d_html"><div class="ttname"><a href="namespaceflat2d.html">flat2d</a></div><div class="ttdef"><b>Definition:</b> <a href="_algorithm_8h_source.html#l00007">Algorithm.h:7</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html"><div class="ttname"><a href="classflat2d_1_1_window.html">flat2d::Window</a></div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00014">Window.h:14</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_accd81a3fb5c715c2383a9c3a2ad09803"><div class="ttname"><a href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">flat2d::Window::getRenderer</a></div><div class="ttdeci">SDL_Renderer * getRenderer()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00048">Window.h:48</a></div></div>
<div class="ttc" id="classflat2d_1_1_window_html_accd81a3fb5c715c2383a9c3a2ad09803"><div class="ttname"><a href="classflat2d_1_1_window.html#accd81a3fb5c715c2383a9c3a2ad09803">flat2d::Window::getRenderer</a></div><div class="ttdeci">SDL_Renderer * getRenderer()</div><div class="ttdef"><b>Definition:</b> <a href="_window_8h_source.html#l00052">Window.h:52</a></div></div>
</div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
Loading

0 comments on commit a856440

Please sign in to comment.