Skip to content

Implement: SpiderWeb module #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackorobot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Implement: SpiderWeb module #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b49b10d
Implement: SpiderWeb module
jackorobot Apr 10, 2024
0a3d027
Fixed logic SpiderWeb_GetAngle to correctly check for both adjecent w…
jackorobot Apr 10, 2024
0fa0b0c
Added missing Collission check
jackorobot Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 193 additions & 13 deletions src/openlrr/game/world/SpiderWeb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
//

#include "SpiderWeb.h"
#include "Map3D.h"
#include "../object/Object.h"
#include "../Game.h"
#include "../../engine/gfx/Containers.h"
#include "../../engine/core/Maths.h"


/**********************************************************************************
Expand All @@ -10,8 +15,8 @@

#pragma region Globals

// <LegoRR.exe @005530e8>
LegoRR::SpiderWeb_Globs & LegoRR::spiderwebGlobs = *(LegoRR::SpiderWeb_Globs*)0x005530e8;
// <LegoRR.exe @005530e8>
LegoRR::SpiderWeb_Globs& LegoRR::spiderwebGlobs = *(LegoRR::SpiderWeb_Globs*)0x005530e8;

#pragma endregion

Expand All @@ -21,34 +26,209 @@ LegoRR::SpiderWeb_Globs & LegoRR::spiderwebGlobs = *(LegoRR::SpiderWeb_Globs*)0x

#pragma region Functions

// <LegoRR.exe @00466480>
//void __cdecl LegoRR::SpiderWeb_Initialise(Lego_Level* level);
// <LegoRR.exe @00466480>
void __cdecl LegoRR::SpiderWeb_Initialise(Lego_Level* level)
{
uint32 const gridSize = level->width * level->height * sizeof(SpiderWeb_Block);

spiderwebGlobs.webBlocks = reinterpret_cast<SpiderWeb_Block *>(Gods98::Mem_Alloc(gridSize));
if (spiderwebGlobs.webBlocks != nullptr)
{
std::memset(spiderwebGlobs.webBlocks, 0, gridSize);
}

spiderwebGlobs.level = level;
}

// <LegoRR.exe @004664d0>
//void __cdecl LegoRR::SpiderWeb_Shutdown(void);
void __cdecl LegoRR::SpiderWeb_Shutdown(void)
{
if (spiderwebGlobs.webBlocks != nullptr)
{
Gods98::Mem_Free(spiderwebGlobs.webBlocks);
spiderwebGlobs.webBlocks = nullptr;
}
}

// <LegoRR.exe @004664f0>
//void __cdecl LegoRR::SpiderWeb_Restart(Lego_Level* level);
void __cdecl LegoRR::SpiderWeb_Restart(Lego_Level* level)
{
SpiderWeb_Shutdown();
SpiderWeb_Initialise(level);
}

// <LegoRR.exe @00466510>
//bool32 __cdecl LegoRR::SpiderWeb_SpawnAt(uint32 bx, uint32 by);
bool32 __cdecl LegoRR::SpiderWeb_SpawnAt(uint32 bx, uint32 by)
{
// Check if there is already an web block active on this location, if so immediately return false
SpiderWeb_Block& webBlock = spiderwebBlockValue(bx, by);
if (hasFlagValue(webBlock.flags, SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE))
{
return FALSE;
}

// Get the angle of the spiderweb, if no success return false
real32 theta {};
if (!SpiderWeb_GetAngle(bx, by, &theta))
{
return FALSE;
}

// Get the world position
real32 xPos {}, yPos {};
Map3D_BlockToWorldPos(spiderwebGlobs.level->map, bx, by, &xPos, &yPos);

// Create the spiderweb object and set its properties
LegoObject* webObj = LegoObject_CreateInWorld(legoGlobs.contSpiderWeb, LegoObject_Type::LegoObject_SpiderWeb, static_cast<LegoObject_ID>(0), 0, xPos, yPos, theta);
SpiderWeb_Add(bx, by, webObj);
setFlagValue(webBlock.object->flags1, LiveFlags1::LIVEOBJ1_EXPANDING, true);
Gods98::Container_SetActivity(webBlock.object->other, "Expand");
Gods98::Container_SetAnimationTime(webBlock.object->other, 0.0f);
return TRUE;
}

// <LegoRR.exe @00466640>
//void __cdecl LegoRR::SpiderWeb_Add(sint32 bx, sint32 by, LegoObject* webObj);
void __cdecl LegoRR::SpiderWeb_Add(sint32 bx, sint32 by, LegoObject* webObj)
{
SpiderWeb_Block& webBlock = spiderwebBlockValue(bx, by);
webBlock.object = webObj;
setFlagValue(webBlock.flags, SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE, true);
webBlock.health = 100.0;
}

// <LegoRR.exe @004666b0>
//bool32 __cdecl LegoRR::SpiderWeb_GetAngle(sint32 bx, sint32 by, OUT real32* theta);
bool32 __cdecl LegoRR::SpiderWeb_GetAngle(sint32 bx, sint32 by, OUT real32* theta)
{
// If the block is not floor, then immediatly return false
if (!hasFlagValue(blockValue(spiderwebGlobs.level, bx, by).flags1, BlockFlags1::BLOCK1_FLOOR))
{
return FALSE;
}

// If there are walls in both x direction, return 90 degrees rotation (PI/2)
if (hasFlagValue(blockValue(spiderwebGlobs.level, bx + 1, by).flags1, BlockFlags1::BLOCK1_WALL) &&
hasFlagValue(blockValue(spiderwebGlobs.level, bx - 1, by).flags1, BlockFlags1::BLOCK1_WALL))
{
if (theta != nullptr)
{
*theta = M_PI/2;
}
return TRUE;
}

// If there are walls in both y direction, return 0 degrees rotation
if (hasFlagValue(blockValue(spiderwebGlobs.level, bx, by + 1).flags1, BlockFlags1::BLOCK1_WALL) &&
hasFlagValue(blockValue(spiderwebGlobs.level, bx, by - 1).flags1, BlockFlags1::BLOCK1_WALL))
{
if (theta != nullptr)
{
*theta = 0.0f;
}
return TRUE;
}

// No adjecent walls, so cannot determine angle
return FALSE;
}

// <LegoRR.exe @00466750>
//bool32 __cdecl LegoRR::SpiderWeb_CheckCollision(LegoObject* liveObj);
bool32 __cdecl LegoRR::SpiderWeb_CheckCollision(LegoObject* liveObj)
{
// Get the block position if not possible return false immediately
sint32 bx {}, by {};
if (!LegoObject_GetBlockPos(liveObj, &bx, &by))
{
return FALSE;
}

// Get the webBlock and check if it is active
SpiderWeb_Block& webBlock = spiderwebBlockValue(bx, by);
if (!hasFlagValue(webBlock.flags, SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE))
{
return FALSE;
}

// Get the world position
Point2F position {};
Map3D_BlockToWorldPos(spiderwebGlobs.level->map, bx, by, &position.x, &position.y);

// Get the faced direction
Point2F direction {};
LegoObject_GetFaceDirection(webBlock.object, &direction);

// Check for collission and apply flags
if (Weapon_LegoObject_Collision_FUN_00470520(liveObj, &position, &direction, FALSE))
{
setFlagValue(liveObj->flags1, LiveFlags1::LIVEOBJ1_CAUGHTINWEB, true);
setFlagValue(webBlock.object->flags1, LiveFlags1::LIVEOBJ1_CAUGHTINWEB, true);
return TRUE;
}

// No collision
return FALSE;
}

// <LegoRR.exe @00466880>
//bool32 __cdecl LegoRR::SpiderWeb_Update(real32 elapsedGame);
bool32 __cdecl LegoRR::SpiderWeb_Update(real32 elapsedGame)
{
return LegoObject_RunThroughListsSkipUpgradeParts(reinterpret_cast<LegoObject_RunThroughListsCallback>(SpiderWeb_LiveObjectCallback), &elapsedGame);
}

// <LegoRR.exe @004668a0>
//bool32 __cdecl LegoRR::SpiderWeb_LiveObjectCallback(LegoObject* liveObj, real32* pElapsedGame);
bool32 __cdecl LegoRR::SpiderWeb_LiveObjectCallback(LegoObject* liveObj, real32* pElapsedGame)
{
// Process SpiderWeb objects
if (liveObj->type == LegoObject_Type::LegoObject_SpiderWeb)
{
// Remove active SpiderWebs that have no more walls next to them (SpiderWeb_GetAndle returns false)
sint32 bx {}, by {};
LegoObject_GetBlockPos(liveObj, &bx, &by);
if ((spiderwebBlockValue(bx, by).flags & SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE)
&& !SpiderWeb_GetAngle(bx, by, nullptr))
{
SpiderWeb_Remove(bx, by);
}
return FALSE;
}

// Process objects already caught in web
if (hasFlagValue(liveObj->flags1, LiveFlags1::LIVEOBJ1_CAUGHTINWEB))
{
// If the SpiderWeb is active, we damage it
sint32 bx {}, by {};
LegoObject_GetBlockPos(liveObj, &bx, &by);
SpiderWeb_Block& webBlock = spiderwebBlockValue(bx, by);
if (!hasFlagValue(webBlock.flags, SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE))
{
return FALSE;
}

uint32 const weaponID = Weapon_GetWeaponIDByName("SpiderWeb");
real32 const damage = Weapon_GetDamageForObject(weaponID, liveObj);
webBlock.health -= (damage * *pElapsedGame);

// If the SpiderWeb has negative health, we remove it and the object is no longer caught in a web
if (webBlock.health < 0.0f)
{
SpiderWeb_Remove(bx, by);
setFlagValue(liveObj->flags1, LiveFlags1::LIVEOBJ1_CAUGHTINWEB, false);
}
return FALSE;
}

// Check whether the object collides with a spider web and make it caught
SpiderWeb_CheckCollision(liveObj);

return FALSE;
}

// <LegoRR.exe @00466a10>
//void __cdecl LegoRR::SpiderWeb_Remove(sint32 bx, sint32 by);
void __cdecl LegoRR::SpiderWeb_Remove(sint32 bx, sint32 by)
{
SpiderWeb_Block& webBlock = spiderwebBlockValue(bx, by);
setFlagValue(webBlock.object->flags3, LiveFlags3::LIVEOBJ3_REMOVING, true);
setFlagValue(webBlock.object->flags1, LiveFlags1::LIVEOBJ1_CAUGHTINWEB, false);
setFlagValue(webBlock.flags, SpiderWeb_BlockFlags::BLOCKWEB_FLAG_ACTIVE, false);
}

#pragma endregion
61 changes: 35 additions & 26 deletions src/openlrr/game/world/SpiderWeb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ assert_sizeof(SpiderWeb_Globs, 0x8);

#pragma region Globals

// <LegoRR.exe @005530e8>
extern SpiderWeb_Globs & spiderwebGlobs;
// <LegoRR.exe @005530e8>
extern SpiderWeb_Globs& spiderwebGlobs;

#pragma endregion

Expand All @@ -83,53 +83,62 @@ extern SpiderWeb_Globs & spiderwebGlobs;

#pragma region Macros

/**
* @brief Gets the 1D index of a level's spider web grid block at the specified 2D coordinates.
*/
#define spiderwebBlockIndex(bx, by) (blockIndex(spiderwebGlobs.level, (bx), (by)))
/**
* @brief Gets the level's spider web grid block at the specified 2D coordinates.
*/
#define spiderwebBlockValue(bx, by) (spiderwebGlobs.webBlocks[spiderwebBlockIndex((bx),(by))])

