mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 10:52:46 +00:00
Merge pull request #273 from 'paradox/clang'
Conflicts: Sources/Tools/MaxConvert/Pch.h Sources/Tools/MaxConvert/hsControlConverter.cpp
This commit is contained in:
@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "HeadSpin.h"
|
||||
#include "hsWindows.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <ctime>
|
||||
|
||||
|
||||
|
||||
|
@ -447,7 +447,6 @@ public:
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <stdio.h>
|
||||
#include "HeadSpin.h"
|
||||
|
||||
class plDemoDebugFile
|
||||
|
@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
#include "plFogEnvironment.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <cmath>
|
||||
#include "plTweak.h"
|
||||
|
||||
//// Constructors & Destructor ///////////////////////////////////////////////
|
||||
|
@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "plVertCoder.h"
|
||||
|
||||
#include "hsStream.h"
|
||||
#include <math.h>
|
||||
#include <cmath>
|
||||
#include "plGBufferGroup.h"
|
||||
|
||||
const float kPosQuantum = 1.f / float(1 << 10);
|
||||
|
Reference in New Issue
Block a user