* applied patch #2795448 (Compile fixes - gcc 4.3.3 ubuntu)
This commit is contained in:
parent
44d4eaada3
commit
e055079b8a
7 changed files with 6 additions and 4 deletions
|
@ -693,7 +693,6 @@ static void AiGroupAttackerForTransport(AiForce *aiForce)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
** Force on attack ride. We attack until there is no unit or enemy left.
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
-- Declarations
|
||||
----------------------------------------------------------------------------*/
|
||||
|
||||
typedef enum AnimationType {
|
||||
enum AnimationType {
|
||||
AnimationNone,
|
||||
AnimationFrame,
|
||||
AnimationExactFrame,
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
/**
|
||||
** Possible outcomes of the game.
|
||||
*/
|
||||
typedef enum GameResults {
|
||||
enum GameResults {
|
||||
GameNoResult, /// Game has no result
|
||||
GameVictory, /// Game was won
|
||||
GameDefeat, /// Game was lost
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
----------------------------------------------------------------------------*/
|
||||
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
-- Declarations
|
||||
|
|
|
@ -506,6 +506,7 @@
|
|||
|
||||
#include "SDL.h"
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
#ifndef __UPGRADE_STRUCTS_H__
|
||||
#include "upgrade_structs.h"
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
#endif
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
inline int get_cpu_count(void) {
|
||||
|
|
|
@ -630,7 +630,7 @@ void Exit(int err)
|
|||
lua_close(Lua);
|
||||
#endif
|
||||
|
||||
fprintf(stdout, _("Thanks for playing Stratagus.\n"));
|
||||
fprintf(stdout, "%s", _("Thanks for playing Stratagus.\n"));
|
||||
exit(err);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue