Context Navigation

Changeset 6408 in orxonox.OLD

Timestamp:

Jan 4, 2006, 3:53:49 PM (18 years ago)

Author:

patrick

Message:

network: MultiPlayerWorld does load again

Location:

branches/network/src/story_entities

Files:

r6407	r6408
89	89
90	90	this->path = NULL;
91
92		~~//this->dataTank = new GameWorldData();~~
93	91	}
94	92
…	…
101	99	GameWorld::~GameWorld ()
102	100	{
103		if( this->dataTank)
104		delete this->dataTank;
105
106		PRINTF(0)("Deleted GameWorld\n");
	101	PRINTF(4)("Deleted GameWorld\n");
107	102	}
108	103

r6404	r6408
34	34	this->setClassID(CL_MULTI_PLAYER_WORLD, "MultiPlayerWorld");
35	35
36		this->multiPlayerWorldData = new MultiPlayerWorldData();
	36	this->dataTank = new MultiPlayerWorldData();
	37
37	38	this->loadParams(root);
38	39	}
…	…
48	49	{
49	50	PRINTF(3)("MultiPlayerWorld::~MultiPlayerWorld() - deleting current world\n");
50		if( this->~~multiPlayerWorldData~~)
51		delete this->~~multiPlayerWorldData~~;
	51	if( this->dataTank)
	52	delete this->dataTank;
52	53	}
53	54

-                      r6404
+                      r6408
   void loadParams(const TiXmlElement* root);
-  private:
-    MultiPlayerWorldData*    multiPlayerWorldData;    //!< reference to the datatank
 };

r6404	r6408
6	6	#ifndef _MULTI_PLAYER_WORLD_DATA_H
7	7	#define _MULTI_PLAYER_WORLD_DATA_H
	8
8	9
9	10	#include "game_world_data.h"

r6407	r6408
57	57	{
58	58	PRINTF(3)("SinglePlayerWorld::~SinglePlayerWorld() - deleting current world\n");
	59
	60	if( this->dataTank)
	61	delete this->dataTank;
59	62	}
60	63

-                      r6407
+                      r6408
 #define _SINGLE_PLAYER_WORLD_DATA_H
 #include "game_world_data.h"
 class TiXmlElement;
 //! The singleplayer world data

Note: See TracChangeset for help on using the changeset viewer.