mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-29 07:32:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_stage progress

Browse Source
This commit is contained in:
robojumper
2025-03-08 18:54:53 +01:00
parent 03c99fc37c
commit c558c88f25
37 changed files with 885 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_base.cpp
+9 -9
View File
@@ -5,13 +5,13 @@
#include "d/d_heap.h"
#include "d/d_room.h"
#include "d/d_sc_game.h"
#include "d/d_stage.h"
#include "d/flag/enemyflag_manager.h"
#include "f/f_list_nd.h"
#include "m/m_vec.h"
#include "toBeSorted/event.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/file_manager.h"
#include "toBeSorted/room_manager.h"
#include "toBeSorted/special_item_drop_mgr.h"
// .sdata
@@ -126,13 +126,13 @@ int dAcBase_c::initAllocator(int size, char *name, EGG::Heap *heap, int align) {
}
bool dAcBase_c::addActorToRoom(s32 roomId) {
dBase_c *room = RoomManager::getRoom(roomId);
dBase_c *room = dStage_c::getParentForRoom(roomId);
if (room == nullptr) {
return false;
}
if (setConnectChild(room)) {
if (roomId == -1) {
this->roomid = RoomManager::m_Instance->curr_room_id;
this->roomid = dStage_c::GetInstance()->getCurrRoomId();
} else {
this->roomid = roomId;
}
@@ -427,14 +427,14 @@ void dAcBase_c::updateRoomId(f32 yOffset) {
if (checkCollision(&actorPos)) {
roomid = collisionCheckGetRoom();
} else {
roomid = RoomManager::m_Instance->curr_room_id;
roomid = dStage_c::GetInstance()->getCurrRoomId();
}
}
}
// 8002d540
bool dAcBase_c::isRoomFlags_0x6_Set() {
dRoom_c *room = RoomManager::m_Instance->GetRoomByIndex(roomid);
dRoom_c *room = dStage_c::GetInstance()->getRoom(roomid);
return (room->checkFlag(0x4 | 0x2));
}
@@ -478,12 +478,12 @@ void dAcBase_c::setEnemyDefeatFlag() {
// 8002d940
void dAcBase_c::changeLoadedEntitiesWithSet() {
RoomManager::m_Instance->changeLoadedEntities(RoomManager::m_Instance, obj_id, true);
dStage_c::GetInstance()->changeLoadedEntities(obj_id, true);
}
// 8002d960
void dAcBase_c::changeLoadedEntitiesNoSet() {
RoomManager::m_Instance->changeLoadedEntities(RoomManager::m_Instance, obj_id, false);
dStage_c::GetInstance()->changeLoadedEntities(obj_id, false);
}
// spawns GroupType2 (ACTOR)
@@ -513,7 +513,7 @@ dAcBase_c *dAcBase_c::createActor(
setTempCreateParams(
actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr
);
dBase_c *room = RoomManager::getRoom(roomid);
dBase_c *room = dStage_c::getParentForRoom(roomid);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, ACTOR);
}
@@ -544,7 +544,7 @@ dAcBase_c *dAcBase_c::createActorStage(
setTempCreateParams(
actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1, 0xFF, nullptr
);
dBase_c *room = RoomManager::getRoom(roomid);
dBase_c *room = dStage_c::getParentForRoom(roomid);
return (dAcBase_c *)dBase_c::createBase(actorId, room, actorParams1, STAGE);
}