feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -15,11 +15,10 @@ LookControl::LookControl(Mob *mob)
|
||||
|
||||
void LookControl::setLookAt(shared_ptr<Entity> target, float yMax, float xMax)
|
||||
{
|
||||
this->wantedX = target->x;
|
||||
shared_ptr<Mob> targetMob = dynamic_pointer_cast<Mob>(target);
|
||||
if (targetMob != NULL) this->wantedY = target->y + targetMob->getHeadHeight();
|
||||
else this->wantedY = (target->bb->y0 + target->bb->y1) / 2;
|
||||
this->wantedZ = target->z;
|
||||
wantedX = target->x;
|
||||
if ( target->instanceof(eTYPE_LIVINGENTITY) ) wantedY = target->y + dynamic_pointer_cast<LivingEntity>(target)->getHeadHeight();
|
||||
else wantedY = (target->bb->y0 + target->bb->y1) / 2;
|
||||
wantedZ = target->z;
|
||||
this->yMax = yMax;
|
||||
this->xMax = xMax;
|
||||
hasWanted = true;
|
||||
@@ -27,9 +26,9 @@ void LookControl::setLookAt(shared_ptr<Entity> target, float yMax, float xMax)
|
||||
|
||||
void LookControl::setLookAt(double x, double y, double z, float yMax, float xMax)
|
||||
{
|
||||
this->wantedX = x;
|
||||
this->wantedY = y;
|
||||
this->wantedZ = z;
|
||||
wantedX = x;
|
||||
wantedY = y;
|
||||
wantedZ = z;
|
||||
this->yMax = yMax;
|
||||
this->xMax = xMax;
|
||||
hasWanted = true;
|
||||
|
||||
Reference in New Issue
Block a user