瀏覽代碼

Get rid of some warnings when loading the editor

Chris Friesen 11 年之前
父節點
當前提交
00f26ddfd9
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Bin/Data/Scripts/Editor/EditorView.as
  2. 2 2
      Source/Engine/Script/ResourceAPI.cpp

+ 1 - 1
Bin/Data/Scripts/Editor/EditorView.as

@@ -90,7 +90,7 @@ class ViewportContext
         viewport = Viewport(editorScene, camera, viewRect);
         index = index_;
         viewportId = viewportId_;
-        camera.viewMask = 0x80000000 + (1 << index); // It's easier to only have 1 gizmo active this viewport is shared with the gizmo
+        camera.viewMask = 0x80000000 + (uint(1) << index); // It's easier to only have 1 gizmo active this viewport is shared with the gizmo
     }
 
     void ResetCamera()

+ 2 - 2
Source/Engine/Script/ResourceAPI.cpp

@@ -94,8 +94,8 @@ static CScriptArray* ResourceCacheGetPackageFiles(ResourceCache* ptr)
 static void RegisterResourceCache(asIScriptEngine* engine)
 {
     RegisterObject<ResourceCache>(engine, "ResourceCache");
-    engine->RegisterObjectMethod("ResourceCache", "bool AddResourceDir(const String&in, uint priority = -1)", asMETHOD(ResourceCache, AddResourceDir), asCALL_THISCALL);
-    engine->RegisterObjectMethod("ResourceCache", "void AddPackageFile(PackageFile@+, uint priority = -1)", asMETHOD(ResourceCache, AddPackageFile), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ResourceCache", "bool AddResourceDir(const String&in, uint priority = M_MAX_UNSIGNED)", asMETHOD(ResourceCache, AddResourceDir), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ResourceCache", "void AddPackageFile(PackageFile@+, uint priority = M_MAX_UNSIGNED)", asMETHOD(ResourceCache, AddPackageFile), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "bool AddManualResource(Resource@+)", asMETHOD(ResourceCache, AddManualResource), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "void RemoveResourceDir(const String&in)", asMETHOD(ResourceCache, RemoveResourceDir), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "void RemovePackageFile(PackageFile@+, bool releaseResources = true, bool forceRelease = false)", asMETHODPR(ResourceCache, RemovePackageFile, (PackageFile*, bool, bool), void), asCALL_THISCALL);