fixing minor bugs, fixing velocity not changed after death, fixing server crash
This commit is contained in:
1 parent
84a5e888a0
commit
3e8dba36a4
4 files changed
+150
-9
No files matched your search
+18
-2
@@ -265,6 +265,7 @@ namespace ZL
|
||||
Environment::shipState.position = Vector3f{ 0, 0, 45000.f };
|
||||
Environment::shipState.velocity = 0.0f;
|
||||
Environment::shipState.selectedVelocity = 0;
|
||||
newShipVelocity = 0;
|
||||
Environment::shipState.rotation = Eigen::Matrix3f::Identity();
|
||||
Environment::inverseShipMatrix = Eigen::Matrix3f::Identity();
|
||||
Environment::zoom = DEFAULT_ZOOM;
|
||||
@@ -274,7 +275,21 @@ namespace ZL
|
||||
{
|
||||
menuManager.uiManager.findButton("minusButton")->state = ButtonState::Disabled;
|
||||
}
|
||||
|
||||
if (menuManager.uiManager.findButton("plusButton"))
|
||||
{
|
||||
menuManager.uiManager.findButton("plusButton")->state = ButtonState::Normal;
|
||||
}
|
||||
if (Environment::shipState.shipType == 0)
|
||||
{
|
||||
if (menuManager.uiManager.findButton("shootButton"))
|
||||
{
|
||||
menuManager.uiManager.findButton("shootButton")->state = ButtonState::Normal;
|
||||
}
|
||||
if (menuManager.uiManager.findButton("shootButton2"))
|
||||
{
|
||||
menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Space::setup() {
|
||||
@@ -1702,6 +1717,7 @@ namespace ZL
|
||||
gameOver = true;
|
||||
Environment::shipState.selectedVelocity = 0;
|
||||
Environment::shipState.velocity = 0.0f;
|
||||
newShipVelocity = 0;
|
||||
showExplosion = true;
|
||||
|
||||
explosionEmitter.setUseWorldSpace(true);
|
||||
@@ -1803,7 +1819,7 @@ namespace ZL
|
||||
}
|
||||
|
||||
bool canPickup = false;
|
||||
if (Environment::shipState.shipType == 1) {
|
||||
if (Environment::shipState.shipType == 1 && Environment::shipState.velocity < 0.1f) {
|
||||
for (size_t i = 0; i < boxCoordsArr.size(); ++i) {
|
||||
if (i >= boxAlive.size() || !boxAlive[i]) continue;
|
||||
Vector3f boxWorld = boxCoordsArr[i].pos + Vector3f{ 0.f, 0.f, 45000.f };
|
||||
|
||||
Reference in new issue
Block a user