mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-09 23:21:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/tabs'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-17 09:30:31 +02:00
commit 96880b4dfe
20 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -40,8 +40,8 @@ script:
- cd ./build - cd ./build
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j2; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j2; fi
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
after_script:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
notifications: notifications:
recipients: recipients:
- corrmage+travis-ci@gmail.com - corrmage+travis-ci@gmail.com

9
CI/check_tabs.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/bash
OUTPUT=$(grep -nRP '\t' --include=\*.{cpp,hpp,c,h} apps components)
if [[ $OUTPUT ]] ; then
echo "Error: Tab characters found!"
echo $OUTPUT
exit 1
fi

4
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -104,7 +104,7 @@ namespace MWInput
/* 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,7 +112,7 @@ 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++)
{ {