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 97a43994725008e35fceb984d5549df9c8cea470. * 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:
@@ -5,7 +5,7 @@
|
||||
|
||||
HitResult::HitResult(int x, int y, int z, int f, Vec3 *pos)
|
||||
{
|
||||
this->type = TILE;
|
||||
type = TILE;
|
||||
this->x = x;
|
||||
this->y = y;
|
||||
this->z = z;
|
||||
@@ -17,7 +17,7 @@ HitResult::HitResult(int x, int y, int z, int f, Vec3 *pos)
|
||||
|
||||
HitResult::HitResult(shared_ptr<Entity> entity)
|
||||
{
|
||||
this->type = ENTITY;
|
||||
type = ENTITY;
|
||||
this->entity = entity;
|
||||
pos = Vec3::newTemp(entity->x, entity->y, entity->z);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user