Browse Source

Fixing release build, silencing a couple TurboBadger warnings under 64 bit

JoshEngebretson 10 years ago
parent
commit
6fbcbc513a
2 changed files with 19 additions and 3 deletions
  1. 17 1
      Source/AtomicEditor/Source/Main.cpp
  2. 2 2
      Source/ThirdParty/TurboBadger/tb_str.h

+ 17 - 1
Source/AtomicEditor/Source/Main.cpp

@@ -78,7 +78,23 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE prevInstance, PSTR cmdLine, in
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE prevInstance, PSTR cmdLine, int showCmd)
 {
     Atomic::ParseArguments(GetCommandLineW());
-    return function;
+
+    const Vector<String>& arguments = GetArguments();
+
+    bool runPlayer = false;
+    for (unsigned i = 0; i < arguments.Size();i++)
+    {
+        if (arguments.At(i) == "--player")
+        {
+            runPlayer = true;
+            break;
+        }
+    }
+
+    if (runPlayer)
+        return RunPlayerApplication();
+
+    return RunEditorApplication();
 }
 // Linux or OS X: use main
 #else

+ 2 - 2
Source/ThirdParty/TurboBadger/tb_str.h

@@ -27,7 +27,7 @@ protected:
 public:
 	TBStrC(const char *str) : s(const_cast<char *>(str)) {}
 
-	inline int Length() const							{ return strlen(s); }
+	inline int Length() const							{ return (int) strlen(s); }
 	inline bool IsEmpty() const							{ return s[0] == 0; }
 
 	inline int Compare(const char* str) const			{ return strcmp(s, str); }
@@ -66,7 +66,7 @@ public:
 
 	void Remove(int ofs, int len);
 	bool Insert(int ofs, const char *ins, int ins_len = TB_ALL_TO_TERMINATION);
-	bool Append(const char *ins, int ins_len = TB_ALL_TO_TERMINATION)	{ return Insert(strlen(s), ins, ins_len); }
+	bool Append(const char *ins, int ins_len = TB_ALL_TO_TERMINATION)	{ return Insert((int)strlen(s), ins, ins_len); }
 
 	inline operator char *() const						{ return s; }
 	char *CStr() const									{ return s; }