Bug fixing
This commit is contained in:
1 parent
c6bd5385e3
commit
2195542974
3 files changed
+80
-13
No files matched your search
+3
-2
@@ -144,7 +144,8 @@ namespace ZL
|
||||
|
||||
std::cout << "Load resurces step 4" << std::endl;
|
||||
|
||||
currentLocation = std::make_unique<Location>(renderer, inventory, "default");
|
||||
//currentLocation = std::make_unique<Location>(renderer, inventory, "default");
|
||||
currentLocation = std::make_unique<Location>(renderer, inventory, "forest");
|
||||
|
||||
currentLocation->setup();
|
||||
|
||||
@@ -513,7 +514,7 @@ namespace ZL
|
||||
break;
|
||||
}
|
||||
case SDLK_f:
|
||||
currentLocation->dialogueSystem.startDialogue("driving_dialogue1");
|
||||
currentLocation->dialogueSystem.startDialogue("dialogue_gas1");
|
||||
break;
|
||||
|
||||
case SDLK_e:
|
||||
|
||||
+3
-3
@@ -1209,7 +1209,7 @@ void Location::setup()
|
||||
}
|
||||
else {
|
||||
|
||||
if (x > 0.5)
|
||||
//if (x > 0.5)
|
||||
{
|
||||
target = carPosition;
|
||||
Eigen::Vector3f toTarget = target - npcCar.position;
|
||||
@@ -1235,10 +1235,10 @@ void Location::setup()
|
||||
}
|
||||
hasTarget = dist > 0.5f;
|
||||
}
|
||||
else
|
||||
/*else
|
||||
{
|
||||
throttle = 0.f;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
float targetHeading = npcCar.rotation;
|
||||
|
||||
Reference in new issue
Block a user