summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-25 00:40:14 +0200
committeraap <aap@papnet.eu>2020-04-25 00:41:17 +0200
commitac19de45b88123b2284ecc3ab44cedcaa7ca496d (patch)
tree5e512242f7c7f41fcb9c685c2679c6b004bae8fd /src/core
parentimplemented debugmenu (diff)
downloadre3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar.gz
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar.bz2
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar.lz
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar.xz
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.tar.zst
re3-ac19de45b88123b2284ecc3ab44cedcaa7ca496d.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Streaming.cpp3
-rw-r--r--src/core/main.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 8124d11c..a76e9038 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -754,7 +754,8 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
}else
RemoveModel(modelId);
- ms_pExtraObjectsDir->FindItem(modelName, pos, size);
+ bool found = ms_pExtraObjectsDir->FindItem(modelName, pos, size);
+ assert(found);
mi->ClearTexDictionary();
if(CTxdStore::FindTxdSlot(modelName) == -1)
mi->SetTexDictionary("generic");
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 7c1f7938..ec37fa28 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -91,7 +91,6 @@ void GameInit(void);
void SystemInit(void);
void TheGame(void);
-void DebugMenuInit(void) {}
void DebugMenuPopulate(void);
@@ -344,6 +343,8 @@ static void
Terminate3D(void)
{
CGame::ShutdownRenderWare();
+
+ DebugMenuShutdown();
RsRwTerminate();
@@ -794,6 +795,7 @@ RenderDebugShit(void)
CRenderer::RenderCollisionLines();
ThePaths.DisplayPathData();
CDebug::DrawLines();
+ DefinedState();
#endif
}