mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 13:15:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-06-12 12:46:04 +02:00
commit 82eb13c070
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwstate/charactermanager.cpp
View file

@ -3,6 +3,7 @@
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include <cctype> // std::isalnum
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

3
extern/oics/ICSPrerequisites.h vendored
View file

@ -36,6 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map> #include <map>
#include <list> #include <list>
#include <limits> #include <limits>
#include <algorithm> /* std::min and std::max for MSVC 2013 */
#include "tinyxml.h" #include "tinyxml.h"
@ -90,7 +91,7 @@ namespace ICS
// from http://www.cplusplus.com/forum/articles/9645/ // from http://www.cplusplus.com/forum/articles/9645/
template <typename T> template <typename T>
T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a
{ //character array as argument { //character array as argument
std::stringstream ss(Text); std::stringstream ss(Text);
T result; T result;

2
extern/sdl4ogre/sdlinputwrapper.hpp vendored
View file

@ -1,6 +1,8 @@
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H #ifndef SDL4OGRE_SDLINPUTWRAPPER_H
#define SDL4OGRE_SDLINPUTWRAPPER_H #define SDL4OGRE_SDLINPUTWRAPPER_H
#define NOMINMAX
#include <SDL_events.h> #include <SDL_events.h>
#include <OgreRenderWindow.h> #include <OgreRenderWindow.h>