Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added WRL frontend for Win8 and WP8

Browse Source 
Merged Qt, SDL and WRL frontend on the same corewrapper
Moved OpenGL code out of SDL and Qt frontends to OpenGl backend
(JGfx.cpp)
Updated file system and network code to be compatible with WRL
This commit is contained in:
xawotihs
2013-11-17 16:46:44 +01:00
parent 9ac28d35a2
commit a6ba983650
31 changed files with 1660 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ExtraCost.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "Player.h"
#include "Counters.h"
#include "AllAbilities.h"
#include <boost/scoped_ptr.hpp>
#include <memory>
SUPPORT_OBJECT_ANALYTICS(ExtraCost)
@@ -171,7 +171,7 @@ LifeorManaCost::LifeorManaCost(TargetChooser *_tc, string manaType)
string buildType ="{";
buildType.append(manaType);
buildType.append("}");
boost::scoped_ptr<ManaCost> cost(ManaCost::parseManaCost(buildType));
std::unique_ptr<ManaCost> cost(ManaCost::parseManaCost(buildType));
manaCost.copy(cost.get());
}
projects/mtg/src/TranslateKeys.cpp
+6 -6
View File
@@ -12,7 +12,7 @@ using std::map;
static map<const LocalKeySym, KeyRep> fattable;
static map<const JButton, KeyRep> slimtable;
#if defined(LINUX) || defined (IOS) || defined (ANDROID) || defined (SDL_CONFIG) || defined (QT_CONFIG)
#if defined(LINUX) || defined (IOS) || defined (ANDROID) || defined (SDL_CONFIG) || defined (QT_CONFIG) || defined (WP8)
const KeyRep& translateKey(LocalKeySym key)
{
{
@@ -23,7 +23,7 @@ const KeyRep& translateKey(LocalKeySym key)
char* str = NULL;
#if !defined(QT_CONFIG) && !defined(IOS) && !defined (SDL_CONFIG)
#if !defined(QT_CONFIG) && !defined(IOS) && !defined (SDL_CONFIG) && !defined(WP8)
str = XKeysymToString(key);
#elif defined (SDL_CONFIG)
str = (char*)SDL_GetKeyName(key);
@@ -31,7 +31,7 @@ const KeyRep& translateKey(LocalKeySym key)
if (!str)
{
str = NEW char[11];
sprintf(str, "%lu", (long unsigned int)key); //TODO: Wagic is not supposed to know that a key actually is an unsingned long, so this part should probably be platform specific (move to JGE ?)
snprintf(str, 11, "%lu", (long unsigned int)key); //TODO: Wagic is not supposed to know that a key actually is an unsingned long, so this part should probably be platform specific (move to JGE ?)
}
const KeyRep k = make_pair(str, static_cast<JQuad*>(NULL));
fattable[key] = k;
@@ -184,9 +184,9 @@ const KeyRep& translateKey(JButton key) {
}
else
{
char* str = NEW char[11];
sprintf(str, "%d", key);
slimtable[key] = make_pair(str, static_cast<JQuad*> (static_cast<JQuad*> (NULL)));
char* str = NEW char[11];
snprintf(str, 11, "%d", key);
slimtable[key] = make_pair(str, static_cast<JQuad*> (static_cast<JQuad*> (NULL)));
}
res = slimtable.find(key);
}