#pragma endregion

/**********************************************************************************
******** Functions
**********************************************************************************/
/**********************************************************************************
******** Functions
**********************************************************************************/

#pragma region Functions

// <LegoRR.exe @00466480>
#define SpiderWeb_Initialise ((void (__cdecl* )(Lego_Level* level))0x00466480)
//void __cdecl SpiderWeb_Initialise(Lego_Level* level);
// <LegoRR.exe @00466480>
//#define SpiderWeb_Initialise ((void (__cdecl* )(Lego_Level* level))0x00466480)
void __cdecl SpiderWeb_Initialise(Lego_Level* level);

// <LegoRR.exe @004664d0>
#define SpiderWeb_Shutdown ((void (__cdecl* )(void))0x004664d0)
//void __cdecl SpiderWeb_Shutdown(void);
//#define SpiderWeb_Shutdown ((void (__cdecl* )(void))0x004664d0)
void __cdecl SpiderWeb_Shutdown(void);

// <LegoRR.exe @004664f0>
#define SpiderWeb_Restart ((void (__cdecl* )(Lego_Level* level))0x004664f0)
//void __cdecl SpiderWeb_Restart(Lego_Level* level);
//#define SpiderWeb_Restart ((void (__cdecl* )(Lego_Level* level))0x004664f0)
void __cdecl SpiderWeb_Restart(Lego_Level* level);

