Another consistency pass

- 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

View File

@@ -3,6 +3,7 @@
#include "GameMessages.h"
#include "eTerminateType.h"
#include "eRebuildState.h"
#include "Entity.h"
void FvConsoleRightQuickbuild::OnStartup(Entity* self) {
self->SetVar(u"IAmBuilt", false);
@@ -16,7 +17,7 @@ void FvConsoleRightQuickbuild::OnRebuildNotifyState(Entity* self, eRebuildState
const auto objects = EntityManager::Instance()->GetEntitiesInGroup("Facility");
if (!objects.empty()) {
objects[0]->NotifyObject(self, "ConsoleRightUp");
objects[0]->NotifyObject(self, u"ConsoleRightUp");
}
} else if (state == eRebuildState::RESETTING) {
self->SetVar(u"IAmBuilt", false);
@@ -25,7 +26,7 @@ void FvConsoleRightQuickbuild::OnRebuildNotifyState(Entity* self, eRebuildState
const auto objects = EntityManager::Instance()->GetEntitiesInGroup("Facility");
if (!objects.empty()) {
objects[0]->NotifyObject(self, "ConsoleRightDown");
objects[0]->NotifyObject(self, u"ConsoleRightDown");
}
}
}
@@ -41,7 +42,7 @@ void FvConsoleRightQuickbuild::OnUse(Entity* self, Entity* user) {
const auto objects = EntityManager::Instance()->GetEntitiesInGroup("Facility");
if (!objects.empty()) {
objects[0]->NotifyObject(self, "ConsoleRightActive");
objects[0]->NotifyObject(self, u"ConsoleRightActive");
}
}