mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-08 17:36:30 +02:00
Code Issues Projects Releases Wiki Activity

- ported bugfixes for 3.6.0.3 release:

Browse Source 
- CMake build system fixes applied during debian testing (like checking for compiler SSE support etc)
 - Windows client fix for headless server operation
 - Crash for some systems when trying to use VBO's
 - Fixed AZERTY keyboard support
 - Enhanced support for screenshots in g3d viewer
 - Updated particle code from titi
 - Bugfix for custom data path override causing compiler error
 - Bugfix for fontconfig to properly find fonts on systems that support and have fontconfig installed (fixes numerous non debian based systems that reported null font errors)
 - Minor UI fix on battle end screen when playing 8 players (last player was sometimes chopped off)
This commit is contained in:
Mark Vejvoda
2012-01-23 07:22:43 +00:00
parent 2224d75d10
commit f40c37f5e8
63 changed files with 948 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/platform/posix/socket.h
View File

@@ -253,7 +253,7 @@ public:
virtual ~ServerSocket();
void bind(int port);
void listen(int connectionQueueSize= SOMAXCONN);
Socket *accept();
Socket *accept(bool errorOnFail=true);
void stopBroadCastThread();
void pauseBroadcast();

7
source/shared_lib/include/platform/sdl/platform_main.h
View File

@@ -388,7 +388,8 @@ int mainSetup(int argc, char **argv) {
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_VERSION])) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_SHOW_INI_SETTINGS])) == true ||
hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) {
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK) < 0) {
// Use this for masterserver mode for timers like Chrono
if(SDL_Init(SDL_INIT_TIMER) < 0) {
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 1;
}
@@ -398,9 +399,9 @@ int mainSetup(int argc, char **argv) {
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 1;
}
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
}
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
return 0;
}

5
source/shared_lib/include/platform/win32/types.h
View File

@@ -33,10 +33,9 @@ typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
//typedef uint8 byte;
}}//end namespace
#ifndef __MINGW32__
// ISO C9x compliant stdint.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
@@ -287,3 +286,5 @@ typedef uint64_t uintmax_t;
#endif // _MSC_STDINT_H_ ]
#endif
#endif