AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules

This commit is contained in:
Jack Andersen 2015-11-27 12:21:19 -10:00
parent b9769f7b03
commit d9759a6ae8
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataSpec/SpecBase.cpp
View File

@ -1,3 +1,8 @@
#if _WIN32
#define _CRT_RAND_S
#include <stdlib.h>
#endif
#include "SpecBase.hpp" #include "SpecBase.hpp"
#include "Blender/BlenderSupport.hpp" #include "Blender/BlenderSupport.hpp"
#include "BlenderConnection.hpp" #include "BlenderConnection.hpp"
@ -37,7 +42,12 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector<ExtractReport
if (!memcmp(gameID, "R3O", 3)) if (!memcmp(gameID, "R3O", 3))
{ {
unsigned int t = time(nullptr); unsigned int t = time(nullptr);
#if _WIN32
rand_s(&t);
int r = t % 9;
#else
int r = rand_r(&t) % 9; int r = rand_r(&t) % 9;
#endif
Log.report(LogVisor::FatalError, MomErr[r]); Log.report(LogVisor::FatalError, MomErr[r]);
} }

1
Editor/main.cpp
View File

@ -41,6 +41,7 @@ struct Application : boo::IApplicationCallback
m_viewSystem.init(gf, &m_fontCache); m_viewSystem.init(gf, &m_fontCache);
Specter::RootView rootView(m_viewSystem, m_mainWindow); Specter::RootView rootView(m_viewSystem, m_mainWindow);
m_mainWindow->showWindow();
boo::IGraphicsCommandQueue* gfxQ = m_mainWindow->getCommandQueue(); boo::IGraphicsCommandQueue* gfxQ = m_mainWindow->getCommandQueue();
while (m_running) while (m_running)
{ {

2
hecl

@ -1 +1 @@
Subproject commit a03fc683d57ae0fb76dfd54a9c417193bc4944f9 Subproject commit 1d4c4c692c253dbc9db03728f38b82972eebfbb6

2
libSpecter

@ -1 +1 @@
Subproject commit 8c37e1f30e8ece99837200b949313be7ec570133 Subproject commit d3f46ed36619d6e88ffe4de9afbc972b8bf0423f