Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More warning fixes.

This commit is contained in:
James Chen 2013-07-27 15:15:54 +08:00
parent 9a56cd80bf
commit 324607c32c
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/samples/HelloAnalytics-JS/Classes/AppDelegate.cpp
View File

@ -23,7 +23,7 @@ AppDelegate::AppDelegate()
AppDelegate::~AppDelegate()
{
ScriptEngineManager::purgeSharedManager();
ScriptEngineManager::destroyInstance();
}
bool AppDelegate::applicationDidFinishLaunching()

2
plugin/samples/HelloIAP-JS/Classes/AppDelegate.cpp
View File

@ -23,7 +23,7 @@ AppDelegate::AppDelegate()
AppDelegate::~AppDelegate()
{
ScriptEngineManager::purgeSharedManager();
ScriptEngineManager::destroyInstance();
}
bool AppDelegate::applicationDidFinishLaunching()

8
samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.h
View File

@ -153,10 +153,10 @@ public:
virtual void JointDestroyed(b2Joint* joint) { B2_NOT_USED(joint); }
// Callbacks for derived classes.
virtual void BeginContact(b2Contact* contact) { B2_NOT_USED(contact); }
virtual void EndContact(b2Contact* contact) { B2_NOT_USED(contact); }
virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold);
virtual void PostSolve(const b2Contact* contact, const b2ContactImpulse* impulse)
virtual void BeginContact(b2Contact* contact) override { B2_NOT_USED(contact); }
virtual void EndContact(b2Contact* contact) override { B2_NOT_USED(contact); }
virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override;
virtual void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) override
{
B2_NOT_USED(contact);
B2_NOT_USED(impulse);

8
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
View File

@ -25,7 +25,7 @@ AppDelegate::AppDelegate()
AppDelegate::~AppDelegate()
{
ScriptEngineManager::purgeSharedManager();
ScriptEngineManager::destroyInstance();
}
bool AppDelegate::applicationDidFinishLaunching()
@ -43,8 +43,8 @@ bool AppDelegate::applicationDidFinishLaunching()
std::vector<std::string> resDirOrders;
TargetPlatform platform = Application::getInstance()->getTargetPlatform();
if (platform == kTargetIphone || platform == kTargetIpad || platform == kTargetMacOS)
Platform platform = Application::getInstance()->getTargetPlatform();
if (platform == Application::Platform::OS_IPHONE || platform == Application::Platform::OS_IPAD || platform == Application::Platform::OS_MAC)
{
std::vector<std::string> searchPaths = FileUtils::getInstance()->getSearchPaths();
searchPaths.insert(searchPaths.begin(), "Published files iOS");
@ -75,7 +75,7 @@ bool AppDelegate::applicationDidFinishLaunching()
}
}
else if (platform == kTargetAndroid || platform == kTargetWindows)
else if (platform == Application::Platform::OS_ANDROID || platform == Application::Platform::OS_WINDOWS)
{
if (screenSize.height > 960)
{

6
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
View File

@ -40,8 +40,8 @@ bool AppDelegate::applicationDidFinishLaunching()
std::vector<std::string> searchPaths;
std::vector<std::string> resDirOrders;
TargetPlatform platform = Application::getInstance()->getTargetPlatform();
if (platform == kTargetIphone || platform == kTargetIpad || platform == kTargetMacOS)
Application::Platform platform = Application::getInstance()->getTargetPlatform();
if (platform == Application::Platform::OS_IPHONE || platform == Application::Platform::OS_IPAD || platform == Application::Platform::OS_MAC)
{
searchPaths.push_back("Published-iOS"); // Resources/Published-iOS
FileUtils::getInstance()->setSearchPaths(searchPaths);
@ -58,7 +58,7 @@ bool AppDelegate::applicationDidFinishLaunching()
FileUtils::getInstance()->setSearchResolutionsOrder(resDirOrders);
}
else if (platform == kTargetAndroid || platform == kTargetWindows)
else if (platform == Application::Platform::OS_ANDROID || platform == Application::Platform::OS_WINDOWS)
{
// Comments it since opengles2.0 only supports texture size within 2048x2048.
// if (screenSize.height > 1024)

2
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
View File

@ -21,7 +21,7 @@ AppDelegate::AppDelegate()
AppDelegate::~AppDelegate()
{
ScriptEngineManager::purgeSharedManager();
ScriptEngineManager::destroyInstance();
}
bool AppDelegate::applicationDidFinishLaunching()

4
scripting/javascript/bindings/XMLHTTPRequest.cpp
View File

@ -601,10 +601,10 @@ JS_BINDED_FUNC_IMPL(MinXmlHttpRequest, open)
}
if (meth.compare("post") == 0 || meth.compare("POST") == 0) {
cc_request->setRequestType(cocos2d::extension::HttpRequest::kHttpPost);
cc_request->setRequestType(cocos2d::extension::HttpRequest::Type::POST);
}
else {
cc_request->setRequestType(cocos2d::extension::HttpRequest::kHttpGet);
cc_request->setRequestType(cocos2d::extension::HttpRequest::Type::GET);
}
cc_request->setUrl(url.c_str());

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
044ec2b4004e74ab49c48a703b1ffd743da7eaa3
e7d44ce7f120b3a7eaabe8079dfee33b25fdf284