clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family G (row 87): remove invented WorldObjects (a std::list<CRenderObject*>& bundle, only ever

Browse source 
Batch #10260 by ragnarok-clanker: forced by an admin (0 lower score(s), 5 changed function(s)); checked with 103 compiled unit(s), including every includer of Source/Contents/World/World.h, Source/Contents/World/WorldObjects.h.
Deletes: Source/Contents/World/WorldObjects.h
This commit is contained in:
ragnarok-clanker 2026-11-03 13:35:34 +00:00
commit 9acda82ac4
6 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Contents/World/WorldObjects.cpp
View file

@ -7,7 +7,6 @@
#include "Contents/Actors/Item.h"
#include "Contents/Actors/GameActor.h"
#include "Client/Mode/ModeMgr.h"
#include "Contents/World/WorldObjects.h"
#include "Contents/World/World.h"
#include "Contents/Effects/ArrowEffect.h"
#include "Contents/Effects/EffectLists.h"
@ -75,7 +74,7 @@ CRenderObject* CWorld::GetGameActorByAidIncludeMe(std::uint32_t aid) const {
// OFFSET: 0x00ACA4E0
// FUNCTION: fn_17692
void WorldObjects::Remove(CRenderObject* object) {
void CWorld::RemoveObject(CRenderObject* object) {
for (auto entry = this->objects.begin(); entry != this->objects.end(); ++entry) {
if (*entry == object) {
delete object;
@ -259,7 +258,7 @@ void CWorld::Clear() {
// OFFSET: 0x00ACA980
// FUNCTION: fn_17698
void WorldObjects::SendObjectMessage(CGameObject* sender, std::uint64_t identity, int message, int a, int b, int c, int d) {
void CWorld::SendObjectMessage(CGameObject* sender, std::uint64_t identity, int message, int a, int b, int c, int d) {
if (this == nullptr) {
return;
}
@ -922,7 +921,7 @@ bool CWorld::RemoveSkill(std::uint32_t aid) {
return false;
}
reinterpret_cast<WorldObjects*>(this)->Remove(skill);
this->RemoveObject(skill);
this->unknown_0020.erase(entry);
return true;
}