Merge Milek7 sound and lua

McZapkie/Mover.cpp

@@ -8,12 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "Mover.h"
-#include "../globals.h"
-#include "../logs.h"
+#include "MOVER.h"
+#include "Globals.h"
+#include "Logs.h"
 #include "Oerlikon_ESt.h"
-#include "../parser.h"
-#include "mctools.h"
+#include "parser.h"
 //---------------------------------------------------------------------------
 
 // Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane.
@@ -6389,6 +6388,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath)
 
     WriteLog("LOAD FIZ FROM " + file);
 
+	std::replace(file.begin(), file.end(), '\\', '/');
     std::ifstream in(file);
 	if (!in.is_open())
 	{

McZapkie/hamulce.cpp

@@ -15,7 +15,7 @@ Copyright (C) 2007-2014 Maciej Cierniak
 #include "stdafx.h"
 #include "hamulce.h"
 #include <typeinfo>
-#include "Mover.h"
+#include "MOVER.h"
 #include "usefull.h"
 
 //---FUNKCJE OGOLNE---

McZapkie/hamulce.h

@@ -511,7 +511,7 @@ class TDriverHandle {
     virtual double GetPos(int i);
     virtual double GetEP(double pos);
 
-    inline TDriverHandle() { ::SecureZeroMemory( Sounds, sizeof( Sounds ) ); }
+    inline TDriverHandle() { memset(Sounds, 0, sizeof(Sounds)); }
 };
 
 class TFV4a : public TDriverHandle {

McZapkie/mctools.cpp

@@ -75,7 +75,7 @@ bool ClearFlag( int &Flag, int const Value ) {
     }
 }
 
-inline double Random(double a, double b)
+double Random(double a, double b)
 {
     std::uniform_real_distribution<> dis(a, b);
     return dis(Global::random_engine);
@@ -276,7 +276,8 @@ extract_value( bool &Variable, std::string const &Key, std::string const &Input,
 }
 
 bool FileExists( std::string const &Filename ) {
-
-    std::ifstream file( Filename );
+	std::string fn = Filename;
+	std::replace(fn.begin(), fn.end(), '\\', '/');
+	std::ifstream file( fn );
     return( true == file.is_open() );
 }