Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 167 vs 168 for /trunk/Source Code/Scenes/WarScene/Headers/WarScene.h

Diff revisions: vs.
  @@ -34,15 +34,15 @@
34 34 WarScene() : Scene(),
35 35 _groundPlaceholder(NULL),
36 36 _faction1(NULL),
37 - _faction2(NULL){
37 + _faction2(NULL)
38 + {
38 39 _scorTeam1 = 0;
39 40 _scorTeam2 = 0;
40 - _mousePressed = false;
41 41 }
42 42
43 43 void preRender();
44 44
45 - bool load(const std::string& name);
45 + bool load(const std::string& name, CameraManager* const cameraMgr);
46 46 bool loadResources(bool continueOnErrors);
47 47 bool initializeAI(bool continueOnErrors);
48 48 bool deinitializeAI(bool continueOnErrors);
  @@ -51,7 +51,7 @@
51 51 void onKeyDown(const OIS::KeyEvent& key);
52 52 void onKeyUp(const OIS::KeyEvent& key);
53 53 void onMouseMove(const OIS::MouseEvent& key);
54 - void onMouseClickDown(const OIS::MouseEvent& key,OIS::MouseButtonID button);
54 + void onMouseClickDown(const OIS::MouseEvent& key, OIS::MouseButtonID button);
55 55 void onMouseClickUp(const OIS::MouseEvent& key,OIS::MouseButtonID button);
56 56
57 57 private:
  @@ -63,8 +63,6 @@
63 63 I8 _score;
64 64 vec4<F32> _sunvector;
65 65 SceneGraphNode* _groundPlaceholder;
66 - vec2<F32> _prevMouse;
67 - bool _mousePressed;
68 66
69 67 private: //Joc
70 68 I8 _scorTeam1;