github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 13:53:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes collision viewer (#2949)

Browse source
This commit is contained in:
Kenix3 2023-06-05 16:19:42 -04:00 • committed by GitHub
commit 451ce8b107
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/debugger/colViewer.cpp
View file

@ -655,7 +655,7 @@ template <typename T> size_t ResetVector(T& vec) {
return vec.capacity(); return vec.capacity();
} }
void DrawColViewer() { extern "C" void DrawColViewer() {
if (gPlayState == nullptr) { if (gPlayState == nullptr) {
return; return;
} }

5
soh/soh/Enhancements/debugger/colViewer.h
View file

@ -2,8 +2,12 @@
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#ifdef __cplusplus
extern "C"
#endif
void DrawColViewer(); void DrawColViewer();
#ifdef __cplusplus
class ColViewerWindow : public LUS::GuiWindow { class ColViewerWindow : public LUS::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
@ -12,3 +16,4 @@ class ColViewerWindow : public LUS::GuiWindow {
void DrawElement() override; void DrawElement() override;
void UpdateElement() override {}; void UpdateElement() override {};
}; };
#endif

2
soh/src/code/graph.c
View file

@ -4,6 +4,7 @@
#include <string.h> #include <string.h>
#include "soh/Enhancements/debugger/colViewer.h"
#include "soh/Enhancements/gameconsole.h" #include "soh/Enhancements/gameconsole.h"
#define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_HEAD_MAGIC 0x1234
@ -278,6 +279,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
GameState_ReqPadData(gameState); GameState_ReqPadData(gameState);
GameState_Update(gameState); GameState_Update(gameState);
DrawColViewer();
OPEN_DISPS(gfxCtx); OPEN_DISPS(gfxCtx);