Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes collision viewer #2949

Merged
merged 1 commit into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/debugger/colViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ template <typename T> size_t ResetVector(T& vec) {
return vec.capacity();
}

void DrawColViewer() {
extern "C" void DrawColViewer() {
if (gPlayState == nullptr) {
return;
}
Expand Down
7 changes: 6 additions & 1 deletion soh/soh/Enhancements/debugger/colViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

#include <libultraship/libultraship.h>

#ifdef __cplusplus
extern "C"
#endif
void DrawColViewer();

#ifdef __cplusplus
class ColViewerWindow : public LUS::GuiWindow {
public:
using GuiWindow::GuiWindow;

void InitElement() override;
void DrawElement() override;
void UpdateElement() override {};
};
};
#endif
2 changes: 2 additions & 0 deletions soh/src/code/graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <string.h>

#include "soh/Enhancements/debugger/colViewer.h"
#include "soh/Enhancements/gameconsole.h"

#define GFXPOOL_HEAD_MAGIC 0x1234
Expand Down Expand Up @@ -278,6 +279,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {

GameState_ReqPadData(gameState);
GameState_Update(gameState);
DrawColViewer();

OPEN_DISPS(gfxCtx);

Expand Down