// <LegoRR.exe @00466510>
#define SpiderWeb_SpawnAt ((bool32 (__cdecl* )(uint32 bx, uint32 by))0x00466510)
//bool32 __cdecl SpiderWeb_SpawnAt(uint32 bx, uint32 by);
//#define SpiderWeb_SpawnAt ((bool32 (__cdecl* )(uint32 bx, uint32 by))0x00466510)
bool32 __cdecl SpiderWeb_SpawnAt(uint32 bx, uint32 by);

// <LegoRR.exe @00466640>
#define SpiderWeb_Add ((void (__cdecl* )(sint32 bx, sint32 by, LegoObject* webObj))0x00466640)
//void __cdecl SpiderWeb_Add(sint32 bx, sint32 by, LegoObject* webObj);
//#define SpiderWeb_Add ((void (__cdecl* )(sint32 bx, sint32 by, LegoObject* webObj))0x00466640)
void __cdecl SpiderWeb_Add(sint32 bx, sint32 by, LegoObject* webObj);

// <LegoRR.exe @004666b0>
#define SpiderWeb_GetAngle ((bool32 (__cdecl* )(sint32 bx, sint32 by, OUT real32* theta))0x004666b0)
//bool32 __cdecl SpiderWeb_GetAngle(sint32 bx, sint32 by, OUT real32* theta);
//#define SpiderWeb_GetAngle ((bool32 (__cdecl* )(sint32 bx, sint32 by, OUT real32* theta))0x004666b0)
bool32 __cdecl SpiderWeb_GetAngle(sint32 bx, sint32 by, OUT real32* theta);

// <LegoRR.exe @00466750>
#define SpiderWeb_CheckCollision ((bool32 (__cdecl* )(LegoObject* liveObj))0x00466750)
//bool32 __cdecl SpiderWeb_CheckCollision(LegoObject* liveObj);
//#define SpiderWeb_CheckCollision ((bool32 (__cdecl* )(LegoObject* liveObj))0x00466750)
bool32 __cdecl SpiderWeb_CheckCollision(LegoObject* liveObj);

// <LegoRR.exe @00466880>
#define SpiderWeb_Update ((bool32 (__cdecl* )(real32 elapsedGame))0x00466880)
//bool32 __cdecl SpiderWeb_Update(real32 elapsedGame);
//#define SpiderWeb_Update ((bool32 (__cdecl* )(real32 elapsedGame))0x00466880)
bool32 __cdecl SpiderWeb_Update(real32 elapsedGame);

// <LegoRR.exe @004668a0>
#define SpiderWeb_LiveObjectCallback ((bool32 (__cdecl* )(LegoObject* liveObj, real32* pElapsedGame))0x004668a0)
//bool32 __cdecl SpiderWeb_LiveObjectCallback(LegoObject* liveObj, real32* pElapsedGame);
//#define SpiderWeb_LiveObjectCallback ((bool32 (__cdecl* )(LegoObject* liveObj, real32* pElapsedGame))0x004668a0)
bool32 __cdecl SpiderWeb_LiveObjectCallback(LegoObject* liveObj, real32* pElapsedGame);

// <LegoRR.exe @00466a10>
#define SpiderWeb_Remove ((void (__cdecl* )(sint32 bx, sint32 by))0x00466a10)
//void __cdecl SpiderWeb_Remove(sint32 bx, sint32 by);
//#define SpiderWeb_Remove ((void (__cdecl* )(sint32 bx, sint32 by))0x00466a10)
void __cdecl SpiderWeb_Remove(sint32 bx, sint32 by);

#pragma endregion

Expand Down
Loading