Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-18 05:18:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another consistency pass

Browse Source 
- change NotifyObject to use u16 string
- move stuff to header that is inline
- use u16strings instead of converting to u16 string
- move entity to dEntity
This commit is contained in:
David Markowitz
2023-06-16 01:01:13 -07:00
parent 9a9b9aa813
commit 92006123b8
29 changed files with 142 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dScripts/02_server/Map/njhub/CatapultBaseServer.cpp
View File

@@ -4,8 +4,8 @@
#include "Entity.h"
#include "RenderComponent.h"
void CatapultBaseServer::OnNotifyObject(Entity* self, Entity* sender, const std::string& name, int32_t param1, int32_t param2) {
if (name == "BouncerBuilt") {
void CatapultBaseServer::OnNotifyObject(Entity* self, Entity* sender, const std::u16string& name, int32_t param1, int32_t param2) {
if (name == u"BouncerBuilt") {
// start a timer for the arm to player the with bouncer animation
self->AddTimer("PlatAnim", .75);
@@ -46,7 +46,7 @@ void CatapultBaseServer::OnTimerDone(Entity* self, std::string timerName) {
if (bouncer == nullptr) return;
// bounce all players
bouncer->NotifyObject(bouncer, "bounceAllInProximity"); // Likely to trigger server side bounce, bodging this
bouncer->NotifyObject(bouncer, u"bounceAllInProximity"); // Likely to trigger server side bounce, bodging this
// add a delay to play the animation
self->AddTimer("launchAnim", .3);
} else if (timerName == "resetArm") {

2
dScripts/02_server/Map/njhub/CatapultBaseServer.h
View File

@@ -3,7 +3,7 @@
class CatapultBaseServer : public CppScripts::Script {
public:
void OnNotifyObject(Entity* self, Entity* sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0) override;
void OnNotifyObject(Entity* self, Entity* sender, const std::u16string& name, int32_t param1 = 0, int32_t param2 = 0) override;
void OnTimerDone(Entity* self, std::string timerName) override;
};

3
dScripts/02_server/Map/njhub/CatapultBouncerServer.cpp
View File

@@ -1,6 +1,7 @@
#include "CatapultBouncerServer.h"
#include "GameMessages.h"
#include "EntityManager.h"
#include "Entity.h"
void CatapultBouncerServer::OnRebuildComplete(Entity* self, Entity* target) {
GameMessages::SendNotifyClientObject(self->GetObjectID(), u"Built", 0, 0, LWOOBJID_EMPTY, "", UNASSIGNED_SYSTEM_ADDRESS);
@@ -10,6 +11,6 @@ void CatapultBouncerServer::OnRebuildComplete(Entity* self, Entity* target) {
const auto base = EntityManager::Instance()->GetEntitiesInGroup(self->GetVarAsString(u"BaseGroup"));
for (auto* obj : base) {
obj->NotifyObject(self, "BouncerBuilt");
obj->NotifyObject(self, u"BouncerBuilt");
}
}