mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 18:49:58 +00:00
Fix tab indentations in apps/ and components/
This commit is contained in:
parent
4d94f38f4b
commit
a47617c21f
18 changed files with 70 additions and 70 deletions
|
@ -493,14 +493,14 @@ void Record<ESM::Book>::print()
|
||||||
std::cout << " Enchantment Points: " << mData.mData.mEnchant << std::endl;
|
std::cout << " Enchantment Points: " << mData.mData.mEnchant << std::endl;
|
||||||
if (mPrintPlain)
|
if (mPrintPlain)
|
||||||
{
|
{
|
||||||
std::cout << " Text:" << std::endl;
|
std::cout << " Text:" << std::endl;
|
||||||
std::cout << "START--------------------------------------" << std::endl;
|
std::cout << "START--------------------------------------" << std::endl;
|
||||||
std::cout << mData.mText << std::endl;
|
std::cout << mData.mText << std::endl;
|
||||||
std::cout << "END----------------------------------------" << std::endl;
|
std::cout << "END----------------------------------------" << std::endl;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::cout << " Text: [skipped]" << std::endl;
|
std::cout << " Text: [skipped]" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -799,14 +799,14 @@ void Record<ESM::DialInfo>::print()
|
||||||
{
|
{
|
||||||
if (mPrintPlain)
|
if (mPrintPlain)
|
||||||
{
|
{
|
||||||
std::cout << " Result Script:" << std::endl;
|
std::cout << " Result Script:" << std::endl;
|
||||||
std::cout << "START--------------------------------------" << std::endl;
|
std::cout << "START--------------------------------------" << std::endl;
|
||||||
std::cout << mData.mResultScript << std::endl;
|
std::cout << mData.mResultScript << std::endl;
|
||||||
std::cout << "END----------------------------------------" << std::endl;
|
std::cout << "END----------------------------------------" << std::endl;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::cout << " Result Script: [skipped]" << std::endl;
|
std::cout << " Result Script: [skipped]" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1201,14 +1201,14 @@ void Record<ESM::Script>::print()
|
||||||
|
|
||||||
if (mPrintPlain)
|
if (mPrintPlain)
|
||||||
{
|
{
|
||||||
std::cout << " Script:" << std::endl;
|
std::cout << " Script:" << std::endl;
|
||||||
std::cout << "START--------------------------------------" << std::endl;
|
std::cout << "START--------------------------------------" << std::endl;
|
||||||
std::cout << mData.mScriptText << std::endl;
|
std::cout << mData.mScriptText << std::endl;
|
||||||
std::cout << "END----------------------------------------" << std::endl;
|
std::cout << "END----------------------------------------" << std::endl;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::cout << " Script: [skipped]" << std::endl;
|
std::cout << " Script: [skipped]" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ namespace EsmTool
|
||||||
}
|
}
|
||||||
|
|
||||||
void setPrintPlain(bool plain) {
|
void setPrintPlain(bool plain) {
|
||||||
mPrintPlain = plain;
|
mPrintPlain = plain;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void load(ESM::ESMReader &esm) = 0;
|
virtual void load(ESM::ESMReader &esm) = 0;
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace
|
||||||
CSMWorld::InfoTableProxyModel::InfoTableProxyModel(CSMWorld::UniversalId::Type type, QObject *parent)
|
CSMWorld::InfoTableProxyModel::InfoTableProxyModel(CSMWorld::UniversalId::Type type, QObject *parent)
|
||||||
: IdTableProxyModel(parent),
|
: IdTableProxyModel(parent),
|
||||||
mType(type),
|
mType(type),
|
||||||
mInfoColumnId(type == UniversalId::Type_TopicInfos ? Columns::ColumnId_Topic :
|
mInfoColumnId(type == UniversalId::Type_TopicInfos ? Columns::ColumnId_Topic :
|
||||||
Columns::ColumnId_Journal),
|
Columns::ColumnId_Journal),
|
||||||
mInfoColumnIndex(-1),
|
mInfoColumnIndex(-1),
|
||||||
mLastAddedSourceRow(-1)
|
mLastAddedSourceRow(-1)
|
||||||
|
|
|
@ -35,7 +35,7 @@ void CSVWidget::DropLineEdit::dropEvent(QDropEvent *event)
|
||||||
if (CSVWorld::DragDropUtils::canAcceptData(*event, mDropType))
|
if (CSVWorld::DragDropUtils::canAcceptData(*event, mDropType))
|
||||||
{
|
{
|
||||||
CSMWorld::UniversalId id = CSVWorld::DragDropUtils::getAcceptedData(*event, mDropType);
|
CSMWorld::UniversalId id = CSVWorld::DragDropUtils::getAcceptedData(*event, mDropType);
|
||||||
setText(QString::fromUtf8(id.getId().c_str()));
|
setText(QString::fromUtf8(id.getId().c_str()));
|
||||||
emit tableMimeDataDropped(id, CSVWorld::DragDropUtils::getTableMimeData(*event)->getDocumentPtr());
|
emit tableMimeDataDropped(id, CSVWorld::DragDropUtils::getTableMimeData(*event)->getDocumentPtr());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,21 +7,21 @@ int argcData;
|
||||||
extern "C" void releaseArgv();
|
extern "C" void releaseArgv();
|
||||||
|
|
||||||
void releaseArgv() {
|
void releaseArgv() {
|
||||||
delete[] argvData;
|
delete[] argvData;
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT void JNICALL Java_ui_activity_GameActivity_commandLine(JNIEnv *env,
|
JNIEXPORT void JNICALL Java_ui_activity_GameActivity_commandLine(JNIEnv *env,
|
||||||
jobject obj, jint argc, jobjectArray stringArray) {
|
jobject obj, jint argc, jobjectArray stringArray) {
|
||||||
jboolean iscopy;
|
jboolean iscopy;
|
||||||
argcData = (int) argc;
|
argcData = (int) argc;
|
||||||
argvData = new const char *[argcData + 1];
|
argvData = new const char *[argcData + 1];
|
||||||
argvData[0] = "openmw";
|
argvData[0] = "openmw";
|
||||||
for (int i = 1; i < argcData + 1; i++) {
|
for (int i = 1; i < argcData + 1; i++) {
|
||||||
jstring string = (jstring) (env)->GetObjectArrayElement(stringArray,
|
jstring string = (jstring) (env)->GetObjectArrayElement(stringArray,
|
||||||
i - 1);
|
i - 1);
|
||||||
argvData[i] = (env)->GetStringUTFChars(string, &iscopy);
|
argvData[i] = (env)->GetStringUTFChars(string, &iscopy);
|
||||||
(env)->DeleteLocalRef(string);
|
(env)->DeleteLocalRef(string);
|
||||||
}
|
}
|
||||||
(env)->DeleteLocalRef(stringArray);
|
(env)->DeleteLocalRef(stringArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,22 +16,22 @@ extern const char **argvData;
|
||||||
void releaseArgv();
|
void releaseArgv();
|
||||||
|
|
||||||
int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
|
int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
|
||||||
jobject obj) {
|
jobject obj) {
|
||||||
|
|
||||||
SDL_Android_Init(env, cls);
|
SDL_Android_Init(env, cls);
|
||||||
|
|
||||||
SDL_SetMainReady();
|
SDL_SetMainReady();
|
||||||
|
|
||||||
/* Run the application code! */
|
/* Run the application code! */
|
||||||
|
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
status = main(argcData+1, argvData);
|
status = main(argcData+1, argvData);
|
||||||
releaseArgv();
|
releaseArgv();
|
||||||
/* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
|
/* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
|
||||||
/* exit(status); */
|
/* exit(status); */
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ANDROID__ */
|
#endif /* __ANDROID__ */
|
||||||
|
|
|
@ -37,8 +37,8 @@ static const char pipe_err[] = "!!! Failed to create pipe\n";
|
||||||
static const char fork_err[] = "!!! Failed to fork debug process\n";
|
static const char fork_err[] = "!!! Failed to fork debug process\n";
|
||||||
static const char exec_err[] = "!!! Failed to exec debug process\n";
|
static const char exec_err[] = "!!! Failed to exec debug process\n";
|
||||||
|
|
||||||
#ifndef PATH_MAX /* Not all platforms (GNU Hurd) have this. */
|
#ifndef PATH_MAX /* Not all platforms (GNU Hurd) have this. */
|
||||||
# define PATH_MAX 256
|
# define PATH_MAX 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static char argv0[PATH_MAX];
|
static char argv0[PATH_MAX];
|
||||||
|
|
|
@ -18,9 +18,9 @@ namespace
|
||||||
float accumulated_time=0,parent_time = pit->Is_Root() ? CProfileManager::Get_Time_Since_Reset() : pit->Get_Current_Parent_Total_Time();
|
float accumulated_time=0,parent_time = pit->Is_Root() ? CProfileManager::Get_Time_Since_Reset() : pit->Get_Current_Parent_Total_Time();
|
||||||
int i,j;
|
int i,j;
|
||||||
int frames_since_reset = CProfileManager::Get_Frame_Count_Since_Reset();
|
int frames_since_reset = CProfileManager::Get_Frame_Count_Since_Reset();
|
||||||
for (i=0;i<spacing;i++) os << ".";
|
for (i=0;i<spacing;i++) os << ".";
|
||||||
os << "----------------------------------\n";
|
os << "----------------------------------\n";
|
||||||
for (i=0;i<spacing;i++) os << ".";
|
for (i=0;i<spacing;i++) os << ".";
|
||||||
std::string s = "Profiling: "+
|
std::string s = "Profiling: "+
|
||||||
std::string(pit->Get_Current_Parent_Name())+" (total running time: "+MyGUI::utility::toString(parent_time,3)+" ms) ---\n";
|
std::string(pit->Get_Current_Parent_Name())+" (total running time: "+MyGUI::utility::toString(parent_time,3)+" ms) ---\n";
|
||||||
os << s;
|
os << s;
|
||||||
|
@ -35,7 +35,7 @@ namespace
|
||||||
accumulated_time += current_total_time;
|
accumulated_time += current_total_time;
|
||||||
float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
|
float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
|
||||||
|
|
||||||
for (j=0;j<spacing;j++) os << ".";
|
for (j=0;j<spacing;j++) os << ".";
|
||||||
double ms = (current_total_time / (double)frames_since_reset);
|
double ms = (current_total_time / (double)frames_since_reset);
|
||||||
s = MyGUI::utility::toString(i)+" -- "+pit->Get_Current_Name()+" ("+MyGUI::utility::toString(fraction,2)+" %) :: "+MyGUI::utility::toString(ms,3)+" ms / frame ("+MyGUI::utility::toString(pit->Get_Current_Total_Calls())+" calls)\n";
|
s = MyGUI::utility::toString(i)+" -- "+pit->Get_Current_Name()+" ("+MyGUI::utility::toString(fraction,2)+" %) :: "+MyGUI::utility::toString(ms,3)+" ms / frame ("+MyGUI::utility::toString(pit->Get_Current_Total_Calls())+" calls)\n";
|
||||||
os << s;
|
os << s;
|
||||||
|
@ -47,7 +47,7 @@ namespace
|
||||||
{
|
{
|
||||||
os << "what's wrong\n";
|
os << "what's wrong\n";
|
||||||
}
|
}
|
||||||
for (i=0;i<spacing;i++) os << ".";
|
for (i=0;i<spacing;i++) os << ".";
|
||||||
double unaccounted= parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f;
|
double unaccounted= parent_time > SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f;
|
||||||
s = "Unaccounted: ("+MyGUI::utility::toString(unaccounted,3)+" %) :: "+MyGUI::utility::toString(parent_time - accumulated_time,3)+" ms\n";
|
s = "Unaccounted: ("+MyGUI::utility::toString(unaccounted,3)+" %) :: "+MyGUI::utility::toString(parent_time - accumulated_time,3)+" ms\n";
|
||||||
os << s;
|
os << s;
|
||||||
|
|
|
@ -109,7 +109,7 @@ namespace MWGui
|
||||||
|
|
||||||
static std::string sSchoolNames[6];
|
static std::string sSchoolNames[6];
|
||||||
|
|
||||||
int mHorizontalScrollIndex;
|
int mHorizontalScrollIndex;
|
||||||
|
|
||||||
|
|
||||||
float mDelay;
|
float mDelay;
|
||||||
|
|
|
@ -605,7 +605,7 @@ namespace MWGui
|
||||||
controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
|
controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
|
||||||
controller->setEnabled(mEnableRepeat);
|
controller->setEnabled(mEnableRepeat);
|
||||||
controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
|
controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
|
||||||
MyGUI::ControllerManager::getInstance().addItem(this, controller);
|
MyGUI::ControllerManager::getInstance().addItem(this, controller);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MWScrollBar::onDecreaseButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
|
void MWScrollBar::onDecreaseButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
|
||||||
|
@ -621,7 +621,7 @@ namespace MWGui
|
||||||
controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
|
controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
|
||||||
controller->setEnabled(mEnableRepeat);
|
controller->setEnabled(mEnableRepeat);
|
||||||
controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
|
controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
|
||||||
MyGUI::ControllerManager::getInstance().addItem(this, controller);
|
MyGUI::ControllerManager::getInstance().addItem(this, controller);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MWScrollBar::onIncreaseButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
|
void MWScrollBar::onIncreaseButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
|
||||||
|
|
|
@ -102,9 +102,9 @@ namespace MWInput
|
||||||
mControlSwitch["playerviewswitch"] = true;
|
mControlSwitch["playerviewswitch"] = true;
|
||||||
mControlSwitch["vanitymode"] = true;
|
mControlSwitch["vanitymode"] = true;
|
||||||
|
|
||||||
/* Joystick Init */
|
/* Joystick Init */
|
||||||
|
|
||||||
//Load controller mappings
|
// Load controller mappings
|
||||||
#if SDL_VERSION_ATLEAST(2,0,2)
|
#if SDL_VERSION_ATLEAST(2,0,2)
|
||||||
if(controllerBindingsFile!="")
|
if(controllerBindingsFile!="")
|
||||||
{
|
{
|
||||||
|
@ -112,10 +112,10 @@ namespace MWInput
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Open all presently connected sticks
|
// Open all presently connected sticks
|
||||||
int numSticks = SDL_NumJoysticks();
|
int numSticks = SDL_NumJoysticks();
|
||||||
for(int i = 0; i < numSticks; i++)
|
for(int i = 0; i < numSticks; i++)
|
||||||
{
|
{
|
||||||
if(SDL_IsGameController(i))
|
if(SDL_IsGameController(i))
|
||||||
{
|
{
|
||||||
SDL_ControllerDeviceEvent evt;
|
SDL_ControllerDeviceEvent evt;
|
||||||
|
@ -126,7 +126,7 @@ namespace MWInput
|
||||||
{
|
{
|
||||||
//ICS_LOG(std::string("Unusable controller plugged in: ")+SDL_JoystickNameForIndex(i));
|
//ICS_LOG(std::string("Unusable controller plugged in: ")+SDL_JoystickNameForIndex(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
|
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
|
||||||
if (uiScale != 0.f)
|
if (uiScale != 0.f)
|
||||||
|
|
|
@ -57,7 +57,7 @@ namespace
|
||||||
osg::Vec3f dir = to - from;
|
osg::Vec3f dir = to - from;
|
||||||
dir.z() = 0;
|
dir.z() = 0;
|
||||||
dir.normalize();
|
dir.normalize();
|
||||||
float verticalOffset = 200; // instead of '200' here we want the height of the actor
|
float verticalOffset = 200; // instead of '200' here we want the height of the actor
|
||||||
osg::Vec3f _from = from + dir*offsetXY + osg::Vec3f(0,0,1) * verticalOffset;
|
osg::Vec3f _from = from + dir*offsetXY + osg::Vec3f(0,0,1) * verticalOffset;
|
||||||
|
|
||||||
// cast up-down ray and find height in world space of hit
|
// cast up-down ray and find height in world space of hit
|
||||||
|
|
|
@ -747,7 +747,7 @@ namespace MWPhysics
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace)
|
virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace)
|
||||||
{
|
{
|
||||||
if (rayResult.m_collisionObject == mMe)
|
if (rayResult.m_collisionObject == mMe)
|
||||||
return 1.f;
|
return 1.f;
|
||||||
|
|
|
@ -287,7 +287,7 @@ namespace MWWorld
|
||||||
|
|
||||||
if (mPlayer)
|
if (mPlayer)
|
||||||
{
|
{
|
||||||
mPlayer->clear();
|
mPlayer->clear();
|
||||||
mPlayer->setCell(0);
|
mPlayer->setCell(0);
|
||||||
mPlayer->getPlayer().getRefData() = RefData();
|
mPlayer->getPlayer().getRefData() = RefData();
|
||||||
mPlayer->set(mStore.get<ESM::NPC>().find ("player"));
|
mPlayer->set(mStore.get<ESM::NPC>().find ("player"));
|
||||||
|
|
|
@ -44,7 +44,7 @@ namespace Compiler
|
||||||
|
|
||||||
namespace Gui
|
namespace Gui
|
||||||
{
|
{
|
||||||
void registerExtensions (Extensions& extensions);
|
void registerExtensions (Extensions& extensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Misc
|
namespace Misc
|
||||||
|
|
|
@ -31,9 +31,9 @@ struct MagicEffect
|
||||||
CastTouch = 0x80, // Allows range - cast on touch.
|
CastTouch = 0x80, // Allows range - cast on touch.
|
||||||
CastTarget = 0x100, // Allows range - cast on target.
|
CastTarget = 0x100, // Allows range - cast on target.
|
||||||
UncappedDamage = 0x1000, // Negates multiple cap behaviours. Allows an effect to reduce an attribute below zero; removes the normal minimum effect duration of 1 second.
|
UncappedDamage = 0x1000, // Negates multiple cap behaviours. Allows an effect to reduce an attribute below zero; removes the normal minimum effect duration of 1 second.
|
||||||
NonRecastable = 0x4000, // Does not land if parent spell is already affecting target. Shows "you cannot re-cast" message for self target.
|
NonRecastable = 0x4000, // Does not land if parent spell is already affecting target. Shows "you cannot re-cast" message for self target.
|
||||||
Unreflectable = 0x10000, // Cannot be reflected, the effect always lands normally.
|
Unreflectable = 0x10000, // Cannot be reflected, the effect always lands normally.
|
||||||
CasterLinked = 0x20000, // Must quench if caster is dead, or not an NPC/creature. Not allowed in containter/door trap spells.
|
CasterLinked = 0x20000, // Must quench if caster is dead, or not an NPC/creature. Not allowed in containter/door trap spells.
|
||||||
|
|
||||||
// Originally modifiable flags
|
// Originally modifiable flags
|
||||||
AllowSpellmaking = 0x200, // Can be used for spellmaking
|
AllowSpellmaking = 0x200, // Can be used for spellmaking
|
||||||
|
|
|
@ -52,11 +52,11 @@ struct ConfigurationManager
|
||||||
typedef Files::FixedPath<> FixedPathType;
|
typedef Files::FixedPath<> FixedPathType;
|
||||||
|
|
||||||
typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
|
typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
|
||||||
#if defined HAVE_UNORDERED_MAP
|
#if defined HAVE_UNORDERED_MAP
|
||||||
typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
|
typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
|
||||||
#else
|
#else
|
||||||
typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
|
typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void loadConfig(const boost::filesystem::path& path,
|
void loadConfig(const boost::filesystem::path& path,
|
||||||
boost::program_options::variables_map& variables,
|
boost::program_options::variables_map& variables,
|
||||||
|
|
|
@ -30,8 +30,8 @@ namespace SDLUtil
|
||||||
void setControllerEventCallback(ControllerListener* listen) { mConListener = listen; }
|
void setControllerEventCallback(ControllerListener* listen) { mConListener = listen; }
|
||||||
|
|
||||||
void capture(bool windowEventsOnly);
|
void capture(bool windowEventsOnly);
|
||||||
bool isModifierHeld(SDL_Keymod mod);
|
bool isModifierHeld(SDL_Keymod mod);
|
||||||
bool isKeyDown(SDL_Scancode key);
|
bool isKeyDown(SDL_Scancode key);
|
||||||
|
|
||||||
void setMouseVisible (bool visible);
|
void setMouseVisible (bool visible);
|
||||||
void setMouseRelative(bool relative);
|
void setMouseRelative(bool relative);
|
||||||
|
|
Loading…
Reference in a new issue