Index: /code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- /code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (revision 12369)
+++ /code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (revision 12370)
@@ -7,5 +7,5 @@
@@ -72,12 +86,7 @@
boostfactor = 2.2
+
defEngineSndNormal = "sounds/Engine_low.ogg"
defEngineSndBoost = "sounds/Engine_high.ogg"
-
- accelerationfront = 700
- accelerationbrake = 700
- accelerationback = 700
- accelerationleftright = 500
- accelerationupdown = 500
>
Index: /code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo
===================================================================
--- /code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (revision 12369)
+++ /code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (revision 12370)
@@ -21,4 +21,19 @@
/>
+
+
+
+
+
+
Index: /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (revision 12369)
+++ /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (revision 12370)
@@ -173,5 +173,5 @@
// Set variable to temporarily force the player to spawn.
//bool temp = this->bForceSpawn_;
- this->bForceSpawn_ = true;
+ this->bForceSpawn_ = false;
// Call start for the parent class.
@@ -307,5 +307,5 @@
if((BallPosition.x - Ball->getRadius() >= StonePosition.x - size && BallPosition.x + Ball->getRadius() <= StonePosition.x + size) &&
(BallPosition.z - Ball->getRadius() >= StonePosition.z - size && BallPosition.z + Ball->getRadius() <= StonePosition.z + size)) {
- orxout() << "FOUND ONE" << endl;
+ //orxout() << "FOUND ONE" << endl;
return someStone;
}
Index: /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h
===================================================================
--- /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (revision 12369)
+++ /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (revision 12370)
@@ -90,5 +90,5 @@
{ return this->center_; }
OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
-
+ virtual void addBots(unsigned int amount) override{} //getPosition();
+ this->setPosition(pos);
+ }
+ void OrxoBloxShip::boost(bool bBoost)
+ {
}
- OrxoBlox* OrxoBloxShip::getGame()
- {
- if (game == nullptr)
- {
- for (OrxoBlox* race : ObjectList())
- {
- game = race;
- }
- }
- return game;
- }
- void OrxoBloxShip::death()
- {
- SpaceShip::death();
- }
}
Index: /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h
===================================================================
--- /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h (revision 12369)
+++ /code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h (revision 12370)
@@ -51,6 +51,8 @@
//no rotation in x and z direction!
- virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
+ //virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
+ //Yaw
virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction.
+ virtual void boost(bool boost) override; //Override, so that the ship does not shake
/*Functions that can be helpful while debugging.
@@ -68,5 +70,4 @@
protected:
- virtual void death() override;
private:
OrxoBlox* getGame();