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

move to std optional

Browse Source
This commit is contained in:
David Markowitz
2023-07-25 19:45:22 -07:00
parent dc526aeec1
commit ff173dffce
7 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dDatabase/Tables/CDZoneTableTable.cpp
View File

@@ -53,13 +53,8 @@ void CDZoneTableTable::LoadValuesFromDatabase() {
}
//! Queries the table with a zoneID to find.
const CDZoneTable* CDZoneTableTable::Query(unsigned int zoneID) {
const std::optional<CDZoneTable> CDZoneTableTable::Query(unsigned int zoneID) {
const auto& iter = m_Entries.find(zoneID);
if (iter != m_Entries.end()) {
return &iter->second;
}
return nullptr;
return iter != m_Entries.end() ? std::make_optional(iter->second) : std::nullopt;
}

5
dDatabase/Tables/CDZoneTableTable.h
View File

@@ -1,8 +1,9 @@
#pragma once
// Custom Classes
#include "CDTable.h"
#include <optional>
struct CDZoneTable {
unsigned int zoneID; //!< The Zone ID of the object
unsigned int locStatus; //!< The Locale Status(?)
@@ -41,5 +42,5 @@ public:
void LoadValuesFromDatabase();
// Queries the table with a zoneID to find.
const CDZoneTable* Query(unsigned int zoneID);
const std::optional<CDZoneTable> Query(unsigned int zoneID);
};