Skip to content

Commit

Permalink
Fix compilation, waiting for open-ead/sead#130
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanae6 committed Aug 2, 2023
1 parent a8e87b3 commit eb8c2aa
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion data/odyssey_functions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -26813,7 +26813,7 @@ Address,Quality,Size,Name
0x00000071005390e8,U,000476,_ZN8RootTask7prepareEv
0x00000071005392c4,O,000004,_ZN8RootTask5enterEv
0x00000071005392c8,O,000160,_ZN8RootTask4calcEv
0x0000007100539368,U,000016,_ZN8RootTask4drawEv
0x0000007100539368,O,000016,_ZN8RootTask4drawEv
0x0000007100539378,U,000036,_ZN8RootTaskD0Ev
0x000000710053939c,U,000204,_ZNK4sead4Task27checkDerivedRuntimeTypeInfoEPKNS_15RuntimeTypeInfo9InterfaceE
0x0000007100539468,U,000092,_ZNK4sead4Task18getRuntimeTypeInfoEv
Expand Down
5 changes: 5 additions & 0 deletions src/System/RootTask.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "RootTask.h"
#include "GameSystem.h"
#include <al/Library/Memory/HeapUtil.h>
#include <heap/seadHeapMgr.h>

void RootTask::enter() {}
void RootTask::calc() {
Expand All @@ -11,3 +12,7 @@ void RootTask::calc() {
}
mGameSystem->movement();
}
void RootTask::draw() {
if (mGameSystem)
mGameSystem->drawMain();
}
16 changes: 8 additions & 8 deletions src/System/RootTask.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#pragma once

#include <gfx/seadDrawContext.h>
#include <hostio/seadHostIONode.h>

class GameSystem;

// TODO: Implement sead::Task, currently missing from sead headers
class RootTask {
// Waiting for open-ead/sead#130
class RootTask /*: public sead::Task*/ {
private:
// TODO: Remove once RootTask implements sead::Task
char taskImplDetails[0x200];
char task_details[0x200];
GameSystem* mGameSystem;
sead::hostio::Node* mHostIoNode;
sead::DrawContext* mDrawContext;
public:
RootTask();
~RootTask();
void enter() override;
void draw() override;
void calc() override;
void prepare() override;
void enter()/* override*/;
void draw()/* override*/;
void calc()/* override*/;
void prepare()/* override*/;
};

0 comments on commit eb8c2aa

Please sign in to comment.