swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

default to O2

Browse Source
This commit is contained in:
CodeCodon
2015-08-06 11:22:08 -05:00
parent 4eb1fd1e33
commit b1d6744deb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp
+1 -1
View File
@@ -1121,7 +1121,7 @@ jobject JNICALL ScriptMethodsDataTableNamespace::dataTableGetRow(JNIEnv *env, jo
LocalRefPtr target = createNewObject(JavaLibrary::getClsDictionary(), JavaLibrary::getMidDictionary());
if (target == LocalRef::cms_nullPtr)
return false;
return JNI_FALSE;
for (int i = 0; i < dt->getNumColumns(); ++i)
{
engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp
+3 -3
View File
@@ -1339,7 +1339,7 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentName(JNIEnv * env, j
{
ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipComponentName() invalid ship", false);
if (!shipObject)
return false;
return NULL;
Unicode::String const & name = shipObject->getComponentName(chassisSlot);
if (!name.empty())
@@ -4073,7 +4073,7 @@ jlongArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsResourceT
{
ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast<int>(ShipChassisSlotType::SCST_cargo_hold));
if (!shipObject)
return false;
return NULL;
ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents();
@@ -4099,7 +4099,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsAmounts(JN
{
ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast<int>(ShipChassisSlotType::SCST_cargo_hold));
if (!shipObject)
return false;
return NULL;
ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents();