Revision: 2693
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2693&view=rev
Author: rorthomas
Date: 2012-05-26 04:17:20 +0000 (Sat, 26 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/source/main/gameplay/CharacterFactory.cpp
trunk/source/main/gameplay/CharacterFactory.h
Modified: trunk/source/main/gameplay/CharacterFactory.cpp
===================================================================
--- trunk/source/main/gameplay/CharacterFactory.cpp 2012-05-26 04:14:16 UTC
(rev 2692)
+++ trunk/source/main/gameplay/CharacterFactory.cpp 2012-05-26 04:17:20 UTC
(rev 2693)
@@ -29,13 +29,13 @@
template<> CharacterFactory *StreamableFactory < CharacterFactory, Character
>::_instance = 0;
-CharacterFactory::CharacterFactory(Camera *cam, Network *net, Collisions *c,
HeightFinder *h, Water *w, MapControl *m, Ogre::SceneManager *scm) : cam(cam),
c(c), net(net), h(h), w(w), m(m), scm(scm)
+CharacterFactory::CharacterFactory()
{
}
Character *CharacterFactory::createLocal(int playerColour)
{
- Character *ch = new Character(cam, c, net, h, w, m, scm, -1, 0,
playerColour, false);
+ Character *ch = new Character(-1, 0, playerColour, false);
lockStreams();
std::map < int, std::map < unsigned int, Character *> > &streamables =
getStreams();
@@ -49,7 +49,7 @@
// NO LOCKS IN HERE, already locked
LOG(" new character for " + TOSTRING(reg->sourceid) + ":" +
TOSTRING(reg->streamid) + ", colour: " + TOSTRING(reg->colour));
- Character *ch = new Character(cam, c, net, h, w, m, scm, reg->sourceid,
reg->streamid, reg->colour, true);
+ Character *ch = new Character(reg->sourceid, reg->streamid,
reg->colour, true);
// already locked
//lockStreams();
Modified: trunk/source/main/gameplay/CharacterFactory.h
===================================================================
--- trunk/source/main/gameplay/CharacterFactory.h 2012-05-26 04:14:16 UTC
(rev 2692)
+++ trunk/source/main/gameplay/CharacterFactory.h 2012-05-26 04:17:20 UTC
(rev 2693)
@@ -34,27 +34,17 @@
public:
- CharacterFactory(Ogre::Camera *cam, Network *net, Collisions *c,
HeightFinder *h, Water *w, MapControl *m, Ogre::SceneManager *scm);
+ CharacterFactory();
~CharacterFactory();
Character *createLocal(int playerColour);
Character *createRemoteInstance(stream_reg_t *reg);
- void setNetwork(Network *net) { this->net = net; };
-
void updateCharacters(float dt);
void updateLabels();
protected:
- Collisions *c;
- HeightFinder *h;
- MapControl *m;
- Network *net;
- Ogre::Camera *cam;
- Ogre::SceneManager *scm;
- Water *w;
-
// functions used by friends
void netUserAttributesChanged(int source, int streamid);
void localUserAttributesChanged(int newid);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
