diff --git a/JGE/Makefile b/JGE/Makefile index 224d84629..63822b226 100644 --- a/JGE/Makefile +++ b/JGE/Makefile @@ -84,7 +84,7 @@ OBJS = $(GENERIC_OBJS) $(LINUX_OBJS) TARGET_LIB = libjge.a TARGET_HGE = libhgetools.a INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I/usr/include/boost -Isrc/zipFS -Iinclude/ -CXXFLAGS += -DLINUX $(FMOD) +CXXFLAGS += -DLINUX -DNETWORK_SUPPORT $(FMOD) CXXFLAGS += $(INCDIR) LIBDIR = lib/linux endif diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk index 9647f0a36..c4095ff56 100644 --- a/projects/mtg/Android/jni/Android.mk +++ b/projects/mtg/Android/jni/Android.mk @@ -12,7 +12,7 @@ BOOST_PATH := $(MY_WAGIC_ROOT)/Boost JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg PNG_PATH := $(JGE_PATH)/Dependencies/libpng -LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG +LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -DNETWORK_SUPPORT LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS LOCAL_STATIC_LIBRARIES := libpng libjpeg diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index cde441c96..d64eb2eef 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -82,7 +82,7 @@ OBJS += objs/TestSuiteAI.o INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I/usr/include/boost -I../../JGE/src/zipFS LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lpthread $(FMOD) -CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL -Wno-nonnull-compare +CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL -Wno-nonnull-compare ASFLAGS = $(CXXFLAGS) @@ -93,7 +93,7 @@ OBJS += objs/TestSuiteAI.o INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD) -CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 -Wno-nonnull-compare +CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -Wno-nonnull-compare ASFLAGS = $(CXXFLAGS) diff --git a/projects/mtg/src/DuelLayers.cpp b/projects/mtg/src/DuelLayers.cpp index b97112aa7..875ffc161 100644 --- a/projects/mtg/src/DuelLayers.cpp +++ b/projects/mtg/src/DuelLayers.cpp @@ -58,7 +58,7 @@ void DuelLayers::Update(float dt, Player * currentPlayer) for (int i = 0; i < nbitems; ++i) objects[i]->Update(dt); - int isAI = currentPlayer->isAI(); + int isAI = currentPlayer->isAI() || currentPlayer != getObserver()->players[mPlayerViewIndex]; // Fix for 2 players hand. if (isAI && !currentPlayer->getObserver()->isLoading()) currentPlayer->Act(dt); diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj index 16e66111e..4dd72c676 100644 --- a/projects/mtg/template.vcxproj +++ b/projects/mtg/template.vcxproj @@ -108,7 +108,7 @@ MaxSpeed OnlyExplicitInline ./include;$(MTGEXTRAS);../../JGE/include;../../JGE/Dependencies/include;../../Boost;../../JGE/Dependencies/SDL/include;../../JGE/src/zipFS;%(AdditionalIncludeDirectories) - TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_WINDOWS;NETWORK_SUPPORT;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -157,7 +157,7 @@ Disabled ./include;$(MTGEXTRAS);../../JGE/include;../../JGE/Dependencies/include;../../Boost;../../JGE/Dependencies/SDL/include;../../JGE/src/zipFS;%(AdditionalIncludeDirectories) - TIXML_USE_STL; SDL_CONFIG;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + TIXML_USE_STL; SDL_CONFIG;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NETWORK_SUPPORT;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL .\Debug/template.pch